diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-28 16:11:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-28 16:11:41 -0400 |
| commit | b6c7c6523fedb21e5928fbaf8e01747f4283cfc1 (patch) | |
| tree | 78a5883fe8d09df73735088bec0bc331cd60b29a /data | |
| parent | db3d5c90433a94747c23e48cf85badfc5286b07f (diff) | |
berry_pouch through sub_813D0E4
Diffstat (limited to 'data')
| -rw-r--r-- | data/berry_pouch.s | 9 | ||||
| -rw-r--r-- | data/graphics.s | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/data/berry_pouch.s b/data/berry_pouch.s index 172443b5e..ac62b258b 100644 --- a/data/berry_pouch.s +++ b/data/berry_pouch.s @@ -1,9 +1,8 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_846434C:: @ 846434C - .incbin "baserom.gba", 0x46434C, 0xC - gUnknown_8464358:: @ 8464358 .incbin "baserom.gba", 0x464358, 0x14 @@ -50,10 +49,10 @@ gUnknown_8464448:: @ 8464448 .incbin "baserom.gba", 0x464448, 0x60 gUnknown_84644A8:: @ 84644A8 - .incbin "baserom.gba", 0x4644A8, 0x8 + obj_tiles gUnknown_8E8560C, 0x800, 100 gUnknown_84644B0:: @ 84644B0 - .incbin "baserom.gba", 0x4644B0, 0x8 + obj_pal gUnknown_8E85C1C, 100 gUnknown_84644B8:: @ 84644B8 .incbin "baserom.gba", 0x4644B8, 0x32C diff --git a/data/graphics.s b/data/graphics.s index 96ef720e9..a7f262aca 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13989,22 +13989,22 @@ gItemPcTilemap:: @ 8E85458 .incbin "graphics/item_pc/unk_8E85458.bin.lz" gUnknown_8E8560C:: @ 8E8560C - .incbin "baserom.gba", 0xE8560C, 0x3C4 + .incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz" gUnknown_8E859D0:: @ 8E859D0 - .incbin "baserom.gba", 0xE859D0, 0x1D4 + .incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz" gUnknown_8E85BA4:: @ 8E85BA4 - .incbin "baserom.gba", 0xE85BA4, 0x50 + .incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz" gUnknown_8E85BF4:: @ 8E85BF4 - .incbin "baserom.gba", 0xE85BF4, 0x28 + .incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz" gUnknown_8E85C1C:: @ 8E85C1C - .incbin "baserom.gba", 0xE85C1C, 0x28 + .incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz" gUnknown_8E85C44:: @ 8E85C44 - .incbin "baserom.gba", 0xE85C44, 0x184 + .incbin "graphics/berry_pouch/unk_8E85C44.bin.lz" gUnknown_8E85DC8:: @ 8E85DC8 .incbin "baserom.gba", 0xE85DC8, 0x134 |