diff options
author | YamaArashi <shadow962@live.com> | 2016-06-11 17:30:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 17:30:20 -0700 |
commit | 7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch) | |
tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /engine/hidden_object_functions3.asm | |
parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'engine/hidden_object_functions3.asm')
-rwxr-xr-x | engine/hidden_object_functions3.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index d6e25cec..efdbd081 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -1,5 +1,5 @@ ; prints text for bookshelves in buildings without sign events -PrintBookshelfText: ; fb50 (3:7b50) +PrintBookshelfText: ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_UP jr nz, .noMatch @@ -37,7 +37,7 @@ PrintBookshelfText: ; fb50 (3:7b50) jpba PrintCardKeyText ; format: db tileset id, bookshelf tile id, text id -BookshelfTileIDs: ; fb8b (3:7b8b) +BookshelfTileIDs: db PLATEAU, $30 db (IndigoPlateauStatues_id - TextPredefs) / 2 + 1 db HOUSE, $3D @@ -74,7 +74,7 @@ BookshelfTileIDs: ; fb8b (3:7b8b) db (BookOrSculptureText_id - TextPredefs) / 2 + 1 db $FF -IndigoPlateauStatues: ; fbbf (3:7bbf) +IndigoPlateauStatues: TX_ASM ld hl, IndigoPlateauStatuesText1 call PrintText @@ -87,19 +87,19 @@ IndigoPlateauStatues: ; fbbf (3:7bbf) call PrintText jp TextScriptEnd -IndigoPlateauStatuesText1: ; fbd9 (3:7bd9) +IndigoPlateauStatuesText1: TX_FAR _IndigoPlateauStatuesText1 db "@" -IndigoPlateauStatuesText2: ; fbde (3:7bde) +IndigoPlateauStatuesText2: TX_FAR _IndigoPlateauStatuesText2 db "@" -IndigoPlateauStatuesText3: ; fbe3 (3:7be3) +IndigoPlateauStatuesText3: TX_FAR _IndigoPlateauStatuesText3 db "@" -BookOrSculptureText: ; fbe8 (3:7be8) +BookOrSculptureText: TX_ASM ld hl, PokemonBooksText ld a, [wCurMapTileset] @@ -113,19 +113,19 @@ BookOrSculptureText: ; fbe8 (3:7be8) call PrintText jp TextScriptEnd -PokemonBooksText: ; fc03 (3:7c03) +PokemonBooksText: TX_FAR _PokemonBooksText db "@" -DiglettSculptureText: ; fc08 (3:7c08) +DiglettSculptureText: TX_FAR _DiglettSculptureText db "@" -ElevatorText: ; fc0d (3:7c0d) +ElevatorText: TX_FAR _ElevatorText db "@" -TownMapText: ; fc12 (3:7c12) +TownMapText: TX_FAR _TownMapText db $06 TX_ASM @@ -148,6 +148,6 @@ TownMapText: ; fc12 (3:7c12) push af jp CloseTextDisplay -PokemonStuffText: ; fc45 (3:7c45) +PokemonStuffText: TX_FAR _PokemonStuffText db "@" |