diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-09-23 15:09:49 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2019-10-21 00:42:36 +0200 |
| commit | 7111ae8e582996f2b6ef36427cf54e0c168593ae (patch) | |
| tree | 4cff533a94f6936680aaf73b8c91f7b4d92aadc9 /engine | |
| parent | 29deef86f810c00cc28b3afd9821b26febcde1d5 (diff) | |
Fix some mobile script and map sign things
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/map_name_sign.asm | 10 | ||||
| -rw-r--r-- | engine/overworld/warp_connection.asm | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 6162378a9..0cb8ce97a 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -15,13 +15,13 @@ ReturnFromMapSetupScript:: call GetWorldMapLocation ld [wCurLandmark], a call .CheckNationalParkGate - jr z, .nationalparkgate + jr z, .gate call GetMapEnvironment cp GATE jr nz, .not_gate -.nationalparkgate +.gate ld a, -1 ld [wCurLandmark], a @@ -70,7 +70,7 @@ ReturnFromMapSetupScript:: ; These landmarks do not get pop-up signs. cp -1 ret z - cp SPECIAL_MAP + cp SPECIAL_MAP ; redundant check ret z cp RADIO_TOWER ret z @@ -105,11 +105,11 @@ PlaceMapNameSign:: cp 60 ret z cp 59 - jr nz, .skip2 + jr nz, .already_initialized call InitMapNameFrame call PlaceMapNameCenterAlign farcall HDMATransfer_OnlyTopFourRows -.skip2 +.already_initialized ld a, $80 ld a, $70 ldh [rWY], a diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 2b36d1e42..bf28ab35e 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -1,4 +1,3 @@ - HandleNewMap: call ClearUnusedMapBuffer call ResetMapBufferEventFlags |