diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-25 19:26:54 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-25 19:26:54 -0700 |
| commit | 93255d6d17fbb3702a0f8670d7ecc2ed627af2a7 (patch) | |
| tree | d14acaf4efeb96e252c0e195a757ea212b8c69a0 /home/overworld.asm | |
| parent | 7f6d0d49b61a77cfba76057d99881634b882486b (diff) | |
yet more naming
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index bd9f4a0a..3675eca8 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -106,13 +106,14 @@ OverworldLoopLessDelay:: aCoord 8, 9 ld [wTilePlayerStandingOn],a ; unused? call DisplayTextID ; display either the start menu or the NPC/sign text - ld a,[wcc47] + ld a,[wEnteringCableClub] and a jr z,.checkForOpponent dec a - ld a,$00 - ld [wcc47],a + ld a,0 + ld [wEnteringCableClub],a jr z,.changeMap +; XXX can this code be reached? predef LoadSAV ld a,[W_CURMAP] ld [wDestinationMap],a @@ -470,16 +471,16 @@ WarpFound1:: ; 0735 (0:0735) WarpFound2:: ; 073c (0:073c) ld a,[wNumberOfWarps] sub c - ld [wd73b],a ; save ID of used warp + ld [wWarpedFromWhichWarp],a ; save ID of used warp ld a,[W_CURMAP] - ld [wd73c],a + ld [wWarpedFromWhichMap],a call CheckIfInOutsideMap jr nz,.indoorMaps ; this is for handling "outside" maps that can't have the 0xFF destination map ld a,[W_CURMAP] ld [wLastMap],a ld a,[W_CURMAPWIDTH] - ld [wd366],a + ld [wUnusedD366],a ; not read ld a,[hWarpDestinationMap] ld [W_CURMAP],a cp a,ROCK_TUNNEL_1 |