diff options
68 files changed, 100 insertions, 72 deletions
diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index 865f14d8..5223f435 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -98,4 +98,5 @@ InternalMapEntries: ; 7140b (1c:540b) IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName + IMAP BEACH_HOUSE, $6,$F,Route19Name db $FF 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" diff --git a/gfx/pikachu/unknown_e4000.png b/gfx/pikachu/unknown_e4000.png Binary files differnew file mode 100644 index 00000000..75a54919 --- /dev/null +++ b/gfx/pikachu/unknown_e4000.png diff --git a/gfx/pikachu/unknown_e40cc.png b/gfx/pikachu/unknown_e40cc.png Binary files differnew file mode 100644 index 00000000..adce99ad --- /dev/null +++ b/gfx/pikachu/unknown_e40cc.png diff --git a/gfx/pikachu/unknown_e411c.png b/gfx/pikachu/unknown_e411c.png Binary files differnew file mode 100644 index 00000000..40e3d336 --- /dev/null +++ b/gfx/pikachu/unknown_e411c.png diff --git a/gfx/pikachu/unknown_e41d2.png b/gfx/pikachu/unknown_e41d2.png Binary files differnew file mode 100644 index 00000000..34d71c02 --- /dev/null +++ b/gfx/pikachu/unknown_e41d2.png diff --git a/gfx/pikachu/unknown_e4272.png b/gfx/pikachu/unknown_e4272.png Binary files differnew file mode 100644 index 00000000..8b23b56e --- /dev/null +++ b/gfx/pikachu/unknown_e4272.png diff --git a/gfx/pikachu/unknown_e4323.png b/gfx/pikachu/unknown_e4323.png Binary files differnew file mode 100644 index 00000000..6d8d5c22 --- /dev/null +++ b/gfx/pikachu/unknown_e4323.png diff --git a/gfx/pikachu/unknown_e4383.png b/gfx/pikachu/unknown_e4383.png Binary files differnew file mode 100644 index 00000000..5ac60dc3 --- /dev/null +++ b/gfx/pikachu/unknown_e4383.png diff --git a/gfx/pikachu/unknown_e444b.png b/gfx/pikachu/unknown_e444b.png Binary files differnew file mode 100644 index 00000000..d0240c72 --- /dev/null +++ b/gfx/pikachu/unknown_e444b.png diff --git a/gfx/pikachu/unknown_e458b.png b/gfx/pikachu/unknown_e458b.png Binary files differnew file mode 100644 index 00000000..e374a571 --- /dev/null +++ b/gfx/pikachu/unknown_e458b.png diff --git a/gfx/pikachu/unknown_e463b.png b/gfx/pikachu/unknown_e463b.png Binary files differnew file mode 100644 index 00000000..2e31d6f6 --- /dev/null +++ b/gfx/pikachu/unknown_e463b.png diff --git a/gfx/pikachu/unknown_e467b.png b/gfx/pikachu/unknown_e467b.png Binary files differnew file mode 100644 index 00000000..d088d590 --- /dev/null +++ b/gfx/pikachu/unknown_e467b.png diff --git a/gfx/pikachu/unknown_e472e.png b/gfx/pikachu/unknown_e472e.png Binary files differnew file mode 100644 index 00000000..1a1ac334 --- /dev/null +++ b/gfx/pikachu/unknown_e472e.png diff --git a/gfx/pikachu/unknown_e476e.png b/gfx/pikachu/unknown_e476e.png Binary files differnew file mode 100644 index 00000000..2ca64b68 --- /dev/null +++ b/gfx/pikachu/unknown_e476e.png diff --git a/gfx/pikachu/unknown_e4841.png b/gfx/pikachu/unknown_e4841.png Binary files differnew file mode 100644 index 00000000..f3425637 --- /dev/null +++ b/gfx/pikachu/unknown_e4841.png diff --git a/gfx/pikachu/unknown_e49d1.png b/gfx/pikachu/unknown_e49d1.png Binary files differnew file mode 100644 index 00000000..1414cd6e --- /dev/null +++ b/gfx/pikachu/unknown_e49d1.png diff --git a/gfx/pikachu/unknown_e4a99.png b/gfx/pikachu/unknown_e4a99.png Binary files differnew file mode 100644 index 00000000..e97998c1 --- /dev/null +++ b/gfx/pikachu/unknown_e4a99.png diff --git a/gfx/pikachu/unknown_e4b39.png b/gfx/pikachu/unknown_e4b39.png Binary files differnew file mode 100644 index 00000000..948c46fe --- /dev/null +++ b/gfx/pikachu/unknown_e4b39.png diff --git a/gfx/pikachu/unknown_e4bde.png b/gfx/pikachu/unknown_e4bde.png Binary files differnew file mode 100644 index 00000000..18209284 --- /dev/null +++ b/gfx/pikachu/unknown_e4bde.png diff --git a/gfx/pikachu/unknown_e4c3e.png b/gfx/pikachu/unknown_e4c3e.png Binary files differnew file mode 100644 index 00000000..698c15e8 --- /dev/null +++ b/gfx/pikachu/unknown_e4c3e.png diff --git a/gfx/pikachu/unknown_e4ce0.png b/gfx/pikachu/unknown_e4ce0.png Binary files differnew file mode 100644 index 00000000..68a6832b --- /dev/null +++ b/gfx/pikachu/unknown_e4ce0.png diff --git a/gfx/pikachu/unknown_e4e70.png b/gfx/pikachu/unknown_e4e70.png Binary files differnew file mode 100644 index 00000000..ee849b32 --- /dev/null +++ b/gfx/pikachu/unknown_e4e70.png diff --git a/gfx/pikachu/unknown_e5000.png b/gfx/pikachu/unknown_e5000.png Binary files differnew file mode 100644 index 00000000..9b2685e4 --- /dev/null +++ b/gfx/pikachu/unknown_e5000.png diff --git a/gfx/pikachu/unknown_e50af.png b/gfx/pikachu/unknown_e50af.png Binary files differnew file mode 100644 index 00000000..04acf34f --- /dev/null +++ b/gfx/pikachu/unknown_e50af.png diff --git a/gfx/pikachu/unknown_e523f.png b/gfx/pikachu/unknown_e523f.png Binary files differnew file mode 100644 index 00000000..810c752a --- /dev/null +++ b/gfx/pikachu/unknown_e523f.png diff --git a/gfx/pikachu/unknown_e52fe.png b/gfx/pikachu/unknown_e52fe.png Binary files differnew file mode 100644 index 00000000..7a33deec --- /dev/null +++ b/gfx/pikachu/unknown_e52fe.png diff --git a/gfx/pikachu/unknown_e548e.png b/gfx/pikachu/unknown_e548e.png Binary files differnew file mode 100644 index 00000000..442025a2 --- /dev/null +++ b/gfx/pikachu/unknown_e548e.png diff --git a/gfx/pikachu/unknown_e5541.png b/gfx/pikachu/unknown_e5541.png Binary files differnew file mode 100644 index 00000000..889fa5f6 --- /dev/null +++ b/gfx/pikachu/unknown_e5541.png diff --git a/gfx/pikachu/unknown_e56d1.png b/gfx/pikachu/unknown_e56d1.png Binary files differnew file mode 100644 index 00000000..85f96a92 --- /dev/null +++ b/gfx/pikachu/unknown_e56d1.png diff --git a/gfx/pikachu/unknown_e5794.png b/gfx/pikachu/unknown_e5794.png Binary files differnew file mode 100644 index 00000000..4926e791 --- /dev/null +++ b/gfx/pikachu/unknown_e5794.png diff --git a/gfx/pikachu/unknown_e5924.png b/gfx/pikachu/unknown_e5924.png Binary files differnew file mode 100644 index 00000000..b4f15591 --- /dev/null +++ b/gfx/pikachu/unknown_e5924.png diff --git a/gfx/pikachu/unknown_e59ed.png b/gfx/pikachu/unknown_e59ed.png Binary files differnew file mode 100644 index 00000000..971075ab --- /dev/null +++ b/gfx/pikachu/unknown_e59ed.png diff --git a/gfx/pikachu/unknown_e5b7d.png b/gfx/pikachu/unknown_e5b7d.png Binary files differnew file mode 100644 index 00000000..2b141191 --- /dev/null +++ b/gfx/pikachu/unknown_e5b7d.png diff --git a/gfx/pikachu/unknown_e5c4d.png b/gfx/pikachu/unknown_e5c4d.png Binary files differnew file mode 100644 index 00000000..07f70a39 --- /dev/null +++ b/gfx/pikachu/unknown_e5c4d.png diff --git a/gfx/pikachu/unknown_e5ddd.png b/gfx/pikachu/unknown_e5ddd.png Binary files differnew file mode 100644 index 00000000..e95e11ba --- /dev/null +++ b/gfx/pikachu/unknown_e5ddd.png diff --git a/gfx/pikachu/unknown_e5e90.png b/gfx/pikachu/unknown_e5e90.png Binary files differnew file mode 100644 index 00000000..8e896836 --- /dev/null +++ b/gfx/pikachu/unknown_e5e90.png diff --git a/gfx/pikachu/unknown_e6020.png b/gfx/pikachu/unknown_e6020.png Binary files differnew file mode 100644 index 00000000..7b938b8d --- /dev/null +++ b/gfx/pikachu/unknown_e6020.png diff --git a/gfx/pikachu/unknown_e61b0.png b/gfx/pikachu/unknown_e61b0.png Binary files differnew file mode 100644 index 00000000..d0260da7 --- /dev/null +++ b/gfx/pikachu/unknown_e61b0.png diff --git a/gfx/pikachu/unknown_e6340.png b/gfx/pikachu/unknown_e6340.png Binary files differnew file mode 100644 index 00000000..1bb0b1d9 --- /dev/null +++ b/gfx/pikachu/unknown_e6340.png diff --git a/gfx/pikachu/unknown_e63f7.png b/gfx/pikachu/unknown_e63f7.png Binary files differnew file mode 100644 index 00000000..71ed5a1f --- /dev/null +++ b/gfx/pikachu/unknown_e63f7.png diff --git a/gfx/pikachu/unknown_e6587.png b/gfx/pikachu/unknown_e6587.png Binary files differnew file mode 100644 index 00000000..0ec65607 --- /dev/null +++ b/gfx/pikachu/unknown_e6587.png diff --git a/gfx/pikachu/unknown_e6646.png b/gfx/pikachu/unknown_e6646.png Binary files differnew file mode 100644 index 00000000..c45de678 --- /dev/null +++ b/gfx/pikachu/unknown_e6646.png diff --git a/gfx/pikachu/unknown_e67d6.png b/gfx/pikachu/unknown_e67d6.png Binary files differnew file mode 100644 index 00000000..ee5bdacf --- /dev/null +++ b/gfx/pikachu/unknown_e67d6.png diff --git a/gfx/pikachu/unknown_e682f.png b/gfx/pikachu/unknown_e682f.png Binary files differnew file mode 100644 index 00000000..d0f522dc --- /dev/null +++ b/gfx/pikachu/unknown_e682f.png diff --git a/gfx/pikachu/unknown_e69bf.png b/gfx/pikachu/unknown_e69bf.png Binary files differnew file mode 100644 index 00000000..ce8de250 --- /dev/null +++ b/gfx/pikachu/unknown_e69bf.png diff --git a/gfx/pikachu/unknown_e6b4f.png b/gfx/pikachu/unknown_e6b4f.png Binary files differnew file mode 100644 index 00000000..4ea34714 --- /dev/null +++ b/gfx/pikachu/unknown_e6b4f.png diff --git a/gfx/pikachu/unknown_e6cdf.png b/gfx/pikachu/unknown_e6cdf.png Binary files differnew file mode 100644 index 00000000..f0f96237 --- /dev/null +++ b/gfx/pikachu/unknown_e6cdf.png diff --git a/gfx/pikachu/unknown_e6e6f.png b/gfx/pikachu/unknown_e6e6f.png Binary files differnew file mode 100644 index 00000000..608af942 --- /dev/null +++ b/gfx/pikachu/unknown_e6e6f.png diff --git a/gfx/pikachu/unknown_e6fff.png b/gfx/pikachu/unknown_e6fff.png Binary files differnew file mode 100644 index 00000000..a722794a --- /dev/null +++ b/gfx/pikachu/unknown_e6fff.png diff --git a/gfx/pikachu/unknown_e718f.png b/gfx/pikachu/unknown_e718f.png Binary files differnew file mode 100644 index 00000000..1276764c --- /dev/null +++ b/gfx/pikachu/unknown_e718f.png diff --git a/gfx/pikachu/unknown_e731f.png b/gfx/pikachu/unknown_e731f.png Binary files differnew file mode 100644 index 00000000..2d6d6bdb --- /dev/null +++ b/gfx/pikachu/unknown_e731f.png diff --git a/gfx/pikachu/unknown_e74af.png b/gfx/pikachu/unknown_e74af.png Binary files differnew file mode 100644 index 00000000..0aa1592b --- /dev/null +++ b/gfx/pikachu/unknown_e74af.png diff --git a/gfx/pikachu/unknown_e763f.png b/gfx/pikachu/unknown_e763f.png Binary files differnew file mode 100644 index 00000000..72f9ef29 --- /dev/null +++ b/gfx/pikachu/unknown_e763f.png diff --git a/gfx/pikachu/unknown_e77cf.png b/gfx/pikachu/unknown_e77cf.png Binary files differnew file mode 100644 index 00000000..ad94af7a --- /dev/null +++ b/gfx/pikachu/unknown_e77cf.png diff --git a/gfx/pikachu/unknown_e7863.png b/gfx/pikachu/unknown_e7863.png Binary files differnew file mode 100644 index 00000000..cd02d18d --- /dev/null +++ b/gfx/pikachu/unknown_e7863.png diff --git a/gfx/pikachu/unknown_e79f3.png b/gfx/pikachu/unknown_e79f3.png Binary files differnew file mode 100644 index 00000000..07b8230d --- /dev/null +++ b/gfx/pikachu/unknown_e79f3.png diff --git a/gfx/pikachu/unknown_e7b83.png b/gfx/pikachu/unknown_e7b83.png Binary files differnew file mode 100644 index 00000000..8a835dfb --- /dev/null +++ b/gfx/pikachu/unknown_e7b83.png diff --git a/gfx/pikachu/unknown_e7d13.png b/gfx/pikachu/unknown_e7d13.png Binary files differnew file mode 100644 index 00000000..3204f702 --- /dev/null +++ b/gfx/pikachu/unknown_e7d13.png diff --git a/gfx/pikachu/unknown_f0abf.png b/gfx/pikachu/unknown_f0abf.png Binary files differnew file mode 100644 index 00000000..dd553a8a --- /dev/null +++ b/gfx/pikachu/unknown_f0abf.png diff --git a/gfx/pikachu/unknown_f0b64.png b/gfx/pikachu/unknown_f0b64.png Binary files differnew file mode 100644 index 00000000..6b0424a8 --- /dev/null +++ b/gfx/pikachu/unknown_f0b64.png diff --git a/gfx/pikachu/unknown_f0cf4.png b/gfx/pikachu/unknown_f0cf4.png Binary files differnew file mode 100644 index 00000000..a4a4e5f4 --- /dev/null +++ b/gfx/pikachu/unknown_f0cf4.png diff --git a/gfx/pikachu/unknown_f0d82.png b/gfx/pikachu/unknown_f0d82.png Binary files differnew file mode 100644 index 00000000..1af4b770 --- /dev/null +++ b/gfx/pikachu/unknown_f0d82.png @@ -239,7 +239,7 @@ EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer ; nybble: y-coordinate ; nybble: x-coordinate ; word : pointer to map name - db (\1 + (\2 << 4)) + dn \2, \1 dw \3 ENDM @@ -251,7 +251,7 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer ; nybble: x-coordinate ; word : pointer to map name db \1 + 1 - db \2 + \3 << 4 + dn \3, \2 dw \4 ENDM @@ -2036,119 +2036,119 @@ SECTION "bank30",ROMX,BANK[$30] SECTION "bank39",ROMX,BANK[$39] Pic_e4000: ; e4000 - dr $e4000, $e40cc +INCBIN "gfx/pikachu/unknown_e4000.pic" GFX_e40cc: ; e40cc - dr $e40cc, $e411c +INCBIN "gfx/pikachu/unknown_e40cc.2bpp" Pic_e411c: ; e411c - dr $e411c, $e41d2 +INCBIN "gfx/pikachu/unknown_e411c.pic" GFX_e41d2: ; e41d2 - dr $e41d2, $e4272 +INCBIN "gfx/pikachu/unknown_e41d2.2bpp" Pic_e4272: ; e4272 - dr $e4272, $e4323 +INCBIN "gfx/pikachu/unknown_e4272.pic" GFX_e4323: ; e4323 - dr $e4323, $e4383 +INCBIN "gfx/pikachu/unknown_e4323.2bpp" Pic_e4383: ; e4383 - dr $e4383, $e444b +INCBIN "gfx/pikachu/unknown_e4383.pic" GFX_e444b: ; e444b - dr $e444b, $e458b +INCBIN "gfx/pikachu/unknown_e444b.2bpp" Pic_e458b: ; e458b - dr $e458b, $e463b +INCBIN "gfx/pikachu/unknown_e458b.pic" GFX_e463b: ; e463b - dr $e463b, $e467b +INCBIN "gfx/pikachu/unknown_e463b.2bpp" Pic_e467b: ; e467b - dr $e467b, $e472e +INCBIN "gfx/pikachu/unknown_e467b.pic" GFX_e472e: ; e472e - dr $e472e, $e476e +INCBIN "gfx/pikachu/unknown_e472e.2bpp" Pic_e476e: ; e476e - dr $e476e, $e4841 +INCBIN "gfx/pikachu/unknown_e476e.pic" GFX_e4841: ; e4841 - dr $e4841, $e49d1 +INCBIN "gfx/pikachu/unknown_e4841.2bpp" Pic_e49d1: ; e49d1 - dr $e49d1, $e4a99 +INCBIN "gfx/pikachu/unknown_e49d1.pic" GFX_e4a99: ; e4a99 - dr $e4a99, $e4b39 +INCBIN "gfx/pikachu/unknown_e4a99.2bpp" Pic_e4b39: ; e4b39 - dr $e4b39, $e4bde +INCBIN "gfx/pikachu/unknown_e4b39.pic" GFX_e4bde: ; e4bde - dr $e4bde, $e4c3e +INCBIN "gfx/pikachu/unknown_e4bde.2bpp" Pic_e4c3e: ; e4c3e - dr $e4c3e, $e4ce0 +INCBIN "gfx/pikachu/unknown_e4c3e.pic" GFX_e4ce0: ; e4ce0 - dr $e4ce0, $e4e70 +INCBIN "gfx/pikachu/unknown_e4ce0.2bpp" GFX_e4e70: ; e4e70 - dr $e4e70, $e5000 +INCBIN "gfx/pikachu/unknown_e4e70.2bpp" Pic_e5000: ; e5000 - dr $e5000, $e50af +INCBIN "gfx/pikachu/unknown_e5000.pic" GFX_e50af: ; e50af - dr $e50af, $e523f +INCBIN "gfx/pikachu/unknown_e50af.2bpp" Pic_e523f: ; e523f - dr $e523f, $e52fe +INCBIN "gfx/pikachu/unknown_e523f.pic" GFX_e52fe: ; e52fe - dr $e52fe, $e548e +INCBIN "gfx/pikachu/unknown_e52fe.2bpp" Pic_e548e: ; e548e - dr $e548e, $e5541 +INCBIN "gfx/pikachu/unknown_e548e.pic" GFX_e5541: ; e5541 - dr $e5541, $e56d1 +INCBIN "gfx/pikachu/unknown_e5541.2bpp" Pic_e56d1: ; e56d1 - dr $e56d1, $e5794 +INCBIN "gfx/pikachu/unknown_e56d1.pic" GFX_e5794: ; e5794 - dr $e5794, $e5924 +INCBIN "gfx/pikachu/unknown_e5794.2bpp" Pic_e5924: ; e5924 - dr $e5924, $e59ed +INCBIN "gfx/pikachu/unknown_e5924.pic" GFX_e59ed: ; e59ed - dr $e59ed, $e5b7d +INCBIN "gfx/pikachu/unknown_e59ed.2bpp" Pic_e5b7d: ; e5b7d - dr $e5b7d, $e5c4d +INCBIN "gfx/pikachu/unknown_e5b7d.pic" GFX_e5c4d: ; e5c4d - dr $e5c4d, $e5ddd +INCBIN "gfx/pikachu/unknown_e5c4d.2bpp" Pic_e5ddd: ; e5ddd - dr $e5ddd, $e5e90 +INCBIN "gfx/pikachu/unknown_e5ddd.pic" GFX_e5e90: ; e5e90 - dr $e5e90, $e6020 +INCBIN "gfx/pikachu/unknown_e5e90.2bpp" GFX_e6020: ; e6020 - dr $e6020, $e61b0 +INCBIN "gfx/pikachu/unknown_e6020.2bpp" GFX_e61b0: ; e61b0 - dr $e61b0, $e6340 +INCBIN "gfx/pikachu/unknown_e61b0.2bpp" Pic_e6340: ; e6340 - dr $e6340, $e63f7 +INCBIN "gfx/pikachu/unknown_e6340.pic" GFX_e63f7: ; e63f7 - dr $e63f7, $e6587 +INCBIN "gfx/pikachu/unknown_e63f7.2bpp" Pic_e6587: ; e6587 - dr $e6587, $e6646 +INCBIN "gfx/pikachu/unknown_e6587.pic" GFX_e6646: ; e6646 - dr $e6646, $e67d6 +INCBIN "gfx/pikachu/unknown_e6646.2bpp" Pic_e67d6: ; e67d6 - dr $e67d6, $e682f +INCBIN "gfx/pikachu/unknown_e67d6.pic" GFX_e682f: ; e682f - dr $e682f, $e69bf +INCBIN "gfx/pikachu/unknown_e682f.2bpp" GFX_e69bf: ; e69bf - dr $e69bf, $e6b4f +INCBIN "gfx/pikachu/unknown_e69bf.2bpp" GFX_e6b4f: ; e6b4f - dr $e6b4f, $e6cdf +INCBIN "gfx/pikachu/unknown_e6b4f.2bpp" GFX_e6cdf: ; e6cdf - dr $e6cdf, $e6e6f +INCBIN "gfx/pikachu/unknown_e6cdf.2bpp" GFX_e6e6f: ; e6e6f - dr $e6e6f, $e6fff +INCBIN "gfx/pikachu/unknown_e6e6f.2bpp" GFX_e6fff: ; e6fff - dr $e6fff, $e718f +INCBIN "gfx/pikachu/unknown_e6fff.2bpp" GFX_e718f: ; e718f - dr $e718f, $e731f +INCBIN "gfx/pikachu/unknown_e718f.2bpp" GFX_e731f: ; e731f - dr $e731f, $e74af +INCBIN "gfx/pikachu/unknown_e731f.2bpp" GFX_e74af: ; e74af - dr $e74af, $e763f +INCBIN "gfx/pikachu/unknown_e74af.2bpp" GFX_e763f: ; e763f - dr $e763f, $e77cf +INCBIN "gfx/pikachu/unknown_e763f.2bpp" Pic_e77cf: ; e77cf - dr $e77cf, $e7863 +INCBIN "gfx/pikachu/unknown_e77cf.pic" GFX_e7863: ; e7863 - dr $e7863, $e79f3 +INCBIN "gfx/pikachu/unknown_e7863.2bpp" GFX_e79f3: ; e79f3 - dr $e79f3, $e7b83 +INCBIN "gfx/pikachu/unknown_e79f3.2bpp" GFX_e7b83: ; e7b83 - dr $e7b83, $e7d13 +INCBIN "gfx/pikachu/unknown_e7b83.2bpp" GFX_e7d13: ; e7d13 - dr $e7d13, $e7ea3 +INCBIN "gfx/pikachu/unknown_e7d13.2bpp" SECTION "bank3A",ROMX,BANK[$3A] INCLUDE "text/monster_names.asm" diff --git a/text/map_names.asm b/text/map_names.asm index dd8592be..0338cba3 100755 --- a/text/map_names.asm +++ b/text/map_names.asm @@ -98,7 +98,7 @@ RocketHQName: ; 7167a (1c:567a) SilphCoName: ; 71684 (1c:5684) db "SILPH CO.@" PokemonMansionName: ; 7168e (1c:568e) - db $4a," MANSION@" + db "<pkmn> MANSION@" SafariZoneName: ; 71698 (1c:5698) db "SAFARI ZONE@" CeruleanCaveName: ; 716a4 (1c:56a4) |
