diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-27 15:32:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-27 15:32:24 -0400 |
| commit | 4b853ad676e061a6c4b0fcc030855a2705776864 (patch) | |
| tree | a6d6f2976827862f4a5f402e92c8479ccf7fb349 /engine/hidden_object_functions3.asm | |
| parent | Merge pull request #250 from Rangi42/master (diff) | |
| download | pokeyellow-4b853ad676e061a6c4b0fcc030855a2705776864.tar.gz pokeyellow-4b853ad676e061a6c4b0fcc030855a2705776864.tar.xz pokeyellow-4b853ad676e061a6c4b0fcc030855a2705776864.zip | |
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251)
Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
Diffstat (limited to 'engine/hidden_object_functions3.asm')
| -rwxr-xr-x | engine/hidden_object_functions3.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index ade99fd7..1237e960 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: +PrintBookshelfText:: ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_UP jr nz, .noMatch @@ -38,7 +38,7 @@ PrintBookshelfText: INCLUDE "data/bookshelf_tile_ids.asm" -IndigoPlateauStatues: +IndigoPlateauStatues:: TX_ASM ld hl, IndigoPlateauStatuesText1 call PrintText @@ -63,7 +63,7 @@ IndigoPlateauStatuesText3: TX_FAR _IndigoPlateauStatuesText3 db "@" -BookOrSculptureText: +BookOrSculptureText:: TX_ASM ld hl, PokemonBooksText ld a, [wCurMapTileset] @@ -85,11 +85,11 @@ DiglettSculptureText: TX_FAR _DiglettSculptureText db "@" -ElevatorText: +ElevatorText:: TX_FAR _ElevatorText db "@" -TownMapText: +TownMapText:: TX_FAR _TownMapText TX_BLINK TX_ASM @@ -112,6 +112,6 @@ TownMapText: push af jp CloseTextDisplay -PokemonStuffText: +PokemonStuffText:: TX_FAR _PokemonStuffText db "@" |