diff options
Diffstat (limited to 'engine/town_map.asm')
| -rwxr-xr-x | engine/town_map.asm | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm index 65a10912..cf09be7c 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -27,7 +27,7 @@ DisplayTownMap: pop af jr .enterLoop -.townMapLoop ; 70ef4 (1c:4ef4) +.townMapLoop coord hl, 0, 0 lb bc, 1, 20 call ClearScreenArea @@ -37,7 +37,7 @@ DisplayTownMap: ld b, 0 add hl, bc ld a, [hl] -.enterLoop ; 70f08 (1c:4f08) +.enterLoop ld de, wTownMapCoords call LoadTownMapEntry ld a, [de] @@ -69,7 +69,7 @@ DisplayTownMap: ld b, a and A_BUTTON | B_BUTTON | D_UP | D_DOWN jr z, .inputLoop - ld a, $8c + ld a, SFX_TINK call PlaySound bit 6, b jr nz, .pressedUp @@ -84,7 +84,6 @@ DisplayTownMap: pop af ld [hl], a ret - .pressedUp ld a, [wWhichTownMapLocation] inc a @@ -149,7 +148,7 @@ LoadTownMap_Fly: ld [hJoy7], a call LoadPlayerSpriteGraphics call LoadFontTilePatterns - ld de, BirdSprite ; $4d80 + ld de, BirdSprite ld b, BANK(BirdSprite) ld c, $c ld hl, vSprites + $40 @@ -205,7 +204,7 @@ LoadTownMap_Fly: jr z, .inputLoop bit 0, b jr nz, .pressedA - ld a, $8c ; SFX_TINK + ld a, SFX_TINK call PlaySound bit 6, b jr nz, .pressedUp @@ -213,7 +212,7 @@ LoadTownMap_Fly: jr nz, .pressedDown jr .pressedB .pressedA - ld a, $8e ; SFX_HEAL_AILMENT + ld a, SFX_HEAL_AILMENT call PlaySound ld a, [hl] ld [wDestinationMap], a @@ -299,7 +298,7 @@ LoadTownMap: ld bc, WorldMapTileGraphicsEnd - WorldMapTileGraphics ld a, BANK(WorldMapTileGraphics) call FarCopyData - ld hl, MonNestIcon ; $574b + ld hl, MonNestIcon ld de, vSprites + $40 ld bc, MonNestIconEnd - MonNestIcon ld a, BANK(MonNestIcon) @@ -366,12 +365,12 @@ DrawPlayerOrBirdSprite: call WritePlayerOrBirdSpriteOAM pop hl ld de, wcd6d -.asm_71266 +.loop ld a, [hli] ld [de], a inc de cp "@" - jr nz, .asm_71266 + jr nz, .loop ld hl, wOAMBuffer ld de, wTileMapBackup ld bc, $a0 @@ -465,7 +464,7 @@ WriteTownMapSpriteOAM: pop hl WriteAsymmetricMonPartySpriteOAM: -; Writes 4 OAM blocks for a helix mon party sprite, since is does not have +; Writes 4 OAM blocks for a helix mon party sprite, since it does not have ; a vertical line of symmetry. lb de, 2, 2 .loop @@ -483,14 +482,14 @@ WriteAsymmetricMonPartySpriteOAM: xor a ld [hli], a inc d - ld a, $8 + ld a, 8 add c ld c, a dec e jr nz, .innerLoop pop bc pop de - ld a, $8 + ld a, 8 add b ld b, a dec d @@ -592,14 +591,9 @@ LoadTownMapEntry: ld l, a ret -; ExternalMapEntries: - ; dr $7139c,$7140b -; InternalMapEntries: - ; dr $7140b,$7174b - INCLUDE "data/town_map_entries.asm" -INCLUDE "text/map_names.asm" ; TODO: relabel addresses +INCLUDE "text/map_names.asm" MonNestIcon: INCBIN "gfx/mon_nest_icon.1bpp" |