diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/landmarks.asm | 2 | ||||
| -rwxr-xr-x | engine/npc_movement.asm | 8 | ||||
| -rwxr-xr-x | engine/player_movement.asm | 2 | ||||
| -rw-r--r-- | engine/scripting.asm | 2 | ||||
| -rwxr-xr-x | engine/stats_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/tile_events.asm | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/engine/landmarks.asm b/engine/landmarks.asm index a0b4336aa..465a70f3c 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -197,7 +197,7 @@ SilphCoName: db "SILPH CO.@" SafariZoneName: db "SAFARI ZONE@" SeafoamIslandsName: db "SEAFOAM¯ISLANDS@" PokemonMansionName: db "#MON¯MANSION@" -CeruleanCaveNane: db "CERULEAN¯CAVE@" +CeruleanCaveName: db "CERULEAN¯CAVE@" Route1Name: db "ROUTE 1@" Route2Name: db "ROUTE 2@" Route3Name: db "ROUTE 3@" diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index f9ce7b04e..bc36e3ee9 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -76,7 +76,7 @@ Function6f07: ; 6f07 ld a, [hl] ld d, a call GetTileCollision - and a + and a ; land jr z, Function6f3e scf ret @@ -89,7 +89,7 @@ Function6f2c: ; 6f2c add hl, bc ld a, [hl] call GetTileCollision - cp $1 + cp WATERTILE jr z, Function6f3e scf ret @@ -210,11 +210,11 @@ Function6fa1: ; 6fa1 call GetCoordTile call GetTileCollision pop de - and a + and a ; land jr nz, .asm_6fd7 call GetCoordTile call GetTileCollision - and a + and a ; land jr nz, .asm_6fd7 xor a ret diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 2f6660135..89593da5d 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -770,7 +770,7 @@ DoPlayerMovement:: ; 80000 ; Otherwise, return carry. call GetTileCollision - cp 1 + cp WATERTILE jr z, .Water ; Can walk back onto land from water. diff --git a/engine/scripting.asm b/engine/scripting.asm index e9899ef0f..42976ad65 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -958,7 +958,7 @@ Script_waitsfx: Script_warpsound: ; script command 0x87 - callba Function14a07 + callba GetWarpSFX call PlaySFX ret diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 2412c0e13..6a59019f0 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -869,7 +869,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226) predef FrontpicPredef hlcoord 0, 0 ld d, $0 - ld e, $2 + ld e, ANIM_MON_MENU predef LoadMonAnimation ld hl, wcf64 set 6, [hl] diff --git a/engine/tile_events.asm b/engine/tile_events.asm index c1ae93363..1595d436f 100755 --- a/engine/tile_events.asm +++ b/engine/tile_events.asm @@ -97,14 +97,14 @@ CheckCutCollision: ; 149f5 db -1 ; 14a07 -Function14a07:: ; 14a07 +GetWarpSFX:: ; 14a07 ld a, [PlayerStandingTile] - ld de, $1f + ld de, SFX_ENTER_DOOR cp $71 ; door ret z - ld de, $13 + ld de, SFX_WARP_TO cp $7c ; warp pad ret z - ld de, $23 + ld de, SFX_EXIT_BUILDING ret ; 14a1a |