thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bring build errors down

Browse source 
This brings build errors down to 24 for zeta to deal with
This commit is contained in:
Llinos Evans 2024-12-28 23:41:40 +00:00
parent e59cc2b329
commit ef27eaf9ec
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/collision/collision_permissions.asm
View file

@ -43,8 +43,8 @@ TileCollisionTable::
db WALL_TILE ; COLL_BUOY db WALL_TILE ; COLL_BUOY
db WATER_TILE ; COLL_CUT_28 db WATER_TILE ; COLL_CUT_28
db WATER_TILE ; COLL_WATER db WATER_TILE ; COLL_WATER
db WATERTILE | TALK ; COLL_DIVE_DOWN db WATER_TILE | TALK ; COLL_DIVE_DOWN
db LANDTILE | TALK ; COLL_DIVE_UP db LAND_TILE | TALK ; COLL_DIVE_UP
db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C
db WATER_TILE ; 2d db WATER_TILE ; 2d
db WATER_TILE ; 2e db WATER_TILE ; 2e

2
engine/battle/ai/scoring.asm
View file

@ -1677,7 +1677,7 @@ AI_Smart_Surf:
AI_Smart_Whirlpool: AI_Smart_Whirlpool:
; Greatly encourage this move if the player is underwater and the enemy is faster. ; Greatly encourage this move if the player is underwater and the enemy is faster.
ld a, [wLastPlayerCounterMove] ld a, [wLastPlayerCounterMove]
cp DIVE cp WATER_SPORT
ret nz ret nz
ld a, [wPlayerSubStatus4] ld a, [wPlayerSubStatus4]
bit SUBSTATUS_UNDERWATER, a bit SUBSTATUS_UNDERWATER, a

12
engine/events/overworld.asm
View file

@ -2124,14 +2124,14 @@ CantWaterSportText:
db "@" db "@"
CheckMapCanWaterSport: CheckMapCanWaterSport:
ld a, [wWaterSportMapGroup] ld a, [wDiveMapGroup]
and a and a
jr z, .failed jr z, .failed
ld a, [wWaterSportMapNumber] ld a, [wDiveMapNumber]
and a and a
jr z, .failed jr z, .failed
ld a, [wPlayerStandingTile] ld a, [wPlayerTile]
call CheckWaterSportTile call CheckDiveTile
jr nz, .failed jr nz, .failed
xor a xor a
ret ret
@ -2146,10 +2146,10 @@ TryWaterSportOW::
ld de, ENGINE_CASCADEBADGE ld de, ENGINE_CASCADEBADGE
call CheckEngineFlag call CheckEngineFlag
jr c, .cant jr c, .cant
ld d, DIVE ld d, WATER_SPORT
call CheckPartyMove call CheckPartyMove
jr c, .cant jr c, .cant
call GetPartyNick call GetPartyNickname
ld a, BANK(AskWaterSportScript) ld a, BANK(AskWaterSportScript)
ld hl, AskWaterSportScript ld hl, AskWaterSportScript
call CallScript call CallScript