diff options
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index d76fca98..382f90f9 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -473,7 +473,7 @@ WarpFound2:: ld [wMapPalOffset], a call GBFadeOutToBlack .notRockTunnel - callab CalculatePikachuSpawnState1 ; 3f:45fa + callab CalculatePikachuSpawnState1 call PlayMapChangeSound jr .done @@ -744,7 +744,7 @@ HandleBlackOut:: ld hl, wd72e res 5, [hl] switchbank SpecialWarpIn ; also Bank(SpecialEnterMap) - callab ResetStatusAndHalveMoneyOnBlackout ; 3c:4274 + callab ResetStatusAndHalveMoneyOnBlackout call SpecialWarpIn call PlayDefaultMusicFadeOutCurrent jp SpecialEnterMap @@ -1770,7 +1770,7 @@ LoadWalkingPlayerSpriteGraphics:: xor a ld [wd473], a ld b, BANK(RedSprite) - ld de, RedSprite ; $4180 + ld de, RedSprite jr LoadPlayerSpriteGraphicsCommon LoadSurfingPlayerSpriteGraphics2:: @@ -1787,7 +1787,7 @@ LoadSurfingPlayerSpriteGraphics2:: jr z, LoadSurfingPlayerSpriteGraphics .asm_0d7c ld b, BANK(SurfingPikachuSprite) - ld de, SurfingPikachuSprite ; 3f:6def + ld de, SurfingPikachuSprite jr LoadPlayerSpriteGraphicsCommon LoadSurfingPlayerSpriteGraphics:: @@ -1824,7 +1824,7 @@ LoadMapHeader:: jr asm_0dbd Func_0db5:: ; XXX - callba LoadUnusedBluesHouseMissableObjectData ; 3c:4a55 + callba LoadUnusedBluesHouseMissableObjectData asm_0dbd ld a, [wCurMapTileset] ld [wUnusedD119], a @@ -1911,7 +1911,7 @@ asm_0dbd ld [wNumSigns], a and a ; are there any signs? jr z, .loadSpriteData ; if not, skip this - call CopySignData ; 0eb3 (0:0eb3) + call CopySignData .loadSpriteData ld a, [wd72e] bit 5, a ; did a battle happen immediately before this? @@ -1922,9 +1922,9 @@ asm_0dbd ld a, [wd72e] bit 5, a ; did a battle happen immediately before this? jr nz, .skip_pika_spawn - callab SchedulePikachuSpawnForAfterText ; 3f:44fa + callab SchedulePikachuSpawnForAfterText .skip_pika_spawn - callab LoadWildData ; 3:4b62 + callab LoadWildData pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) ld a, [wCurMapHeight] ; map height in 4x4 tile blocks add a ; double it @@ -1938,7 +1938,7 @@ asm_0dbd ld a, [H_LOADEDROMBANK] push af switchbank MapSongBanks - ld hl, MapSongBanks ; 3f:4000 + ld hl, MapSongBanks add hl, bc add hl, bc ld a, [hli] @@ -2106,7 +2106,7 @@ SwitchToMapRomBank:: GetMapHeaderPointer:: ld a, [H_LOADEDROMBANK] push af - switchbank MapHeaderPointers ; 3f:41f2 + switchbank MapHeaderPointers push de ld a, [wCurMap] ld e, a @@ -2296,4 +2296,4 @@ LoadSprite:: xor a ld [hl], a ; zero byte 1, since it is not used pop hl - ret ; end of home/overworld.asm = 10b9 (0:10b9) + ret |