summaryrefslogtreecommitdiff
path: root/engine/town_map.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 17:30:20 -0700
committerGitHub <noreply@github.com>2016-06-11 17:30:20 -0700
commit7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch)
tree8a61aee33d6b47e960dc71dbb89c096622bbdc95 /engine/town_map.asm
parentd8dae96f35222ababb9688ce2aed3292515f8ca2 (diff)
parent7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff)
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'engine/town_map.asm')
-rwxr-xr-xengine/town_map.asm46
1 files changed, 23 insertions, 23 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 727197de..b2f1e656 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -1,4 +1,4 @@
-DisplayTownMap: ; 70e3e (1c:4e3e)
+DisplayTownMap:
call LoadTownMap
ld hl, wUpdateSpritesEnabled
ld a, [hl]
@@ -105,11 +105,11 @@ DisplayTownMap: ; 70e3e (1c:4e3e)
INCLUDE "data/town_map_order.asm"
-TownMapCursor: ; 70f40 (1c:4f40)
+TownMapCursor:
INCBIN "gfx/town_map_cursor.1bpp"
TownMapCursorEnd:
-LoadTownMap_Nest: ; 70f60 (1c:4f60)
+LoadTownMap_Nest:
call LoadTownMap
ld hl, wUpdateSpritesEnabled
ld a, [hl]
@@ -131,10 +131,10 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60)
ld [hl], a
ret
-MonsNestText: ; 70f89 (1c:4f89)
+MonsNestText:
db "'s NEST@"
-LoadTownMap_Fly: ; 70f90 (1c:4f90)
+LoadTownMap_Fly:
call ClearSprites
call LoadTownMap
call LoadPlayerSpriteGraphics
@@ -243,10 +243,10 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
ld hl, wFlyLocationsList + 11
jr .pressedDown
-ToText: ; 7106d (1c:506d)
+ToText:
db "To@"
-BuildFlyLocationsList: ; 71070 (1c:5070)
+BuildFlyLocationsList:
ld hl, wFlyLocationsList - 1
ld [hl], $ff
inc hl
@@ -270,11 +270,11 @@ BuildFlyLocationsList: ; 71070 (1c:5070)
ld [hl], $ff
ret
-TownMapUpArrow: ; 71093 (1c:5093)
+TownMapUpArrow:
INCBIN "gfx/up_arrow.1bpp"
TownMapUpArrowEnd:
-LoadTownMap: ; 7109b (1c:509b)
+LoadTownMap:
call GBPalWhiteOutWithDelay3
call ClearScreen
call UpdateSprites
@@ -324,11 +324,11 @@ LoadTownMap: ; 7109b (1c:509b)
ld [wTownMapSpriteBlinkingEnabled], a
ret
-CompressedMap: ; 71100 (1c:5100)
+CompressedMap:
; you can decompress this file with the redrle program in the extras/ dir
INCBIN "gfx/town_map.rle"
-ExitTownMap: ; 711ab (1c:51ab)
+ExitTownMap:
; clear town map graphics data and load usual graphics data
xor a
ld [wTownMapSpriteBlinkingEnabled], a
@@ -340,7 +340,7 @@ ExitTownMap: ; 711ab (1c:51ab)
call UpdateSprites
jp RunDefaultPaletteCommand
-DrawPlayerOrBirdSprite: ; 711c4 (1c:51c4)
+DrawPlayerOrBirdSprite:
; a = map number
; b = OAM base tile
push af
@@ -366,7 +366,7 @@ DrawPlayerOrBirdSprite: ; 711c4 (1c:51c4)
ld bc, $a0
jp CopyData
-DisplayWildLocations: ; 711ef (1c:51ef)
+DisplayWildLocations:
callba FindWildLocationsOfMon
call ZeroOutDuplicatesInList
ld hl, wOAMBuffer
@@ -414,10 +414,10 @@ DisplayWildLocations: ; 711ef (1c:51ef)
ld bc, $a0
jp CopyData
-AreaUnknownText: ; 7124a (1c:524a)
+AreaUnknownText:
db " AREA UNKNOWN@"
-TownMapCoordsToOAMCoords: ; 71258 (1c:5258)
+TownMapCoordsToOAMCoords:
; in: lower nybble of a = x, upper nybble of a = y
; out: b and [hl] = (y * 8) + 24, c and [hl+1] = (x * 8) + 24
push af
@@ -435,14 +435,14 @@ TownMapCoordsToOAMCoords: ; 71258 (1c:5258)
ld [hli], a
ret
-WritePlayerOrBirdSpriteOAM: ; 7126d (1c:526d)
+WritePlayerOrBirdSpriteOAM:
ld a, [wOAMBaseTile]
and a
ld hl, wOAMBuffer + $90 ; for player sprite
jr z, WriteTownMapSpriteOAM
ld hl, wOAMBuffer + $80 ; for bird sprite
-WriteTownMapSpriteOAM: ; 71279 (1c:5279)
+WriteTownMapSpriteOAM:
push hl
; Subtract 4 from c (X coord) and 4 from b (Y coord). However, the carry from c
@@ -454,7 +454,7 @@ WriteTownMapSpriteOAM: ; 71279 (1c:5279)
ld c, l
pop hl
-WriteAsymmetricMonPartySpriteOAM: ; 71281 (1c:5281)
+WriteAsymmetricMonPartySpriteOAM:
; Writes 4 OAM blocks for a helix mon party sprite, since it does not have
; a vertical line of symmetry.
lb de, 2, 2
@@ -487,7 +487,7 @@ WriteAsymmetricMonPartySpriteOAM: ; 71281 (1c:5281)
jr nz, .loop
ret
-WriteSymmetricMonPartySpriteOAM: ; 712a6 (1c:52a6)
+WriteSymmetricMonPartySpriteOAM:
; Writes 4 OAM blocks for a mon party sprite other than a helix. All the
; sprites other than the helix one have a vertical line of symmetry which allows
; the X-flip OAM bit to be used so that only 2 rather than 4 tile patterns are
@@ -529,7 +529,7 @@ WriteSymmetricMonPartySpriteOAM: ; 712a6 (1c:52a6)
jr nz, .loop
ret
-ZeroOutDuplicatesInList: ; 712d9 (1c:52d9)
+ZeroOutDuplicatesInList:
; replace duplicate bytes in the list of wild pokemon locations with 0
ld de, wBuffer
.loop
@@ -552,7 +552,7 @@ ZeroOutDuplicatesInList: ; 712d9 (1c:52d9)
inc hl
jr .zeroDuplicatesLoop
-LoadTownMapEntry: ; 712f1 (1c:52f1)
+LoadTownMapEntry:
; in: a = map number
; out: lower nybble of [de] = x, upper nybble of [de] = y, hl = address of name
cp REDS_HOUSE_1F
@@ -586,11 +586,11 @@ INCLUDE "data/town_map_entries.asm"
INCLUDE "text/map_names.asm"
-MonNestIcon: ; 716be (1c:56be)
+MonNestIcon:
INCBIN "gfx/mon_nest_icon.1bpp"
MonNestIconEnd:
-TownMapSpriteBlinkingAnimation: ; 716c6 (1c:56c6)
+TownMapSpriteBlinkingAnimation:
ld a, [wAnimCounter]
inc a
cp 25