diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3c.asm | 8 | ||||
| -rwxr-xr-x | engine/printer.asm | 31 | ||||
| -rwxr-xr-x | engine/town_map.asm | 12 |
3 files changed, 39 insertions, 12 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index e7ac2a4e..44382257 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -322,13 +322,13 @@ Func_f0a82: ; f0a82 ret Pic_f0abf: ; f0abf (3c:4abf) - dr $f0abf, $f0b64 +INCBIN "gfx/pikachu/unknown_f0abf.pic" GFX_f0b64: ; f0b64 (3c:4b64) - dr $f0b64, $f0cf4 +INCBIN "gfx/pikachu/unknown_f0b64.2bpp" Pic_f0cf4: ; f0cf4 (3c:4cf4) - dr $f0cf4, $f0d82 +INCBIN "gfx/pikachu/unknown_f0cf4.pic" GFX_f0d82: ; f0d82 (3c:4d82) - dr $f0d82, $f0f12 +INCBIN "gfx/pikachu/unknown_f0d82.2bpp" PokecenterChanseyText: ld hl, NurseChanseyText diff --git a/engine/printer.asm b/engine/printer.asm index 95f70087..d2e5c6e3 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -1162,8 +1162,35 @@ Func_e8f51: ; e8f51 (3a:4f51) ld [wcae0], a ret -Func_e8f82: ; e8f82 (3a:4f82) - dr $e8f82,$e8fb8 +Func_e8f82: + ld a, [wcae0] + and a + ret z + push af + xor a + ld [H_AUTOBGTRANSFERENABLED], a + coord hl, 0, 5 + lb bc, 10, 18 + call TextBoxBorder + pop af + ld e, a + ld d, $0 + ld hl, Table_e8fca + add hl, de + add hl, de + ld e, [hl] + inc hl + ld d, [hl] + coord hl, 1, 7 + call PlaceString + coord hl, 2, 15 + ld de, String_e8fb8 + call PlaceString + ld a, $1 + ld [H_AUTOBGTRANSFERENABLED], a + xor a + ld [wcae0], a + ret String_e8fb8: db "Press B to Cancel@" diff --git a/engine/town_map.asm b/engine/town_map.asm index aff126ee..2d4f0023 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -588,14 +588,14 @@ LoadTownMapEntry: ; 7137a (1c:537a) ld l, a ret -ExternalMapEntries: ; 7139c (1c:539c) - dr $7139c,$7140b -InternalMapEntries: ; 7140b (1c:540b) - dr $7140b,$7174b +; ExternalMapEntries: ; 7139c (1c:539c) + ; dr $7139c,$7140b +; InternalMapEntries: ; 7140b (1c:540b) + ; dr $7140b,$7174b -;INCLUDE "data/town_map_entries.asm" +INCLUDE "data/town_map_entries.asm" -;INCLUDE "text/map_names.asm" ; TODO: relabel addresses +INCLUDE "text/map_names.asm" ; TODO: relabel addresses MonNestIcon: ; 7174b (1c:574b) INCBIN "gfx/mon_nest_icon.1bpp" |