diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/hidden_object_functions3.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff) | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/hidden_object_functions3.asm')
| -rwxr-xr-x | engine/hidden_object_functions3.asm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index d7f80d3d..e613df2e 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -1,12 +1,11 @@ ; prints text for bookshelves in buildings without sign events PrintBookshelfText: ; fb50 (3:7b50) - ld a, [$c109] + ld a, [wSpriteStateData1 + 9] cp $4 jr nz, .asm_fb7f - ld a, [W_CURMAPTILESET] ; $d367 + ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET ld b, a - FuncCoord 8, 7 ; $c434 - ld a, [Coord] + aCoord 8, 7 ld c, a ld hl, BookshelfTileIDs ; $7b8b .asm_fb62 @@ -90,7 +89,7 @@ BookOrSculptureText: ; fbe8 (3:7be8) ld a, [W_CURMAPTILESET] cp MANSION ; Celadon Mansion tileset jr nz, .asm_fbfd - ld a, [$c420] + ld a, [wTileMap + $80] cp $38 jr nz, .asm_fbfd ld hl, DiglettSculptureText @@ -115,8 +114,8 @@ TownMapText: ; fc12 (3:7c12) db $06 db $08 ; asm ld a, $1 - ld [$cc3c], a - ld hl, $d730 + ld [wcc3c], a + ld hl, wd730 set 6, [hl] call GBPalWhiteOutWithDelay3 xor a @@ -125,7 +124,7 @@ TownMapText: ; fc12 (3:7c12) ld [H_AUTOBGTRANSFERENABLED], a call LoadFontTilePatterns callba DisplayTownMap - ld hl, $d730 + ld hl, wd730 res 6, [hl] ld de, TextScriptEnd push de |