From 561d60342f7ec39f03671ce37ab4f0ab8d0244c6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 22 Sep 2017 21:18:53 -0400 Subject: Decompile data --- data/unk_text_util_2.s | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 data/unk_text_util_2.s (limited to 'data') diff --git a/data/unk_text_util_2.s b/data/unk_text_util_2.s deleted file mode 100644 index 69f227ea2..000000000 --- a/data/unk_text_util_2.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_08616124:: @ 8616124 - .incbin "baserom.gba", 0x616124, 0x4 - - .align 2 -gFont6BrailleGlyphs:: @ 8616128 - .incbin "data/graphics/fonts/font6.fwjpnfont" -- cgit v1.2.3 From 20ed9ad0ac92cddcbfe66ccc9c2ae3cb1000ed71 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Sep 2017 21:19:29 -0400 Subject: Decompile asm/tileset.s into src/palette.c --- data/graphics.s | 14 +++++++++++++- data/palette.s | 18 ------------------ data/start_menu.s | 2 +- data/tileset.s | 3 +++ 4 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 data/palette.s (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 0fa256449..a64dc1332 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -354,7 +354,19 @@ gUnknown_08D85600:: @ 8D85600 .incbin "baserom.gba", 0xd85600, 0x20 gUnknown_08D85620:: @ 8D85620 - .incbin "baserom.gba", 0xd85620, 0xa8 + .incbin "baserom.gba", 0xd85620, 0x20 + +gUnknown_08D85640:: @ 8D85640 + .incbin "baserom.gba", 0xd85640, 0x20 + +gUnknown_08D85660:: @ 8D85660 + .incbin "baserom.gba", 0xd85660, 0x20 + +gUnknown_08D85680:: @ 8D85680 + .incbin "baserom.gba", 0xd85680, 0x20 + +gUnknown_08D856A0:: @ 8D856A0 + .incbin "baserom.gba", 0xd856a0, 0x28 gUnknown_08D856C8:: @ 8D856C8 .incbin "baserom.gba", 0xd856c8, 0xe0 diff --git a/data/palette.s b/data/palette.s deleted file mode 100644 index 2dbfed8d2..000000000 --- a/data/palette.s +++ /dev/null @@ -1,18 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0852487C:: @ 852487C - .incbin "baserom.gba", 0x52487c, 0x10 - -gDummyPaletteStructTemplate:: @ 852488C - .2byte 0xFFFF - .space 9 - .byte 0x20 - .space 4 - - .align 2 -gUnknown_0852489C:: @ 852489C - .incbin "baserom.gba", 0x52489c, 0x20 diff --git a/data/start_menu.s b/data/start_menu.s index eaba0b8e1..07e428d0d 100644 --- a/data/start_menu.s +++ b/data/start_menu.s @@ -26,4 +26,4 @@ gUnknown_085105AC:: @ 85105AC .incbin "baserom.gba", 0x5105ac, 0x10 gUnknown_085105BC:: @ 85105BC - .incbin "baserom.gba", 0x5105bc, 0x1a8 + .incbin "baserom.gba", 0x5105bc, 0x8 diff --git a/data/tileset.s b/data/tileset.s index 1221d8967..a69e53acf 100644 --- a/data/tileset.s +++ b/data/tileset.s @@ -4,6 +4,9 @@ .section .rodata .align 2, 0 +Unknown_085105C4:: + .incbin "baserom.gba", 0x5105C4, 0x1A0 + gUnknown_08510764:: @ 8510764 .incbin "baserom.gba", 0x510764, 0xb60 -- cgit v1.2.3 From a1ccd78218cf920bbf62278d02f143b903f1314e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Sep 2017 22:16:51 -0400 Subject: Disassemble pointer tables in data/tileset.s --- data/tileset.s | 651 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 613 insertions(+), 38 deletions(-) (limited to 'data') diff --git a/data/tileset.s b/data/tileset.s index a69e53acf..3a1efb5fc 100644 --- a/data/tileset.s +++ b/data/tileset.s @@ -4,116 +4,691 @@ .section .rodata .align 2, 0 -Unknown_085105C4:: - .incbin "baserom.gba", 0x5105C4, 0x1A0 +gUnknown_085105C4:: + .incbin "baserom.gba", 0x5105c4, 0x80 + +gUnknown_08510644:: + .incbin "baserom.gba", 0x510644, 0x80 + +gUnknown_085106C4:: + .incbin "baserom.gba", 0x5106c4, 0xa0 + gUnknown_08510764:: @ 8510764 - .incbin "baserom.gba", 0x510764, 0xb60 +@ replacing .incbin "baserom.gba", 0x00510764, 0x10 + .4byte gUnknown_08510644 + .4byte gUnknown_085105C4 + .4byte gUnknown_08510644 + .4byte gUnknown_085106C4 + +gUnknown_08510774:: + .incbin "baserom.gba", 0x510774, 0x3c0 + +gUnknown_08510B34:: + .incbin "baserom.gba", 0x510b34, 0x3c0 + +gUnknown_08510EF4:: + .incbin "baserom.gba", 0x510ef4, 0x3c0 + +gUnknown_085112B4:: + .incbin "baserom.gba", 0x5112b4, 0x10 + gUnknown_085112C4:: @ 85112C4 - .incbin "baserom.gba", 0x5112c4, 0x908 + .incbin "baserom.gba", 0x5112c4, 0x3b0 + +gUnknown_08511674:: + .incbin "baserom.gba", 0x511674, 0x3c0 + +gUnknown_08511A34:: + .incbin "baserom.gba", 0x511a34, 0x198 + gUnknown_08511BCC:: @ 8511BCC - .incbin "baserom.gba", 0x511bcc, 0x9a8 + .incbin "baserom.gba", 0x511bcc, 0x228 + +gUnknown_08511DF4:: + .incbin "baserom.gba", 0x511df4, 0x3c0 + +gUnknown_085121B4:: + .incbin "baserom.gba", 0x5121b4, 0x3c0 + gUnknown_08512574:: @ 8512574 - .incbin "baserom.gba", 0x512574, 0x8e0 +@ replacing .incbin "baserom.gba", 0x00512574, 0x20 + .4byte gUnknown_08510774 + .4byte gUnknown_08510B34 + .4byte gUnknown_08510EF4 + .4byte gUnknown_085112B4 + .4byte gUnknown_08511674 + .4byte gUnknown_08511A34 + .4byte gUnknown_08511DF4 + .4byte gUnknown_085121B4 + +gUnknown_08512594:: + .incbin "baserom.gba", 0x512594, 0x140 + +gUnknown_085126D4:: + .incbin "baserom.gba", 0x5126d4, 0x140 + +gUnknown_08512814:: + .incbin "baserom.gba", 0x512814, 0x140 + +gUnknown_08512954:: + .incbin "baserom.gba", 0x512954, 0x140 + +gUnknown_08512A94:: + .incbin "baserom.gba", 0x512a94, 0x140 + +gUnknown_08512BD4:: + .incbin "baserom.gba", 0x512bd4, 0x140 + +gUnknown_08512D14:: + .incbin "baserom.gba", 0x512d14, 0x140 + gUnknown_08512E54:: @ 8512E54 - .incbin "baserom.gba", 0x512e54, 0x320 +@ replacing .incbin "baserom.gba", 0x00512e54, 0x20 + .4byte gUnknown_08512594 + .4byte gUnknown_085126D4 + .4byte gUnknown_08512814 + .4byte gUnknown_08512954 + .4byte gUnknown_08512A94 + .4byte gUnknown_08512BD4 + .4byte gUnknown_08512D14 + .4byte gUnknown_08512594 + +gUnknown_08512E74:: + .incbin "baserom.gba", 0x512e74, 0xc0 + +gUnknown_08512F34:: + .incbin "baserom.gba", 0x512f34, 0xc0 + +gUnknown_08512FF4:: + .incbin "baserom.gba", 0x512ff4, 0xc0 + +gUnknown_085130B4:: + .incbin "baserom.gba", 0x5130b4, 0xc0 + gUnknown_08513174:: @ 8513174 - .incbin "baserom.gba", 0x513174, 0x510 +@ replacing .incbin "baserom.gba", 0x00513174, 0x10 + .4byte gUnknown_08512E74 + .4byte gUnknown_08512F34 + .4byte gUnknown_08512FF4 + .4byte gUnknown_085130B4 + +gUnknown_08513184:: + .incbin "baserom.gba", 0x513184, 0x140 + +gUnknown_085132C4:: + .incbin "baserom.gba", 0x5132c4, 0x140 + +gUnknown_08513404:: + .incbin "baserom.gba", 0x513404, 0x140 + +gUnknown_08513544:: + .incbin "baserom.gba", 0x513544, 0x140 + gUnknown_08513684:: @ 8513684 - .incbin "baserom.gba", 0x513684, 0x210 +@ replacing .incbin "baserom.gba", 0x00513684, 0x10 + .4byte gUnknown_08513184 + .4byte gUnknown_085132C4 + .4byte gUnknown_08513404 + .4byte gUnknown_08513544 + +gUnknown_08513694:: + .incbin "baserom.gba", 0x513694, 0x80 + +gUnknown_08513714:: + .incbin "baserom.gba", 0x513714, 0x80 + +gUnknown_08513794:: + .incbin "baserom.gba", 0x513794, 0x80 + +gUnknown_08513814:: + .incbin "baserom.gba", 0x513814, 0x80 + gUnknown_08513894:: @ 8513894 - .incbin "baserom.gba", 0x513894, 0xb50 +@ replacing .incbin "baserom.gba", 0x00513894, 0x10 + .4byte gUnknown_08513694 + .4byte gUnknown_08513714 + .4byte gUnknown_08513794 + .4byte gUnknown_08513814 + +gUnknown_085138A4:: + .incbin "baserom.gba", 0x5138a4, 0x3c0 + +gUnknown_08513C64:: + .incbin "baserom.gba", 0x513c64, 0x3c0 + +gUnknown_08514024:: + .incbin "baserom.gba", 0x514024, 0x3c0 + gUnknown_085143E4:: @ 85143E4 - .incbin "baserom.gba", 0x5143e4, 0x210 +@ replacing .incbin "baserom.gba", 0x005143e4, 0x10 + .4byte gUnknown_085138A4 + .4byte gUnknown_08513C64 + .4byte gUnknown_08514024 + .4byte gUnknown_08513C64 + +gUnknown_085143F4:: + .incbin "baserom.gba", 0x5143f4, 0x80 + +gUnknown_08514474:: + .incbin "baserom.gba", 0x514474, 0x80 + +gUnknown_085144F4:: + .incbin "baserom.gba", 0x5144f4, 0x80 + +gUnknown_08514574:: + .incbin "baserom.gba", 0x514574, 0x80 + gUnknown_085145F4:: @ 85145F4 - .incbin "baserom.gba", 0x5145f4, 0x810 +@ replacing .incbin "baserom.gba", 0x005145f4, 0x10 + .4byte gUnknown_085143F4 + .4byte gUnknown_08514474 + .4byte gUnknown_085144F4 + .4byte gUnknown_08514574 + +gUnknown_08514604:: + .incbin "baserom.gba", 0x514604, 0x100 + +gUnknown_08514704:: + .incbin "baserom.gba", 0x514704, 0x100 + +gUnknown_08514804:: + .incbin "baserom.gba", 0x514804, 0x100 + +gUnknown_08514904:: + .incbin "baserom.gba", 0x514904, 0x100 + +gUnknown_08514A04:: + .incbin "baserom.gba", 0x514a04, 0x100 + +gUnknown_08514B04:: + .incbin "baserom.gba", 0x514b04, 0x100 + +gUnknown_08514C04:: + .incbin "baserom.gba", 0x514c04, 0x100 + +gUnknown_08514D04:: + .incbin "baserom.gba", 0x514d04, 0x100 + gUnknown_08514E04:: @ 8514E04 - .incbin "baserom.gba", 0x514e04, 0x540 +@ replacing .incbin "baserom.gba", 0x00514e04, 0x20 + .4byte gUnknown_08514604 + .4byte gUnknown_08514704 + .4byte gUnknown_08514804 + .4byte gUnknown_08514904 + .4byte gUnknown_08514A04 + .4byte gUnknown_08514B04 + .4byte gUnknown_08514C04 + .4byte gUnknown_08514D04 + +gUnknown_08514E24:: + .incbin "baserom.gba", 0x514e24, 0x80 + +gUnknown_08514EA4:: + .incbin "baserom.gba", 0x514ea4, 0x80 + +gUnknown_08514F24:: + .incbin "baserom.gba", 0x514f24, 0x80 + +gUnknown_08514FA4:: + .incbin "baserom.gba", 0x514fa4, 0x80 + +gUnknown_08515024:: + .incbin "baserom.gba", 0x515024, 0x80 + +gUnknown_085150A4:: + .incbin "baserom.gba", 0x5150a4, 0x80 + +gUnknown_08515124:: + .incbin "baserom.gba", 0x515124, 0x80 + +gUnknown_085151A4:: + .incbin "baserom.gba", 0x5151a4, 0x80 + +gUnknown_08515224:: + .incbin "baserom.gba", 0x515224, 0x80 + +gUnknown_085152A4:: + .incbin "baserom.gba", 0x5152a4, 0xa0 + gUnknown_08515344:: @ 8515344 - .incbin "baserom.gba", 0x515344, 0x20 +@ replacing .incbin "baserom.gba", 0x00515344, 0x20 + .4byte VRAM + 0x4c00 + .4byte VRAM + 0x4c80 + .4byte VRAM + 0x4d00 + .4byte VRAM + 0x4d80 + .4byte VRAM + 0x4e00 + .4byte VRAM + 0x4e80 + .4byte VRAM + 0x4f00 + .4byte VRAM + 0x4f80 gUnknown_08515364:: @ 8515364 - .incbin "baserom.gba", 0x515364, 0x20 +@ replacing .incbin "baserom.gba", 0x00515364, 0x20 + .4byte VRAM + 0x5000 + .4byte VRAM + 0x5080 + .4byte VRAM + 0x5100 + .4byte VRAM + 0x5180 + .4byte VRAM + 0x5200 + .4byte VRAM + 0x5280 + .4byte VRAM + 0x5300 + .4byte VRAM + 0x5380 gUnknown_08515384:: @ 8515384 - .incbin "baserom.gba", 0x515384, 0x30 +@ replacing .incbin "baserom.gba", 0x00515384, 0x30 + .4byte gUnknown_08514E24 + .4byte gUnknown_08514E24 + .4byte gUnknown_08514EA4 + .4byte gUnknown_08514F24 + .4byte gUnknown_08514FA4 + .4byte gUnknown_08514FA4 + .4byte gUnknown_08514FA4 + .4byte gUnknown_08514FA4 + .4byte gUnknown_08514FA4 + .4byte gUnknown_08514FA4 + .4byte gUnknown_08514F24 + .4byte gUnknown_08514EA4 gUnknown_085153B4:: @ 85153B4 - .incbin "baserom.gba", 0x5153b4, 0x30 +@ replacing .incbin "baserom.gba", 0x005153b4, 0x30 + .4byte gUnknown_085150A4 + .4byte gUnknown_085150A4 + .4byte gUnknown_08515124 + .4byte gUnknown_085151A4 + .4byte gUnknown_08515224 + .4byte gUnknown_08515224 + .4byte gUnknown_08515224 + .4byte gUnknown_08515224 + .4byte gUnknown_08515224 + .4byte gUnknown_08515224 + .4byte gUnknown_085151A4 + .4byte gUnknown_08515124 gUnknown_085153E4:: @ 85153E4 - .incbin "baserom.gba", 0x5153e4, 0x10 +@ replacing .incbin "baserom.gba", 0x005153e4, 0x10 + .4byte gUnknown_08514E24 + .4byte gUnknown_08514E24 + .4byte gUnknown_08515024 + .4byte gUnknown_08515024 gUnknown_085153F4:: @ 85153F4 - .incbin "baserom.gba", 0x5153f4, 0x410 +@ replacing .incbin "baserom.gba", 0x005153f4, 0x10 + .4byte gUnknown_085150A4 + .4byte gUnknown_085150A4 + .4byte gUnknown_085152A4 + .4byte gUnknown_085152A4 + +gUnknown_08515404:: + .incbin "baserom.gba", 0x515404, 0x80 + +gUnknown_08515484:: + .incbin "baserom.gba", 0x515484, 0x80 + +gUnknown_08515504:: + .incbin "baserom.gba", 0x515504, 0x80 + +gUnknown_08515584:: + .incbin "baserom.gba", 0x515584, 0x80 + +gUnknown_08515604:: + .incbin "baserom.gba", 0x515604, 0x80 + +gUnknown_08515684:: + .incbin "baserom.gba", 0x515684, 0x80 + +gUnknown_08515704:: + .incbin "baserom.gba", 0x515704, 0x80 + +gUnknown_08515784:: + .incbin "baserom.gba", 0x515784, 0x80 + gUnknown_08515804:: @ 8515804 .incbin "baserom.gba", 0x515804, 0x20 + gUnknown_08515824:: @ 8515824 - .incbin "baserom.gba", 0x515824, 0x140 +@ replacing .incbin "baserom.gba", 0x00515824, 0x20 + .4byte gUnknown_08515404 + .4byte gUnknown_08515484 + .4byte gUnknown_08515504 + .4byte gUnknown_08515584 + .4byte gUnknown_08515604 + .4byte gUnknown_08515684 + .4byte gUnknown_08515704 + .4byte gUnknown_08515784 + +gUnknown_08515844:: + .incbin "baserom.gba", 0x515844, 0x80 + +gUnknown_085158C4:: + .incbin "baserom.gba", 0x5158c4, 0xa0 + gUnknown_08515964:: @ 8515964 - .incbin "baserom.gba", 0x515964, 0x428 +@ replacing .incbin "baserom.gba", 0x00515964, 0x8 + .4byte gUnknown_08515844 + .4byte gUnknown_085158C4 + +gUnknown_0851596C:: + .incbin "baserom.gba", 0x51596c, 0x80 + +gUnknown_085159EC:: + .incbin "baserom.gba", 0x5159ec, 0x80 + +gUnknown_08515A6C:: + .incbin "baserom.gba", 0x515a6c, 0x80 + +gUnknown_08515AEC:: + .incbin "baserom.gba", 0x515aec, 0x2a0 + gUnknown_08515D8C:: @ 8515D8C - .incbin "baserom.gba", 0x515d8c, 0x430 +@ replacing .incbin "baserom.gba", 0x00515d8c, 0x10 + .4byte gUnknown_0851596C + .4byte gUnknown_085159EC + .4byte gUnknown_08515A6C + .4byte gUnknown_08515AEC + +gUnknown_08515D9C:: + .incbin "baserom.gba", 0x515d9c, 0x80 + +gUnknown_08515E1C:: + .incbin "baserom.gba", 0x515e1c, 0x80 + +gUnknown_08515E9C:: + .incbin "baserom.gba", 0x515e9c, 0x80 + +gUnknown_08515F1C:: + .incbin "baserom.gba", 0x515f1c, 0x80 + +gUnknown_08515F9C:: + .incbin "baserom.gba", 0x515f9c, 0x80 + +gUnknown_0851601C:: + .incbin "baserom.gba", 0x51601c, 0x80 + +gUnknown_0851609C:: + .incbin "baserom.gba", 0x51609c, 0x80 + +gUnknown_0851611C:: + .incbin "baserom.gba", 0x51611c, 0xa0 + gUnknown_085161BC:: @ 85161BC - .incbin "baserom.gba", 0x5161bc, 0x20 +@ replacing .incbin "baserom.gba", 0x005161bc, 0x20 + .4byte VRAM + 0x5c00 + .4byte VRAM + 0x5c80 + .4byte VRAM + 0x5d00 + .4byte VRAM + 0x5d80 + .4byte VRAM + 0x5e00 + .4byte VRAM + 0x5e80 + .4byte VRAM + 0x5f00 + .4byte VRAM + 0x5f80 gUnknown_085161DC:: @ 85161DC - .incbin "baserom.gba", 0x5161dc, 0x320 +@ replacing .incbin "baserom.gba", 0x005161dc, 0x20 + .4byte gUnknown_08515D9C + .4byte gUnknown_08515E1C + .4byte gUnknown_08515E9C + .4byte gUnknown_08515F1C + .4byte gUnknown_08515F9C + .4byte gUnknown_0851601C + .4byte gUnknown_0851609C + .4byte gUnknown_0851611C + +gUnknown_085161FC:: + .incbin "baserom.gba", 0x5161fc, 0xc0 + +gUnknown_085162BC:: + .incbin "baserom.gba", 0x5162bc, 0xc0 + +gUnknown_0851637C:: + .incbin "baserom.gba", 0x51637c, 0xc0 + +gUnknown_0851643C:: + .incbin "baserom.gba", 0x51643c, 0xc0 + gUnknown_085164FC:: @ 85164FC - .incbin "baserom.gba", 0x5164fc, 0x310 +@ replacing .incbin "baserom.gba", 0x005164fc, 0x10 + .4byte gUnknown_085161FC + .4byte gUnknown_085162BC + .4byte gUnknown_0851637C + .4byte gUnknown_0851643C + +gUnknown_0851650C:: + .incbin "baserom.gba", 0x51650c, 0xc0 + +gUnknown_085165CC:: + .incbin "baserom.gba", 0x5165cc, 0xc0 + +gUnknown_0851668C:: + .incbin "baserom.gba", 0x51668c, 0xc0 + +gUnknown_0851674C:: + .incbin "baserom.gba", 0x51674c, 0xc0 + gUnknown_0851680C:: @ 851680C - .incbin "baserom.gba", 0x51680c, 0x310 +@ replacing .incbin "baserom.gba", 0x0051680c, 0x10 + .4byte gUnknown_0851650C + .4byte gUnknown_085165CC + .4byte gUnknown_0851668C + .4byte gUnknown_0851674C + +gUnknown_0851681C:: @ 851680C + .incbin "baserom.gba", 0x51681c, 0xc0 + +gUnknown_085168DC:: + .incbin "baserom.gba", 0x5168dc, 0xc0 + +gUnknown_0851699C:: + .incbin "baserom.gba", 0x51699c, 0xc0 + +gUnknown_08516A5C:: + .incbin "baserom.gba", 0x516a5c, 0xc0 + gUnknown_08516B1C:: @ 8516B1C - .incbin "baserom.gba", 0x516b1c, 0x210 +@ replacing .incbin "baserom.gba", 0x00516b1c, 0x10 + .4byte gUnknown_0851681C + .4byte gUnknown_085168DC + .4byte gUnknown_0851699C + .4byte gUnknown_08516A5C + +gUnknown_08516B2C:: + .incbin "baserom.gba", 0x516b2c, 0x80 + +gUnknown_08516BAC:: + .incbin "baserom.gba", 0x516bac, 0x80 + +gUnknown_08516C2C:: + .incbin "baserom.gba", 0x516c2c, 0x80 + +gUnknown_08516CAC:: + .incbin "baserom.gba", 0x516cac, 0x80 + gUnknown_08516D2C:: @ 8516D2C - .incbin "baserom.gba", 0x516d2c, 0x110 +@ replacing .incbin "baserom.gba", 0x00516d2c, 0x10 + .4byte gUnknown_08516B2C + .4byte gUnknown_08516BAC + .4byte gUnknown_08516C2C + .4byte gUnknown_08516CAC + +gUnknown_08516D3C:: + .incbin "baserom.gba", 0x516d3c, 0x80 + +gUnknown_08516DBC:: + .incbin "baserom.gba", 0x516dbc, 0x80 + gUnknown_08516E3C:: @ 8516E3C - .incbin "baserom.gba", 0x516e3c, 0xc08 +@ replacing .incbin "baserom.gba", 0x00516e3c, 0x8 + .4byte gUnknown_08516D3C + .4byte gUnknown_08516DBC + +gUnknown_08516E44:: + .incbin "baserom.gba", 0x516e44, 0x180 + +gUnknown_08516FC4:: + .incbin "baserom.gba", 0x516fc4, 0x180 + +gUnknown_08517144:: + .incbin "baserom.gba", 0x517144, 0x180 + +gUnknown_085172C4:: + .incbin "baserom.gba", 0x5172c4, 0x280 + +gUnknown_08517544:: + .incbin "baserom.gba", 0x517544, 0x280 + +gUnknown_085177C4:: + .incbin "baserom.gba", 0x5177c4, 0x280 + gUnknown_08517A44:: @ 8517A44 - .incbin "baserom.gba", 0x517a44, 0xc +@ replacing .incbin "baserom.gba", 0x00517a44, 0xc + .4byte gUnknown_08516E44 + .4byte gUnknown_08516FC4 + .4byte gUnknown_08517144 gUnknown_08517A50:: @ 8517A50 - .incbin "baserom.gba", 0x517a50, 0x1ac +@ replacing .incbin "baserom.gba", 0x00517a50, 0xc + .4byte gUnknown_085172C4 + .4byte gUnknown_08517544 + .4byte gUnknown_085177C4 + +gUnknown_08517A5C:: + .incbin "baserom.gba", 0x517a5c, 0x80 + +gUnknown_08517ADC:: + .incbin "baserom.gba", 0x517adc, 0x80 + +gUnknown_08517B5C:: + .incbin "baserom.gba", 0x517b5c, 0x20 + +gUnknown_08517B7C:: + .incbin "baserom.gba", 0x517b7c, 0x20 + +gUnknown_08517B9C:: + .incbin "baserom.gba", 0x517b9c, 0x20 + +gUnknown_08517BBC:: + .incbin "baserom.gba", 0x517bbc, 0x40 + gUnknown_08517BFC:: @ 8517BFC - .incbin "baserom.gba", 0x517bfc, 0x10 +@ replacing .incbin "baserom.gba", 0x00517bfc, 0x10 + .4byte gUnknown_08517B5C + .4byte gUnknown_08517B7C + .4byte gUnknown_08517B9C + .4byte gUnknown_08517BBC gUnknown_08517C0C:: @ 8517C0C - .incbin "baserom.gba", 0x517c0c, 0x428 +@ replacing .incbin "baserom.gba", 0x00517c0c, 0x8 + .4byte gUnknown_08517A5C + .4byte gUnknown_08517ADC + +gUnknown_08517C14:: + .incbin "baserom.gba", 0x517c14, 0x200 + +gUnknown_08517E14:: + .incbin "baserom.gba", 0x517e14, 0x220 + gUnknown_08518034:: @ 8518034 - .incbin "baserom.gba", 0x518034, 0x268 +@ replacing .incbin "baserom.gba", 0x00518034, 0x8 + .4byte gUnknown_08517C14 + .4byte gUnknown_08517E14 + +gUnknown_0851803C:: + .incbin "baserom.gba", 0x51803c, 0x120 + +gUnknown_0851815C:: + .incbin "baserom.gba", 0x51815c, 0x140 + gUnknown_0851829C:: @ 851829C - .incbin "baserom.gba", 0x51829c, 0x8028 +@ replacing .incbin "baserom.gba", 0x0051829c, 0x8 + .4byte gUnknown_0851803C + .4byte gUnknown_0851815C + +gUnknown_085182A4:: + .incbin "baserom.gba", 0x5182a4, 0xc00 + +gUnknown_08518EA4:: + .incbin "baserom.gba", 0x518ea4, 0xc00 + +gUnknown_08519AA4:: + .incbin "baserom.gba", 0x519aa4, 0xc00 + +gUnknown_0851A6A4:: + .incbin "baserom.gba", 0x51a6a4, 0xc00 + +gUnknown_0851B2A4:: + .incbin "baserom.gba", 0x51b2a4, 0xc00 + +gUnknown_0851BEA4:: + .incbin "baserom.gba", 0x51bea4, 0xc00 + +gUnknown_0851CAA4:: + .incbin "baserom.gba", 0x51caa4, 0xc00 + +gUnknown_0851D6A4:: + .incbin "baserom.gba", 0x51d6a4, 0x2c20 + gUnknown_085202C4:: @ 85202C4 - .incbin "baserom.gba", 0x5202c4, 0x45a0 +@ replacing .incbin "baserom.gba", 0x005202c4, 0x20 + .4byte gUnknown_085182A4 + .4byte gUnknown_08518EA4 + .4byte gUnknown_08519AA4 + .4byte gUnknown_0851A6A4 + .4byte gUnknown_0851B2A4 + .4byte gUnknown_0851BEA4 + .4byte gUnknown_0851CAA4 + .4byte gUnknown_0851D6A4 + +gUnknown_085202E4:: + .incbin "baserom.gba", 0x5202e4, 0x100 + +gUnknown_085203E4:: + .incbin "baserom.gba", 0x5203e4, 0x100 + +gUnknown_085204E4:: + .incbin "baserom.gba", 0x5204e4, 0x120 + +gUnknown_08520604:: + .incbin "baserom.gba", 0x520604, 0x100 + +gUnknown_08520704:: + .incbin "baserom.gba", 0x520704, 0x100 + +gUnknown_08520804:: + .incbin "baserom.gba", 0x520804, 0x4060 + gUnknown_08524864:: @ 8524864 - .incbin "baserom.gba", 0x524864, 0xc +@ replacing .incbin "baserom.gba", 0x00524864, 0xc + .4byte gUnknown_085202E4 + .4byte gUnknown_085203E4 + .4byte gUnknown_085204E4 gUnknown_08524870:: @ 8524870 - .incbin "baserom.gba", 0x524870, 0xc +@ replacing .incbin "baserom.gba", 0x00524870, 0xc + .4byte gUnknown_08520604 + .4byte gUnknown_08520704 + .4byte gUnknown_08520804 + -- cgit v1.2.3 From 4d78e62fd90531a1469b7a1a3e279a5a734f62b2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Sep 2017 22:23:00 -0400 Subject: Sanitize data/tilesets.s --- data/tileset.s | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'data') diff --git a/data/tileset.s b/data/tileset.s index 3a1efb5fc..c60d83d61 100644 --- a/data/tileset.s +++ b/data/tileset.s @@ -11,8 +11,9 @@ gUnknown_08510644:: .incbin "baserom.gba", 0x510644, 0x80 gUnknown_085106C4:: - .incbin "baserom.gba", 0x5106c4, 0xa0 + .incbin "baserom.gba", 0x5106c4, 0x80 + .space 0x20 gUnknown_08510764:: @ 8510764 @ replacing .incbin "baserom.gba", 0x00510764, 0x10 @@ -31,21 +32,13 @@ gUnknown_08510EF4:: .incbin "baserom.gba", 0x510ef4, 0x3c0 gUnknown_085112B4:: - .incbin "baserom.gba", 0x5112b4, 0x10 - - -gUnknown_085112C4:: @ 85112C4 - .incbin "baserom.gba", 0x5112c4, 0x3b0 + .incbin "baserom.gba", 0x5112b4, 0x3c0 gUnknown_08511674:: .incbin "baserom.gba", 0x511674, 0x3c0 gUnknown_08511A34:: - .incbin "baserom.gba", 0x511a34, 0x198 - - -gUnknown_08511BCC:: @ 8511BCC - .incbin "baserom.gba", 0x511bcc, 0x228 + .incbin "baserom.gba", 0x511a34, 0x3c0 gUnknown_08511DF4:: .incbin "baserom.gba", 0x511df4, 0x3c0 @@ -259,8 +252,9 @@ gUnknown_08515224:: .incbin "baserom.gba", 0x515224, 0x80 gUnknown_085152A4:: - .incbin "baserom.gba", 0x5152a4, 0xa0 + .incbin "baserom.gba", 0x5152a4, 0x80 + .space 0x20 gUnknown_08515344:: @ 8515344 @ replacing .incbin "baserom.gba", 0x00515344, 0x20 @@ -372,7 +366,9 @@ gUnknown_08515844:: .incbin "baserom.gba", 0x515844, 0x80 gUnknown_085158C4:: - .incbin "baserom.gba", 0x5158c4, 0xa0 + .incbin "baserom.gba", 0x5158c4, 0x80 + + .space 0x20 gUnknown_08515964:: @ 8515964 @@ -422,7 +418,9 @@ gUnknown_0851609C:: .incbin "baserom.gba", 0x51609c, 0x80 gUnknown_0851611C:: - .incbin "baserom.gba", 0x51611c, 0xa0 + .incbin "baserom.gba", 0x51611c, 0x80 + + .space 0x20 gUnknown_085161BC:: @ 85161BC -- cgit v1.2.3 From 84e5819ca3944df99a1817ad8ab828993035f18b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 1 Oct 2017 19:01:37 -0400 Subject: Sanitize data/tilesets.s, 2 --- data/tileset.s | 56 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/tileset.s b/data/tileset.s index c60d83d61..6a49cbd08 100644 --- a/data/tileset.s +++ b/data/tileset.s @@ -1,8 +1,8 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 gUnknown_085105C4:: .incbin "baserom.gba", 0x5105c4, 0x80 @@ -13,7 +13,7 @@ gUnknown_08510644:: gUnknown_085106C4:: .incbin "baserom.gba", 0x5106c4, 0x80 - .space 0x20 + .space 0x20 gUnknown_08510764:: @ 8510764 @ replacing .incbin "baserom.gba", 0x00510764, 0x10 @@ -254,7 +254,7 @@ gUnknown_08515224:: gUnknown_085152A4:: .incbin "baserom.gba", 0x5152a4, 0x80 - .space 0x20 + .space 0x20 gUnknown_08515344:: @ 8515344 @ replacing .incbin "baserom.gba", 0x00515344, 0x20 @@ -386,7 +386,13 @@ gUnknown_08515A6C:: .incbin "baserom.gba", 0x515a6c, 0x80 gUnknown_08515AEC:: - .incbin "baserom.gba", 0x515aec, 0x2a0 + .incbin "baserom.gba", 0x515aec, 0x80 + +gUnknown_08515B6C:: + .incbin "baserom.gba", 0x515b6c, 0x20 + +gUnknown_08515B8C:: + .incbin "baserom.gba", 0x515b8c, 0x200 gUnknown_08515D8C:: @ 8515D8C @@ -584,7 +590,9 @@ gUnknown_08517B9C:: .incbin "baserom.gba", 0x517b9c, 0x20 gUnknown_08517BBC:: - .incbin "baserom.gba", 0x517bbc, 0x40 + .incbin "baserom.gba", 0x517bbc, 0x20 + + .space 0x20 gUnknown_08517BFC:: @ 8517BFC @@ -603,7 +611,9 @@ gUnknown_08517C14:: .incbin "baserom.gba", 0x517c14, 0x200 gUnknown_08517E14:: - .incbin "baserom.gba", 0x517e14, 0x220 + .incbin "baserom.gba", 0x517e14, 0x200 + + .space 0x20 gUnknown_08518034:: @ 8518034 @@ -615,8 +625,9 @@ gUnknown_0851803C:: .incbin "baserom.gba", 0x51803c, 0x120 gUnknown_0851815C:: - .incbin "baserom.gba", 0x51815c, 0x140 + .incbin "baserom.gba", 0x51815c, 0x120 + .space 0x20 gUnknown_0851829C:: @ 851829C @ replacing .incbin "baserom.gba", 0x0051829c, 0x8 @@ -645,8 +656,21 @@ gUnknown_0851CAA4:: .incbin "baserom.gba", 0x51caa4, 0xc00 gUnknown_0851D6A4:: - .incbin "baserom.gba", 0x51d6a4, 0x2c20 + .incbin "baserom.gba", 0x51d6a4, 0xc00 + + .space 0x20 + +gUnknown_0851E2C4:: + .incbin "baserom.gba", 0x51e2c4, 0x800 +gUnknown_0851EAC4:: + .incbin "baserom.gba", 0x51eac4, 0x800 + +gUnknown_0851F2C4:: + .incbin "baserom.gba", 0x51f2c4, 0x800 + +gUnknown_0851FAC4:: + .incbin "baserom.gba", 0x51fac4, 0x800 gUnknown_085202C4:: @ 85202C4 @ replacing .incbin "baserom.gba", 0x005202c4, 0x20 @@ -666,7 +690,10 @@ gUnknown_085203E4:: .incbin "baserom.gba", 0x5203e4, 0x100 gUnknown_085204E4:: - .incbin "baserom.gba", 0x5204e4, 0x120 + .incbin "baserom.gba", 0x5204e4, 0x100 + +gUnknown_085205E4:: + .incbin "baserom.gba", 0x5205e4, 0x20 gUnknown_08520604:: .incbin "baserom.gba", 0x520604, 0x100 @@ -675,7 +702,10 @@ gUnknown_08520704:: .incbin "baserom.gba", 0x520704, 0x100 gUnknown_08520804:: - .incbin "baserom.gba", 0x520804, 0x4060 + .incbin "baserom.gba", 0x520804, 0x100 + +gUnknown_08520904:: + .incbin "baserom.gba", 0x520904, 0x3F60 gUnknown_08524864:: @ 8524864 -- cgit v1.2.3 From 5a51a49642e81575ebe41a00ec69a3abb489376b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 1 Oct 2017 19:39:55 -0400 Subject: Sanitize data/tilesets.s, 3 --- data/tileset.s | 86 ++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 33 deletions(-) (limited to 'data') diff --git a/data/tileset.s b/data/tileset.s index 6a49cbd08..0acb50e91 100644 --- a/data/tileset.s +++ b/data/tileset.s @@ -258,25 +258,25 @@ gUnknown_085152A4:: gUnknown_08515344:: @ 8515344 @ replacing .incbin "baserom.gba", 0x00515344, 0x20 - .4byte VRAM + 0x4c00 - .4byte VRAM + 0x4c80 - .4byte VRAM + 0x4d00 - .4byte VRAM + 0x4d80 - .4byte VRAM + 0x4e00 - .4byte VRAM + 0x4e80 - .4byte VRAM + 0x4f00 - .4byte VRAM + 0x4f80 + .4byte BG_VRAM + 0x4c00 + .4byte BG_VRAM + 0x4c80 + .4byte BG_VRAM + 0x4d00 + .4byte BG_VRAM + 0x4d80 + .4byte BG_VRAM + 0x4e00 + .4byte BG_VRAM + 0x4e80 + .4byte BG_VRAM + 0x4f00 + .4byte BG_VRAM + 0x4f80 gUnknown_08515364:: @ 8515364 @ replacing .incbin "baserom.gba", 0x00515364, 0x20 - .4byte VRAM + 0x5000 - .4byte VRAM + 0x5080 - .4byte VRAM + 0x5100 - .4byte VRAM + 0x5180 - .4byte VRAM + 0x5200 - .4byte VRAM + 0x5280 - .4byte VRAM + 0x5300 - .4byte VRAM + 0x5380 + .4byte BG_VRAM + 0x5000 + .4byte BG_VRAM + 0x5080 + .4byte BG_VRAM + 0x5100 + .4byte BG_VRAM + 0x5180 + .4byte BG_VRAM + 0x5200 + .4byte BG_VRAM + 0x5280 + .4byte BG_VRAM + 0x5300 + .4byte BG_VRAM + 0x5380 gUnknown_08515384:: @ 8515384 @ replacing .incbin "baserom.gba", 0x00515384, 0x30 @@ -348,8 +348,14 @@ gUnknown_08515784:: gUnknown_08515804:: @ 8515804 - .incbin "baserom.gba", 0x515804, 0x20 - + .4byte BG_VRAM + 0x5000 + .4byte BG_VRAM + 0x5080 + .4byte BG_VRAM + 0x5100 + .4byte BG_VRAM + 0x5180 + .4byte BG_VRAM + 0x5200 + .4byte BG_VRAM + 0x5280 + .4byte BG_VRAM + 0x5300 + .4byte BG_VRAM + 0x5380 gUnknown_08515824:: @ 8515824 @ replacing .incbin "baserom.gba", 0x00515824, 0x20 @@ -389,10 +395,18 @@ gUnknown_08515AEC:: .incbin "baserom.gba", 0x515aec, 0x80 gUnknown_08515B6C:: - .incbin "baserom.gba", 0x515b6c, 0x20 + .incbin "baserom.gba", 0x515b6c, 0x80 + +gUnknown_08515BEC:: + .incbin "baserom.gba", 0x515bec, 0x80 + +gUnknown_08515C6C:: + .incbin "baserom.gba", 0x515c6c, 0x80 + +gUnknown_08515CEC:: + .incbin "baserom.gba", 0x515cec, 0x80 -gUnknown_08515B8C:: - .incbin "baserom.gba", 0x515b8c, 0x200 + .space 0x20 gUnknown_08515D8C:: @ 8515D8C @@ -431,14 +445,14 @@ gUnknown_0851611C:: gUnknown_085161BC:: @ 85161BC @ replacing .incbin "baserom.gba", 0x005161bc, 0x20 - .4byte VRAM + 0x5c00 - .4byte VRAM + 0x5c80 - .4byte VRAM + 0x5d00 - .4byte VRAM + 0x5d80 - .4byte VRAM + 0x5e00 - .4byte VRAM + 0x5e80 - .4byte VRAM + 0x5f00 - .4byte VRAM + 0x5f80 + .4byte BG_VRAM + 0x5c00 + .4byte BG_VRAM + 0x5c80 + .4byte BG_VRAM + 0x5d00 + .4byte BG_VRAM + 0x5d80 + .4byte BG_VRAM + 0x5e00 + .4byte BG_VRAM + 0x5e80 + .4byte BG_VRAM + 0x5f00 + .4byte BG_VRAM + 0x5f80 gUnknown_085161DC:: @ 85161DC @ replacing .incbin "baserom.gba", 0x005161dc, 0x20 @@ -692,8 +706,7 @@ gUnknown_085203E4:: gUnknown_085204E4:: .incbin "baserom.gba", 0x5204e4, 0x100 -gUnknown_085205E4:: - .incbin "baserom.gba", 0x5205e4, 0x20 + .space 0x20 gUnknown_08520604:: .incbin "baserom.gba", 0x520604, 0x100 @@ -704,8 +717,15 @@ gUnknown_08520704:: gUnknown_08520804:: .incbin "baserom.gba", 0x520804, 0x100 -gUnknown_08520904:: - .incbin "baserom.gba", 0x520904, 0x3F60 + .space 0x3d00 + +gUnknown_08524604:: + .incbin "baserom.gba", 0x524604, 0x40 + + .space 0x1c0 + +gUnknown_08524804:: + .incbin "baserom.gba", 0x524804, 0x60 gUnknown_08524864:: @ 8524864 -- cgit v1.2.3 From 74951e4312b782b81324999a580bdf25fe4d31ce Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Oct 2017 08:43:52 -0400 Subject: Name pointer tables --- data/tileset.s | 71 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) (limited to 'data') diff --git a/data/tileset.s b/data/tileset.s index 0acb50e91..b8a0ca77f 100644 --- a/data/tileset.s +++ b/data/tileset.s @@ -15,7 +15,7 @@ gUnknown_085106C4:: .space 0x20 -gUnknown_08510764:: @ 8510764 +gTilesetAnims_General0:: @ 8510764 @ replacing .incbin "baserom.gba", 0x00510764, 0x10 .4byte gUnknown_08510644 .4byte gUnknown_085105C4 @@ -47,7 +47,7 @@ gUnknown_085121B4:: .incbin "baserom.gba", 0x5121b4, 0x3c0 -gUnknown_08512574:: @ 8512574 +gTilesetAnims_General1:: @ 8512574 @ replacing .incbin "baserom.gba", 0x00512574, 0x20 .4byte gUnknown_08510774 .4byte gUnknown_08510B34 @@ -80,7 +80,7 @@ gUnknown_08512D14:: .incbin "baserom.gba", 0x512d14, 0x140 -gUnknown_08512E54:: @ 8512E54 +gTilesetAnims_General2:: @ 8512E54 @ replacing .incbin "baserom.gba", 0x00512e54, 0x20 .4byte gUnknown_08512594 .4byte gUnknown_085126D4 @@ -104,7 +104,7 @@ gUnknown_085130B4:: .incbin "baserom.gba", 0x5130b4, 0xc0 -gUnknown_08513174:: @ 8513174 +gTilesetAnims_General3:: @ 8513174 @ replacing .incbin "baserom.gba", 0x00513174, 0x10 .4byte gUnknown_08512E74 .4byte gUnknown_08512F34 @@ -124,7 +124,7 @@ gUnknown_08513544:: .incbin "baserom.gba", 0x513544, 0x140 -gUnknown_08513684:: @ 8513684 +gTilesetAnims_General4:: @ 8513684 @ replacing .incbin "baserom.gba", 0x00513684, 0x10 .4byte gUnknown_08513184 .4byte gUnknown_085132C4 @@ -144,7 +144,7 @@ gUnknown_08513814:: .incbin "baserom.gba", 0x513814, 0x80 -gUnknown_08513894:: @ 8513894 +gTilesetAnims_Lavaridge0:: @ 8513894 @ replacing .incbin "baserom.gba", 0x00513894, 0x10 .4byte gUnknown_08513694 .4byte gUnknown_08513714 @@ -161,7 +161,7 @@ gUnknown_08514024:: .incbin "baserom.gba", 0x514024, 0x3c0 -gUnknown_085143E4:: @ 85143E4 +gTilesetAnims_Pacifidlog0:: @ 85143E4 @ replacing .incbin "baserom.gba", 0x005143e4, 0x10 .4byte gUnknown_085138A4 .4byte gUnknown_08513C64 @@ -181,7 +181,7 @@ gUnknown_08514574:: .incbin "baserom.gba", 0x514574, 0x80 -gUnknown_085145F4:: @ 85145F4 +gTilesetAnims_Underwater0:: @ 85145F4 @ replacing .incbin "baserom.gba", 0x005145f4, 0x10 .4byte gUnknown_085143F4 .4byte gUnknown_08514474 @@ -213,7 +213,7 @@ gUnknown_08514D04:: .incbin "baserom.gba", 0x514d04, 0x100 -gUnknown_08514E04:: @ 8514E04 +gTilesetAnims_Pacifidlog1:: @ 8514E04 @ replacing .incbin "baserom.gba", 0x00514e04, 0x20 .4byte gUnknown_08514604 .4byte gUnknown_08514704 @@ -256,7 +256,7 @@ gUnknown_085152A4:: .space 0x20 -gUnknown_08515344:: @ 8515344 +gTilesetAnims_MauvilleVDests0:: @ 8515344 @ replacing .incbin "baserom.gba", 0x00515344, 0x20 .4byte BG_VRAM + 0x4c00 .4byte BG_VRAM + 0x4c80 @@ -267,7 +267,7 @@ gUnknown_08515344:: @ 8515344 .4byte BG_VRAM + 0x4f00 .4byte BG_VRAM + 0x4f80 -gUnknown_08515364:: @ 8515364 +gTilesetAnims_MauvilleVDests1:: @ 8515364 @ replacing .incbin "baserom.gba", 0x00515364, 0x20 .4byte BG_VRAM + 0x5000 .4byte BG_VRAM + 0x5080 @@ -278,7 +278,7 @@ gUnknown_08515364:: @ 8515364 .4byte BG_VRAM + 0x5300 .4byte BG_VRAM + 0x5380 -gUnknown_08515384:: @ 8515384 +gTilesetAnims_Mauville0a:: @ 8515384 @ replacing .incbin "baserom.gba", 0x00515384, 0x30 .4byte gUnknown_08514E24 .4byte gUnknown_08514E24 @@ -293,7 +293,7 @@ gUnknown_08515384:: @ 8515384 .4byte gUnknown_08514F24 .4byte gUnknown_08514EA4 -gUnknown_085153B4:: @ 85153B4 +gTilesetAnims_Mauville0b:: @ 85153B4 @ replacing .incbin "baserom.gba", 0x005153b4, 0x30 .4byte gUnknown_085150A4 .4byte gUnknown_085150A4 @@ -308,14 +308,14 @@ gUnknown_085153B4:: @ 85153B4 .4byte gUnknown_085151A4 .4byte gUnknown_08515124 -gUnknown_085153E4:: @ 85153E4 +gTilesetAnims_Mauville1a:: @ 85153E4 @ replacing .incbin "baserom.gba", 0x005153e4, 0x10 .4byte gUnknown_08514E24 .4byte gUnknown_08514E24 .4byte gUnknown_08515024 .4byte gUnknown_08515024 -gUnknown_085153F4:: @ 85153F4 +gTilesetAnims_Mauville1b:: @ 85153F4 @ replacing .incbin "baserom.gba", 0x005153f4, 0x10 .4byte gUnknown_085150A4 .4byte gUnknown_085150A4 @@ -347,7 +347,7 @@ gUnknown_08515784:: .incbin "baserom.gba", 0x515784, 0x80 -gUnknown_08515804:: @ 8515804 +gTilesetAnims_RustboroVDests0:: @ 8515804 .4byte BG_VRAM + 0x5000 .4byte BG_VRAM + 0x5080 .4byte BG_VRAM + 0x5100 @@ -357,7 +357,7 @@ gUnknown_08515804:: @ 8515804 .4byte BG_VRAM + 0x5300 .4byte BG_VRAM + 0x5380 -gUnknown_08515824:: @ 8515824 +gTilesetAnims_Rustboro0:: @ 8515824 @ replacing .incbin "baserom.gba", 0x00515824, 0x20 .4byte gUnknown_08515404 .4byte gUnknown_08515484 @@ -377,7 +377,7 @@ gUnknown_085158C4:: .space 0x20 -gUnknown_08515964:: @ 8515964 +gTilesetAnims_Rustboro1:: @ 8515964 @ replacing .incbin "baserom.gba", 0x00515964, 0x8 .4byte gUnknown_08515844 .4byte gUnknown_085158C4 @@ -409,7 +409,7 @@ gUnknown_08515CEC:: .space 0x20 -gUnknown_08515D8C:: @ 8515D8C +gTilesetAnims_Lavaridge1_Cave0:: @ 8515D8C @ replacing .incbin "baserom.gba", 0x00515d8c, 0x10 .4byte gUnknown_0851596C .4byte gUnknown_085159EC @@ -443,7 +443,7 @@ gUnknown_0851611C:: .space 0x20 -gUnknown_085161BC:: @ 85161BC +gTilesetAnims_EverGrandeVDests0:: @ 85161BC @ replacing .incbin "baserom.gba", 0x005161bc, 0x20 .4byte BG_VRAM + 0x5c00 .4byte BG_VRAM + 0x5c80 @@ -454,7 +454,7 @@ gUnknown_085161BC:: @ 85161BC .4byte BG_VRAM + 0x5f00 .4byte BG_VRAM + 0x5f80 -gUnknown_085161DC:: @ 85161DC +gTilesetAnims_EverGrande0:: @ 85161DC @ replacing .incbin "baserom.gba", 0x005161dc, 0x20 .4byte gUnknown_08515D9C .4byte gUnknown_08515E1C @@ -478,7 +478,7 @@ gUnknown_0851643C:: .incbin "baserom.gba", 0x51643c, 0xc0 -gUnknown_085164FC:: @ 85164FC +gTilesetAnims_Dewford0:: @ 85164FC @ replacing .incbin "baserom.gba", 0x005164fc, 0x10 .4byte gUnknown_085161FC .4byte gUnknown_085162BC @@ -498,7 +498,7 @@ gUnknown_0851674C:: .incbin "baserom.gba", 0x51674c, 0xc0 -gUnknown_0851680C:: @ 851680C +gTilesetAnims_BattleFrontierOutsideWest0:: @ 851680C @ replacing .incbin "baserom.gba", 0x0051680c, 0x10 .4byte gUnknown_0851650C .4byte gUnknown_085165CC @@ -518,7 +518,7 @@ gUnknown_08516A5C:: .incbin "baserom.gba", 0x516a5c, 0xc0 -gUnknown_08516B1C:: @ 8516B1C +gTilesetAnims_BattleFrontierOutsideEast0:: @ 8516B1C @ replacing .incbin "baserom.gba", 0x00516b1c, 0x10 .4byte gUnknown_0851681C .4byte gUnknown_085168DC @@ -538,7 +538,7 @@ gUnknown_08516CAC:: .incbin "baserom.gba", 0x516cac, 0x80 -gUnknown_08516D2C:: @ 8516D2C +gTilesetAnims_Slateport0:: @ 8516D2C @ replacing .incbin "baserom.gba", 0x00516d2c, 0x10 .4byte gUnknown_08516B2C .4byte gUnknown_08516BAC @@ -552,7 +552,7 @@ gUnknown_08516DBC:: .incbin "baserom.gba", 0x516dbc, 0x80 -gUnknown_08516E3C:: @ 8516E3C +gTilesetAnims_InsideBuilding0:: @ 8516E3C @ replacing .incbin "baserom.gba", 0x00516e3c, 0x8 .4byte gUnknown_08516D3C .4byte gUnknown_08516DBC @@ -576,13 +576,13 @@ gUnknown_085177C4:: .incbin "baserom.gba", 0x5177c4, 0x280 -gUnknown_08517A44:: @ 8517A44 +gTilesetAnims_SootopolisGym0:: @ 8517A44 @ replacing .incbin "baserom.gba", 0x00517a44, 0xc .4byte gUnknown_08516E44 .4byte gUnknown_08516FC4 .4byte gUnknown_08517144 -gUnknown_08517A50:: @ 8517A50 +gTilesetAnims_SootopolisGym1:: @ 8517A50 @ replacing .incbin "baserom.gba", 0x00517a50, 0xc .4byte gUnknown_085172C4 .4byte gUnknown_08517544 @@ -609,14 +609,14 @@ gUnknown_08517BBC:: .space 0x20 -gUnknown_08517BFC:: @ 8517BFC +gTilesetAnims_EliteFour1:: @ 8517BFC @ replacing .incbin "baserom.gba", 0x00517bfc, 0x10 .4byte gUnknown_08517B5C .4byte gUnknown_08517B7C .4byte gUnknown_08517B9C .4byte gUnknown_08517BBC -gUnknown_08517C0C:: @ 8517C0C +gTilesetAnims_EliteFour0:: @ 8517C0C @ replacing .incbin "baserom.gba", 0x00517c0c, 0x8 .4byte gUnknown_08517A5C .4byte gUnknown_08517ADC @@ -630,7 +630,7 @@ gUnknown_08517E14:: .space 0x20 -gUnknown_08518034:: @ 8518034 +gTilesetAnims_MauvilleGym0:: @ 8518034 @ replacing .incbin "baserom.gba", 0x00518034, 0x8 .4byte gUnknown_08517C14 .4byte gUnknown_08517E14 @@ -643,7 +643,7 @@ gUnknown_0851815C:: .space 0x20 -gUnknown_0851829C:: @ 851829C +gTilesetAnims_BikeShop0:: @ 851829C @ replacing .incbin "baserom.gba", 0x0051829c, 0x8 .4byte gUnknown_0851803C .4byte gUnknown_0851815C @@ -686,7 +686,7 @@ gUnknown_0851F2C4:: gUnknown_0851FAC4:: .incbin "baserom.gba", 0x51fac4, 0x800 -gUnknown_085202C4:: @ 85202C4 +gTilesetAnims_Sootopolis0:: @ 85202C4 @ replacing .incbin "baserom.gba", 0x005202c4, 0x20 .4byte gUnknown_085182A4 .4byte gUnknown_08518EA4 @@ -727,14 +727,13 @@ gUnknown_08524604:: gUnknown_08524804:: .incbin "baserom.gba", 0x524804, 0x60 - -gUnknown_08524864:: @ 8524864 +gTilesetAnims_BattlePyramid0:: @ 8524864 @ replacing .incbin "baserom.gba", 0x00524864, 0xc .4byte gUnknown_085202E4 .4byte gUnknown_085203E4 .4byte gUnknown_085204E4 -gUnknown_08524870:: @ 8524870 +gTilesetAnims_BattlePyramid1:: @ 8524870 @ replacing .incbin "baserom.gba", 0x00524870, 0xc .4byte gUnknown_08520604 .4byte gUnknown_08520704 -- cgit v1.2.3 From d43b6227bb5a81a4479ad0ecc33d661910c85d74 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Oct 2017 20:53:58 -0400 Subject: Rip tileset anims --- data/tileset.s | 304 +++++++++------------ data/tilesets/primary/building/anim/0.png | Bin 0 -> 141 bytes data/tilesets/primary/building/anim/1.png | Bin 0 -> 144 bytes data/tilesets/primary/general/anim/0/0.png | Bin 0 -> 183 bytes data/tilesets/primary/general/anim/0/1.png | Bin 0 -> 182 bytes data/tilesets/primary/general/anim/0/2.png | Bin 0 -> 183 bytes data/tilesets/primary/general/anim/1/0.png | Bin 0 -> 518 bytes data/tilesets/primary/general/anim/1/1.png | Bin 0 -> 581 bytes data/tilesets/primary/general/anim/1/2.png | Bin 0 -> 534 bytes data/tilesets/primary/general/anim/1/3.png | Bin 0 -> 527 bytes data/tilesets/primary/general/anim/1/4.png | Bin 0 -> 461 bytes data/tilesets/primary/general/anim/1/5.png | Bin 0 -> 460 bytes data/tilesets/primary/general/anim/1/6.png | Bin 0 -> 480 bytes data/tilesets/primary/general/anim/1/7.png | Bin 0 -> 521 bytes data/tilesets/primary/general/anim/2/0.png | Bin 0 -> 194 bytes data/tilesets/primary/general/anim/2/1.png | Bin 0 -> 243 bytes data/tilesets/primary/general/anim/2/2.png | Bin 0 -> 262 bytes data/tilesets/primary/general/anim/2/3.png | Bin 0 -> 280 bytes data/tilesets/primary/general/anim/2/4.png | Bin 0 -> 232 bytes data/tilesets/primary/general/anim/2/5.png | Bin 0 -> 220 bytes data/tilesets/primary/general/anim/2/6.png | Bin 0 -> 203 bytes data/tilesets/primary/general/anim/3/0.png | Bin 0 -> 136 bytes data/tilesets/primary/general/anim/3/1.png | Bin 0 -> 154 bytes data/tilesets/primary/general/anim/3/2.png | Bin 0 -> 133 bytes data/tilesets/primary/general/anim/3/3.png | Bin 0 -> 130 bytes data/tilesets/primary/general/anim/4/0.png | Bin 0 -> 304 bytes data/tilesets/primary/general/anim/4/1.png | Bin 0 -> 311 bytes data/tilesets/primary/general/anim/4/2.png | Bin 0 -> 314 bytes data/tilesets/primary/general/anim/4/3.png | Bin 0 -> 328 bytes data/tilesets/primary/general/tiles.png | Bin 7587 -> 7786 bytes data/tilesets/primary/inside_building/tiles.png | Bin 1556 -> 1813 bytes data/tilesets/primary/secret_base/tiles.png | Bin 7136 -> 7869 bytes .../tilesets/primary/secret_base/unknown_tiles.png | Bin 1212 -> 1316 bytes data/tilesets/secondary/battle_arena/tiles.png | Bin 2067 -> 2340 bytes data/tilesets/secondary/battle_dome/tiles.png | Bin 3193 -> 3626 bytes data/tilesets/secondary/battle_factory/tiles.png | Bin 3313 -> 3694 bytes data/tilesets/secondary/battle_frontier/tiles.png | Bin 2368 -> 2647 bytes .../battle_frontier_outside_east/anim/0.png | Bin 0 -> 191 bytes .../battle_frontier_outside_east/anim/1.png | Bin 0 -> 188 bytes .../battle_frontier_outside_east/anim/2.png | Bin 0 -> 185 bytes .../battle_frontier_outside_east/anim/3.png | Bin 0 -> 183 bytes .../battle_frontier_outside_east/tiles.png | Bin 3750 -> 3834 bytes .../battle_frontier_outside_west/anim/0.png | Bin 0 -> 191 bytes .../battle_frontier_outside_west/anim/1.png | Bin 0 -> 188 bytes .../battle_frontier_outside_west/anim/2.png | Bin 0 -> 185 bytes .../battle_frontier_outside_west/anim/3.png | Bin 0 -> 183 bytes .../battle_frontier_outside_west/tiles.png | Bin 5505 -> 5892 bytes .../battle_frontier_ranking_hall/tiles.png | Bin 1451 -> 1700 bytes data/tilesets/secondary/battle_palace/tiles.png | Bin 1513 -> 1633 bytes data/tilesets/secondary/battle_pike/tiles.png | Bin 3922 -> 4013 bytes .../tilesets/secondary/battle_pyramid/anim/0/0.png | Bin 0 -> 228 bytes .../tilesets/secondary/battle_pyramid/anim/0/1.png | Bin 0 -> 220 bytes .../tilesets/secondary/battle_pyramid/anim/0/2.png | Bin 0 -> 219 bytes .../tilesets/secondary/battle_pyramid/anim/1/0.png | Bin 0 -> 261 bytes .../tilesets/secondary/battle_pyramid/anim/1/1.png | Bin 0 -> 267 bytes .../tilesets/secondary/battle_pyramid/anim/1/2.png | Bin 0 -> 261 bytes .../tilesets/secondary/battle_pyramid/anim/1/3.png | Bin 0 -> 105 bytes .../tilesets/secondary/battle_pyramid/anim/1/4.png | Bin 0 -> 86 bytes .../tilesets/secondary/battle_pyramid/anim/1/5.png | Bin 0 -> 86 bytes .../tilesets/secondary/battle_pyramid/anim/1/6.png | Bin 0 -> 106 bytes .../tilesets/secondary/battle_pyramid/anim/1/7.png | Bin 0 -> 393 bytes .../tilesets/secondary/battle_pyramid/anim/1/8.png | Bin 0 -> 105 bytes .../tilesets/secondary/battle_pyramid/anim/1/9.png | Bin 0 -> 111 bytes data/tilesets/secondary/battle_pyramid/tiles.png | Bin 3208 -> 3504 bytes data/tilesets/secondary/battle_tent/tiles.png | Bin 1696 -> 2084 bytes data/tilesets/secondary/bike_shop/anim/0.png | Bin 0 -> 250 bytes data/tilesets/secondary/bike_shop/anim/1.png | Bin 0 -> 249 bytes data/tilesets/secondary/bike_shop/anim/2.png | Bin 0 -> 219 bytes data/tilesets/secondary/bike_shop/tiles.png | Bin 3270 -> 3505 bytes .../secondary/brendans_mays_house/tiles.png | Bin 2616 -> 3074 bytes data/tilesets/secondary/cable_club/tiles.png | Bin 2445 -> 2590 bytes .../secondary/cable_club/unknown_tiles.png | Bin 287 -> 311 bytes data/tilesets/secondary/cave/anim/0.png | Bin 0 -> 100 bytes data/tilesets/secondary/cave/anim/1.png | Bin 0 -> 126 bytes data/tilesets/secondary/cave/anim/2.png | Bin 0 -> 108 bytes data/tilesets/secondary/cave/anim/3.png | Bin 0 -> 109 bytes data/tilesets/secondary/cave/anim/unused/0.png | Bin 0 -> 100 bytes data/tilesets/secondary/cave/anim/unused/1.png | Bin 0 -> 121 bytes data/tilesets/secondary/cave/anim/unused/2.png | Bin 0 -> 108 bytes data/tilesets/secondary/cave/anim/unused/3.png | Bin 0 -> 105 bytes data/tilesets/secondary/cave/tiles.png | Bin 5767 -> 5884 bytes data/tilesets/secondary/contest/tiles.png | Bin 1638 -> 1650 bytes data/tilesets/secondary/dewford/anim/0.png | Bin 0 -> 185 bytes data/tilesets/secondary/dewford/anim/1.png | Bin 0 -> 185 bytes data/tilesets/secondary/dewford/anim/2.png | Bin 0 -> 185 bytes data/tilesets/secondary/dewford/anim/3.png | Bin 0 -> 192 bytes data/tilesets/secondary/dewford/tiles.png | Bin 3756 -> 3985 bytes data/tilesets/secondary/dewford_gym/tiles.png | Bin 598 -> 640 bytes data/tilesets/secondary/elite_four/anim/0/0.png | Bin 0 -> 91 bytes data/tilesets/secondary/elite_four/anim/0/1.png | Bin 0 -> 91 bytes data/tilesets/secondary/elite_four/anim/0/2.png | Bin 0 -> 91 bytes data/tilesets/secondary/elite_four/anim/0/3.png | Bin 0 -> 91 bytes data/tilesets/secondary/elite_four/anim/1/0.png | Bin 0 -> 135 bytes data/tilesets/secondary/elite_four/anim/1/1.png | Bin 0 -> 72 bytes data/tilesets/secondary/elite_four/anim/1/2.png | Bin 0 -> 1260 bytes data/tilesets/secondary/elite_four/anim/1/3.png | Bin 0 -> 1184 bytes data/tilesets/secondary/elite_four/anim/1/4.png | Bin 0 -> 1190 bytes data/tilesets/secondary/elite_four/anim/1/5.png | Bin 0 -> 1248 bytes data/tilesets/secondary/elite_four/anim/1/6.png | Bin 0 -> 1161 bytes data/tilesets/secondary/elite_four/anim/1/7.png | Bin 0 -> 1153 bytes data/tilesets/secondary/elite_four/tiles.png | Bin 2826 -> 2876 bytes data/tilesets/secondary/ever_grande/anim/0.png | Bin 0 -> 204 bytes data/tilesets/secondary/ever_grande/anim/1.png | Bin 0 -> 204 bytes data/tilesets/secondary/ever_grande/anim/2.png | Bin 0 -> 197 bytes data/tilesets/secondary/ever_grande/anim/3.png | Bin 0 -> 200 bytes data/tilesets/secondary/ever_grande/anim/4.png | Bin 0 -> 204 bytes data/tilesets/secondary/ever_grande/anim/5.png | Bin 0 -> 204 bytes data/tilesets/secondary/ever_grande/anim/6.png | Bin 0 -> 201 bytes data/tilesets/secondary/ever_grande/anim/7.png | Bin 0 -> 201 bytes data/tilesets/secondary/ever_grande/tiles.png | Bin 2088 -> 2208 bytes data/tilesets/secondary/facility/tiles.png | Bin 5753 -> 6352 bytes data/tilesets/secondary/fallarbor/tiles.png | Bin 4602 -> 4781 bytes data/tilesets/secondary/fortree/tiles.png | Bin 4364 -> 4342 bytes data/tilesets/secondary/fortree_gym/tiles.png | Bin 771 -> 770 bytes data/tilesets/secondary/generic_building/tiles.png | Bin 4949 -> 5607 bytes data/tilesets/secondary/inside_of_truck/tiles.png | Bin 514 -> 545 bytes data/tilesets/secondary/inside_ship/tiles.png | Bin 2016 -> 2149 bytes data/tilesets/secondary/island_harbor/tiles.png | Bin 5093 -> 5639 bytes data/tilesets/secondary/lab/tiles.png | Bin 2592 -> 2844 bytes data/tilesets/secondary/lavaridge/anim/0.png | Bin 0 -> 83 bytes data/tilesets/secondary/lavaridge/anim/1.png | Bin 0 -> 92 bytes data/tilesets/secondary/lavaridge/anim/2.png | Bin 0 -> 88 bytes data/tilesets/secondary/lavaridge/anim/3.png | Bin 0 -> 100 bytes data/tilesets/secondary/lavaridge/tiles.png | Bin 4087 -> 4215 bytes data/tilesets/secondary/lavaridge_gym/tiles.png | Bin 631 -> 713 bytes data/tilesets/secondary/lilycove/tiles.png | Bin 3597 -> 3912 bytes data/tilesets/secondary/lilycove_museum/tiles.png | Bin 3345 -> 3938 bytes data/tilesets/secondary/mauville/anim/0/a/0.png | Bin 0 -> 177 bytes data/tilesets/secondary/mauville/anim/0/a/1.png | Bin 0 -> 175 bytes data/tilesets/secondary/mauville/anim/0/a/2.png | Bin 0 -> 171 bytes data/tilesets/secondary/mauville/anim/0/a/3.png | Bin 0 -> 160 bytes data/tilesets/secondary/mauville/anim/0/a/4.png | Bin 0 -> 178 bytes data/tilesets/secondary/mauville/anim/0/a/5.png | Bin 0 -> 177 bytes data/tilesets/secondary/mauville/anim/0/a/6.png | Bin 0 -> 175 bytes data/tilesets/secondary/mauville/anim/0/a/7.png | Bin 0 -> 171 bytes data/tilesets/secondary/mauville/anim/0/a/8.png | Bin 0 -> 160 bytes data/tilesets/secondary/mauville/anim/0/a/9.png | Bin 0 -> 178 bytes data/tilesets/secondary/mauville/anim/0/b/0.png | Bin 0 -> 177 bytes data/tilesets/secondary/mauville/anim/0/b/1.png | Bin 0 -> 175 bytes data/tilesets/secondary/mauville/anim/0/b/2.png | Bin 0 -> 171 bytes data/tilesets/secondary/mauville/anim/0/b/3.png | Bin 0 -> 160 bytes data/tilesets/secondary/mauville/anim/0/b/4.png | Bin 0 -> 72 bytes data/tilesets/secondary/mauville/anim/0/b/5.png | Bin 0 -> 72 bytes data/tilesets/secondary/mauville/anim/0/b/6.png | Bin 0 -> 72 bytes data/tilesets/secondary/mauville/anim/0/b/7.png | Bin 0 -> 72 bytes data/tilesets/secondary/mauville/anim/1/a/0.png | Bin 0 -> 177 bytes data/tilesets/secondary/mauville/anim/1/a/1.png | Bin 0 -> 178 bytes data/tilesets/secondary/mauville/anim/1/a/2.png | Bin 0 -> 171 bytes data/tilesets/secondary/mauville/anim/1/a/3.png | Bin 0 -> 160 bytes data/tilesets/secondary/mauville/anim/1/b/0.png | Bin 0 -> 177 bytes data/tilesets/secondary/mauville/anim/1/b/1.png | Bin 0 -> 178 bytes data/tilesets/secondary/mauville/anim/1/b/2.png | Bin 0 -> 171 bytes data/tilesets/secondary/mauville/anim/1/b/3.png | Bin 0 -> 160 bytes data/tilesets/secondary/mauville/anim/1/b/4.png | Bin 0 -> 100 bytes data/tilesets/secondary/mauville/anim/1/b/5.png | Bin 0 -> 121 bytes data/tilesets/secondary/mauville/anim/1/b/6.png | Bin 0 -> 108 bytes data/tilesets/secondary/mauville/anim/1/b/7.png | Bin 0 -> 105 bytes data/tilesets/secondary/mauville/tiles.png | Bin 6019 -> 6372 bytes .../secondary/mauville_game_corner/tiles.png | Bin 1567 -> 1788 bytes data/tilesets/secondary/mauville_gym/anim/0.png | Bin 0 -> 215 bytes data/tilesets/secondary/mauville_gym/anim/1.png | Bin 0 -> 218 bytes data/tilesets/secondary/mauville_gym/anim/2.png | Bin 0 -> 106 bytes data/tilesets/secondary/mauville_gym/anim/3.png | Bin 0 -> 393 bytes data/tilesets/secondary/mauville_gym/tiles.png | Bin 1454 -> 1534 bytes data/tilesets/secondary/meteor_falls/tiles.png | Bin 5968 -> 6078 bytes data/tilesets/secondary/mirage_tower/tiles.png | Bin 5561 -> 5645 bytes data/tilesets/secondary/mossdeep/tiles.png | Bin 4060 -> 4269 bytes .../secondary/mossdeep_game_corner/tiles.png | Bin 838 -> 893 bytes data/tilesets/secondary/mossdeep_gym/tiles.png | Bin 927 -> 969 bytes .../secondary/mystery_events_house/tiles.png | Bin 4799 -> 5383 bytes data/tilesets/secondary/navel_rock/tiles.png | Bin 5966 -> 6073 bytes data/tilesets/secondary/oceanic_museum/tiles.png | Bin 2662 -> 3219 bytes data/tilesets/secondary/pacifidlog/anim/0/0.png | Bin 0 -> 596 bytes data/tilesets/secondary/pacifidlog/anim/0/1.png | Bin 0 -> 603 bytes data/tilesets/secondary/pacifidlog/anim/0/2.png | Bin 0 -> 625 bytes data/tilesets/secondary/pacifidlog/anim/1/0.png | Bin 0 -> 198 bytes data/tilesets/secondary/pacifidlog/anim/1/1.png | Bin 0 -> 219 bytes data/tilesets/secondary/pacifidlog/anim/1/2.png | Bin 0 -> 241 bytes data/tilesets/secondary/pacifidlog/anim/1/3.png | Bin 0 -> 213 bytes data/tilesets/secondary/pacifidlog/anim/1/4.png | Bin 0 -> 138 bytes data/tilesets/secondary/pacifidlog/anim/1/5.png | Bin 0 -> 140 bytes data/tilesets/secondary/pacifidlog/anim/1/6.png | Bin 0 -> 138 bytes data/tilesets/secondary/pacifidlog/anim/1/7.png | Bin 0 -> 200 bytes data/tilesets/secondary/pacifidlog/tiles.png | Bin 4688 -> 4812 bytes data/tilesets/secondary/petalburg/tiles.png | Bin 1689 -> 1910 bytes data/tilesets/secondary/petalburg_gym/tiles.png | Bin 1222 -> 1429 bytes data/tilesets/secondary/pokemon_center/tiles.png | Bin 3461 -> 3645 bytes data/tilesets/secondary/pokemon_day_care/tiles.png | Bin 1451 -> 1528 bytes data/tilesets/secondary/pokemon_fan_club/tiles.png | Bin 1242 -> 1373 bytes data/tilesets/secondary/pokemon_school/tiles.png | Bin 980 -> 1027 bytes .../secondary/pretty_petal_flower_shop/tiles.png | Bin 1839 -> 1951 bytes data/tilesets/secondary/rustboro/anim/0/0.png | Bin 0 -> 119 bytes data/tilesets/secondary/rustboro/anim/0/1.png | Bin 0 -> 113 bytes data/tilesets/secondary/rustboro/anim/0/2.png | Bin 0 -> 72 bytes data/tilesets/secondary/rustboro/anim/0/3.png | Bin 0 -> 72 bytes data/tilesets/secondary/rustboro/anim/0/4.png | Bin 0 -> 72 bytes data/tilesets/secondary/rustboro/anim/0/5.png | Bin 0 -> 72 bytes data/tilesets/secondary/rustboro/anim/0/6.png | Bin 0 -> 72 bytes data/tilesets/secondary/rustboro/anim/0/7.png | Bin 0 -> 72 bytes data/tilesets/secondary/rustboro/anim/1/0.png | Bin 0 -> 201 bytes data/tilesets/secondary/rustboro/anim/1/1.png | Bin 0 -> 198 bytes data/tilesets/secondary/rustboro/anim/1/2.png | Bin 0 -> 185 bytes data/tilesets/secondary/rustboro/anim/1/3.png | Bin 0 -> 192 bytes data/tilesets/secondary/rustboro/tiles.png | Bin 3903 -> 4108 bytes data/tilesets/secondary/rustboro_gym/tiles.png | Bin 759 -> 768 bytes data/tilesets/secondary/rusturf_tunnel/tiles.png | Bin 2127 -> 2228 bytes data/tilesets/secondary/seashore_house/tiles.png | Bin 1105 -> 1280 bytes .../secondary/secret_base/blue_cave/tiles.png | Bin 904 -> 905 bytes .../secret_base/blue_cave/unused_tiles.png | Bin 0 -> 903 bytes .../secondary/secret_base/brown_cave/tiles.png | Bin 1070 -> 1166 bytes .../secret_base/brown_cave/unused_tiles.png | Bin 0 -> 1163 bytes .../secondary/secret_base/red_cave/tiles.png | Bin 941 -> 941 bytes .../secret_base/red_cave/unused_tiles.png | Bin 0 -> 938 bytes .../tilesets/secondary/secret_base/shrub/tiles.png | Bin 1090 -> 1177 bytes .../secondary/secret_base/shrub/unused_tiles.png | Bin 0 -> 1173 bytes data/tilesets/secondary/secret_base/tree/tiles.png | Bin 1056 -> 1098 bytes .../secondary/secret_base/tree/unused_tiles.png | Bin 0 -> 1095 bytes .../secondary/secret_base/yellow_cave/tiles.png | Bin 1127 -> 1127 bytes .../secret_base/yellow_cave/unused_tiles.png | Bin 0 -> 1125 bytes data/tilesets/secondary/shop/tiles.png | Bin 3872 -> 4416 bytes data/tilesets/secondary/slateport/anim/0.png | Bin 0 -> 179 bytes data/tilesets/secondary/slateport/anim/1.png | Bin 0 -> 181 bytes data/tilesets/secondary/slateport/anim/2.png | Bin 0 -> 179 bytes data/tilesets/secondary/slateport/anim/3.png | Bin 0 -> 181 bytes data/tilesets/secondary/slateport/tiles.png | Bin 6528 -> 6985 bytes data/tilesets/secondary/sootopolis/anim/0.png | Bin 0 -> 1201 bytes data/tilesets/secondary/sootopolis/anim/1.png | Bin 0 -> 1262 bytes data/tilesets/secondary/sootopolis/anim/2.png | Bin 0 -> 1260 bytes data/tilesets/secondary/sootopolis/anim/3.png | Bin 0 -> 1184 bytes data/tilesets/secondary/sootopolis/anim/4.png | Bin 0 -> 1190 bytes data/tilesets/secondary/sootopolis/anim/5.png | Bin 0 -> 1248 bytes data/tilesets/secondary/sootopolis/anim/6.png | Bin 0 -> 1161 bytes data/tilesets/secondary/sootopolis/anim/7.png | Bin 0 -> 1153 bytes data/tilesets/secondary/sootopolis/tiles.png | Bin 2674 -> 2950 bytes .../tilesets/secondary/sootopolis_gym/anim/0/0.png | Bin 0 -> 286 bytes .../tilesets/secondary/sootopolis_gym/anim/0/1.png | Bin 0 -> 283 bytes .../tilesets/secondary/sootopolis_gym/anim/0/2.png | Bin 0 -> 294 bytes .../tilesets/secondary/sootopolis_gym/anim/0/3.png | Bin 0 -> 91 bytes .../tilesets/secondary/sootopolis_gym/anim/1/0.png | Bin 0 -> 389 bytes .../tilesets/secondary/sootopolis_gym/anim/1/1.png | Bin 0 -> 408 bytes .../tilesets/secondary/sootopolis_gym/anim/1/2.png | Bin 0 -> 399 bytes data/tilesets/secondary/sootopolis_gym/tiles.png | Bin 2780 -> 2954 bytes data/tilesets/secondary/trainer_hill/tiles.png | Bin 3311 -> 3594 bytes .../secondary/trick_house_puzzle/tiles.png | Bin 2567 -> 2797 bytes data/tilesets/secondary/underwater/anim/0.png | Bin 0 -> 180 bytes data/tilesets/secondary/underwater/anim/1.png | Bin 0 -> 183 bytes data/tilesets/secondary/underwater/anim/2.png | Bin 0 -> 185 bytes data/tilesets/secondary/underwater/anim/3.png | Bin 0 -> 184 bytes data/tilesets/secondary/underwater/tiles.png | Bin 2988 -> 2846 bytes data/tilesets/secondary/union_room/tiles.png | Bin 1710 -> 1817 bytes data/tilesets/secondary/unused_1/0.png | Bin 0 -> 86 bytes data/tilesets/secondary/unused_1/1.png | Bin 0 -> 86 bytes data/tilesets/secondary/unused_1/2.png | Bin 0 -> 106 bytes data/tilesets/secondary/unused_1/3.png | Bin 0 -> 393 bytes data/tilesets/secondary/unused_1/tiles.png | Bin 80 -> 77 bytes data/tilesets/secondary/unused_2/0.png | Bin 0 -> 105 bytes data/tilesets/secondary/unused_2/1.png | Bin 0 -> 111 bytes data/tilesets/secondary/unused_2/2.png | Bin 0 -> 108 bytes data/tilesets/secondary/unused_2/3.png | Bin 0 -> 105 bytes data/tilesets/secondary/unused_2/tiles.png | Bin 864 -> 979 bytes 260 files changed, 135 insertions(+), 169 deletions(-) create mode 100644 data/tilesets/primary/building/anim/0.png create mode 100644 data/tilesets/primary/building/anim/1.png create mode 100644 data/tilesets/primary/general/anim/0/0.png create mode 100644 data/tilesets/primary/general/anim/0/1.png create mode 100644 data/tilesets/primary/general/anim/0/2.png create mode 100644 data/tilesets/primary/general/anim/1/0.png create mode 100644 data/tilesets/primary/general/anim/1/1.png create mode 100644 data/tilesets/primary/general/anim/1/2.png create mode 100644 data/tilesets/primary/general/anim/1/3.png create mode 100644 data/tilesets/primary/general/anim/1/4.png create mode 100644 data/tilesets/primary/general/anim/1/5.png create mode 100644 data/tilesets/primary/general/anim/1/6.png create mode 100644 data/tilesets/primary/general/anim/1/7.png create mode 100644 data/tilesets/primary/general/anim/2/0.png create mode 100644 data/tilesets/primary/general/anim/2/1.png create mode 100644 data/tilesets/primary/general/anim/2/2.png create mode 100644 data/tilesets/primary/general/anim/2/3.png create mode 100644 data/tilesets/primary/general/anim/2/4.png create mode 100644 data/tilesets/primary/general/anim/2/5.png create mode 100644 data/tilesets/primary/general/anim/2/6.png create mode 100644 data/tilesets/primary/general/anim/3/0.png create mode 100644 data/tilesets/primary/general/anim/3/1.png create mode 100644 data/tilesets/primary/general/anim/3/2.png create mode 100644 data/tilesets/primary/general/anim/3/3.png create mode 100644 data/tilesets/primary/general/anim/4/0.png create mode 100644 data/tilesets/primary/general/anim/4/1.png create mode 100644 data/tilesets/primary/general/anim/4/2.png create mode 100644 data/tilesets/primary/general/anim/4/3.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/0.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/1.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/2.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/3.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/0.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/1.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/2.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/3.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/0.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/1.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/2.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/0.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/1.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/2.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/3.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/4.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/5.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/6.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/7.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/8.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/9.png create mode 100644 data/tilesets/secondary/bike_shop/anim/0.png create mode 100644 data/tilesets/secondary/bike_shop/anim/1.png create mode 100644 data/tilesets/secondary/bike_shop/anim/2.png create mode 100644 data/tilesets/secondary/cave/anim/0.png create mode 100644 data/tilesets/secondary/cave/anim/1.png create mode 100644 data/tilesets/secondary/cave/anim/2.png create mode 100644 data/tilesets/secondary/cave/anim/3.png create mode 100644 data/tilesets/secondary/cave/anim/unused/0.png create mode 100644 data/tilesets/secondary/cave/anim/unused/1.png create mode 100644 data/tilesets/secondary/cave/anim/unused/2.png create mode 100644 data/tilesets/secondary/cave/anim/unused/3.png create mode 100644 data/tilesets/secondary/dewford/anim/0.png create mode 100644 data/tilesets/secondary/dewford/anim/1.png create mode 100644 data/tilesets/secondary/dewford/anim/2.png create mode 100644 data/tilesets/secondary/dewford/anim/3.png create mode 100644 data/tilesets/secondary/elite_four/anim/0/0.png create mode 100644 data/tilesets/secondary/elite_four/anim/0/1.png create mode 100644 data/tilesets/secondary/elite_four/anim/0/2.png create mode 100644 data/tilesets/secondary/elite_four/anim/0/3.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/0.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/1.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/2.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/3.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/4.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/5.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/6.png create mode 100644 data/tilesets/secondary/elite_four/anim/1/7.png create mode 100644 data/tilesets/secondary/ever_grande/anim/0.png create mode 100644 data/tilesets/secondary/ever_grande/anim/1.png create mode 100644 data/tilesets/secondary/ever_grande/anim/2.png create mode 100644 data/tilesets/secondary/ever_grande/anim/3.png create mode 100644 data/tilesets/secondary/ever_grande/anim/4.png create mode 100644 data/tilesets/secondary/ever_grande/anim/5.png create mode 100644 data/tilesets/secondary/ever_grande/anim/6.png create mode 100644 data/tilesets/secondary/ever_grande/anim/7.png create mode 100644 data/tilesets/secondary/lavaridge/anim/0.png create mode 100644 data/tilesets/secondary/lavaridge/anim/1.png create mode 100644 data/tilesets/secondary/lavaridge/anim/2.png create mode 100644 data/tilesets/secondary/lavaridge/anim/3.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/0.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/1.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/2.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/3.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/4.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/5.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/6.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/7.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/8.png create mode 100644 data/tilesets/secondary/mauville/anim/0/a/9.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/0.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/1.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/2.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/3.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/4.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/5.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/6.png create mode 100644 data/tilesets/secondary/mauville/anim/0/b/7.png create mode 100644 data/tilesets/secondary/mauville/anim/1/a/0.png create mode 100644 data/tilesets/secondary/mauville/anim/1/a/1.png create mode 100644 data/tilesets/secondary/mauville/anim/1/a/2.png create mode 100644 data/tilesets/secondary/mauville/anim/1/a/3.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/0.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/1.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/2.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/3.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/4.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/5.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/6.png create mode 100644 data/tilesets/secondary/mauville/anim/1/b/7.png create mode 100644 data/tilesets/secondary/mauville_gym/anim/0.png create mode 100644 data/tilesets/secondary/mauville_gym/anim/1.png create mode 100644 data/tilesets/secondary/mauville_gym/anim/2.png create mode 100644 data/tilesets/secondary/mauville_gym/anim/3.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/0/0.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/0/1.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/0/2.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/0.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/1.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/2.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/3.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/4.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/5.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/6.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/1/7.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/0.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/1.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/2.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/3.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/4.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/5.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/6.png create mode 100644 data/tilesets/secondary/rustboro/anim/0/7.png create mode 100644 data/tilesets/secondary/rustboro/anim/1/0.png create mode 100644 data/tilesets/secondary/rustboro/anim/1/1.png create mode 100644 data/tilesets/secondary/rustboro/anim/1/2.png create mode 100644 data/tilesets/secondary/rustboro/anim/1/3.png create mode 100644 data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png create mode 100644 data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png create mode 100644 data/tilesets/secondary/secret_base/red_cave/unused_tiles.png create mode 100644 data/tilesets/secondary/secret_base/shrub/unused_tiles.png create mode 100644 data/tilesets/secondary/secret_base/tree/unused_tiles.png create mode 100644 data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png create mode 100644 data/tilesets/secondary/slateport/anim/0.png create mode 100644 data/tilesets/secondary/slateport/anim/1.png create mode 100644 data/tilesets/secondary/slateport/anim/2.png create mode 100644 data/tilesets/secondary/slateport/anim/3.png create mode 100644 data/tilesets/secondary/sootopolis/anim/0.png create mode 100644 data/tilesets/secondary/sootopolis/anim/1.png create mode 100644 data/tilesets/secondary/sootopolis/anim/2.png create mode 100644 data/tilesets/secondary/sootopolis/anim/3.png create mode 100644 data/tilesets/secondary/sootopolis/anim/4.png create mode 100644 data/tilesets/secondary/sootopolis/anim/5.png create mode 100644 data/tilesets/secondary/sootopolis/anim/6.png create mode 100644 data/tilesets/secondary/sootopolis/anim/7.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/0.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/1.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/2.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/3.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/0.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/1.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/2.png create mode 100644 data/tilesets/secondary/underwater/anim/0.png create mode 100644 data/tilesets/secondary/underwater/anim/1.png create mode 100644 data/tilesets/secondary/underwater/anim/2.png create mode 100644 data/tilesets/secondary/underwater/anim/3.png create mode 100644 data/tilesets/secondary/unused_1/0.png create mode 100644 data/tilesets/secondary/unused_1/1.png create mode 100644 data/tilesets/secondary/unused_1/2.png create mode 100644 data/tilesets/secondary/unused_1/3.png create mode 100644 data/tilesets/secondary/unused_2/0.png create mode 100644 data/tilesets/secondary/unused_2/1.png create mode 100644 data/tilesets/secondary/unused_2/2.png create mode 100644 data/tilesets/secondary/unused_2/3.png (limited to 'data') diff --git a/data/tileset.s b/data/tileset.s index b8a0ca77f..0ca02d41c 100644 --- a/data/tileset.s +++ b/data/tileset.s @@ -5,50 +5,48 @@ .align 2, 0 gUnknown_085105C4:: - .incbin "baserom.gba", 0x5105c4, 0x80 + .incbin "data/tilesets/primary/general/anim/0/1.4bpp" gUnknown_08510644:: - .incbin "baserom.gba", 0x510644, 0x80 + .incbin "data/tilesets/primary/general/anim/0/0.4bpp" gUnknown_085106C4:: - .incbin "baserom.gba", 0x5106c4, 0x80 + .incbin "data/tilesets/primary/general/anim/0/2.4bpp" .space 0x20 gTilesetAnims_General0:: @ 8510764 -@ replacing .incbin "baserom.gba", 0x00510764, 0x10 .4byte gUnknown_08510644 .4byte gUnknown_085105C4 .4byte gUnknown_08510644 .4byte gUnknown_085106C4 gUnknown_08510774:: - .incbin "baserom.gba", 0x510774, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/0.4bpp" gUnknown_08510B34:: - .incbin "baserom.gba", 0x510b34, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/1.4bpp" gUnknown_08510EF4:: - .incbin "baserom.gba", 0x510ef4, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/2.4bpp" gUnknown_085112B4:: - .incbin "baserom.gba", 0x5112b4, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/3.4bpp" gUnknown_08511674:: - .incbin "baserom.gba", 0x511674, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/4.4bpp" gUnknown_08511A34:: - .incbin "baserom.gba", 0x511a34, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/5.4bpp" gUnknown_08511DF4:: - .incbin "baserom.gba", 0x511df4, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/6.4bpp" gUnknown_085121B4:: - .incbin "baserom.gba", 0x5121b4, 0x3c0 + .incbin "data/tilesets/primary/general/anim/1/7.4bpp" gTilesetAnims_General1:: @ 8512574 -@ replacing .incbin "baserom.gba", 0x00512574, 0x20 .4byte gUnknown_08510774 .4byte gUnknown_08510B34 .4byte gUnknown_08510EF4 @@ -59,29 +57,28 @@ gTilesetAnims_General1:: @ 8512574 .4byte gUnknown_085121B4 gUnknown_08512594:: - .incbin "baserom.gba", 0x512594, 0x140 + .incbin "data/tilesets/primary/general/anim/2/0.4bpp" gUnknown_085126D4:: - .incbin "baserom.gba", 0x5126d4, 0x140 + .incbin "data/tilesets/primary/general/anim/2/1.4bpp" gUnknown_08512814:: - .incbin "baserom.gba", 0x512814, 0x140 + .incbin "data/tilesets/primary/general/anim/2/2.4bpp" gUnknown_08512954:: - .incbin "baserom.gba", 0x512954, 0x140 + .incbin "data/tilesets/primary/general/anim/2/3.4bpp" gUnknown_08512A94:: - .incbin "baserom.gba", 0x512a94, 0x140 + .incbin "data/tilesets/primary/general/anim/2/4.4bpp" gUnknown_08512BD4:: - .incbin "baserom.gba", 0x512bd4, 0x140 + .incbin "data/tilesets/primary/general/anim/2/5.4bpp" gUnknown_08512D14:: - .incbin "baserom.gba", 0x512d14, 0x140 + .incbin "data/tilesets/primary/general/anim/2/6.4bpp" gTilesetAnims_General2:: @ 8512E54 -@ replacing .incbin "baserom.gba", 0x00512e54, 0x20 .4byte gUnknown_08512594 .4byte gUnknown_085126D4 .4byte gUnknown_08512814 @@ -92,129 +89,123 @@ gTilesetAnims_General2:: @ 8512E54 .4byte gUnknown_08512594 gUnknown_08512E74:: - .incbin "baserom.gba", 0x512e74, 0xc0 + .incbin "data/tilesets/primary/general/anim/3/0.4bpp" gUnknown_08512F34:: - .incbin "baserom.gba", 0x512f34, 0xc0 + .incbin "data/tilesets/primary/general/anim/3/1.4bpp" gUnknown_08512FF4:: - .incbin "baserom.gba", 0x512ff4, 0xc0 + .incbin "data/tilesets/primary/general/anim/3/2.4bpp" gUnknown_085130B4:: - .incbin "baserom.gba", 0x5130b4, 0xc0 + .incbin "data/tilesets/primary/general/anim/3/3.4bpp" gTilesetAnims_General3:: @ 8513174 -@ replacing .incbin "baserom.gba", 0x00513174, 0x10 .4byte gUnknown_08512E74 .4byte gUnknown_08512F34 .4byte gUnknown_08512FF4 .4byte gUnknown_085130B4 gUnknown_08513184:: - .incbin "baserom.gba", 0x513184, 0x140 + .incbin "data/tilesets/primary/general/anim/4/0.4bpp" gUnknown_085132C4:: - .incbin "baserom.gba", 0x5132c4, 0x140 + .incbin "data/tilesets/primary/general/anim/4/1.4bpp" gUnknown_08513404:: - .incbin "baserom.gba", 0x513404, 0x140 + .incbin "data/tilesets/primary/general/anim/4/2.4bpp" gUnknown_08513544:: - .incbin "baserom.gba", 0x513544, 0x140 + .incbin "data/tilesets/primary/general/anim/4/3.4bpp" gTilesetAnims_General4:: @ 8513684 -@ replacing .incbin "baserom.gba", 0x00513684, 0x10 .4byte gUnknown_08513184 .4byte gUnknown_085132C4 .4byte gUnknown_08513404 .4byte gUnknown_08513544 gUnknown_08513694:: - .incbin "baserom.gba", 0x513694, 0x80 + .incbin "data/tilesets/secondary/lavaridge/anim/0.4bpp" gUnknown_08513714:: - .incbin "baserom.gba", 0x513714, 0x80 + .incbin "data/tilesets/secondary/lavaridge/anim/1.4bpp" gUnknown_08513794:: - .incbin "baserom.gba", 0x513794, 0x80 + .incbin "data/tilesets/secondary/lavaridge/anim/2.4bpp" gUnknown_08513814:: - .incbin "baserom.gba", 0x513814, 0x80 + .incbin "data/tilesets/secondary/lavaridge/anim/3.4bpp" gTilesetAnims_Lavaridge0:: @ 8513894 -@ replacing .incbin "baserom.gba", 0x00513894, 0x10 .4byte gUnknown_08513694 .4byte gUnknown_08513714 .4byte gUnknown_08513794 .4byte gUnknown_08513814 gUnknown_085138A4:: - .incbin "baserom.gba", 0x5138a4, 0x3c0 + .incbin "data/tilesets/secondary/pacifidlog/anim/0/0.4bpp" gUnknown_08513C64:: - .incbin "baserom.gba", 0x513c64, 0x3c0 + .incbin "data/tilesets/secondary/pacifidlog/anim/0/1.4bpp" gUnknown_08514024:: - .incbin "baserom.gba", 0x514024, 0x3c0 + .incbin "data/tilesets/secondary/pacifidlog/anim/0/2.4bpp" gTilesetAnims_Pacifidlog0:: @ 85143E4 -@ replacing .incbin "baserom.gba", 0x005143e4, 0x10 .4byte gUnknown_085138A4 .4byte gUnknown_08513C64 .4byte gUnknown_08514024 .4byte gUnknown_08513C64 gUnknown_085143F4:: - .incbin "baserom.gba", 0x5143f4, 0x80 + .incbin "data/tilesets/secondary/underwater/anim/0.4bpp" gUnknown_08514474:: - .incbin "baserom.gba", 0x514474, 0x80 + .incbin "data/tilesets/secondary/underwater/anim/1.4bpp" gUnknown_085144F4:: - .incbin "baserom.gba", 0x5144f4, 0x80 + .incbin "data/tilesets/secondary/underwater/anim/2.4bpp" gUnknown_08514574:: - .incbin "baserom.gba", 0x514574, 0x80 + .incbin "data/tilesets/secondary/underwater/anim/3.4bpp" gTilesetAnims_Underwater0:: @ 85145F4 -@ replacing .incbin "baserom.gba", 0x005145f4, 0x10 .4byte gUnknown_085143F4 .4byte gUnknown_08514474 .4byte gUnknown_085144F4 .4byte gUnknown_08514574 gUnknown_08514604:: - .incbin "baserom.gba", 0x514604, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/0.4bpp" gUnknown_08514704:: - .incbin "baserom.gba", 0x514704, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/1.4bpp" gUnknown_08514804:: - .incbin "baserom.gba", 0x514804, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/2.4bpp" gUnknown_08514904:: - .incbin "baserom.gba", 0x514904, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/3.4bpp" gUnknown_08514A04:: - .incbin "baserom.gba", 0x514a04, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/4.4bpp" gUnknown_08514B04:: - .incbin "baserom.gba", 0x514b04, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/5.4bpp" gUnknown_08514C04:: - .incbin "baserom.gba", 0x514c04, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/6.4bpp" gUnknown_08514D04:: - .incbin "baserom.gba", 0x514d04, 0x100 + .incbin "data/tilesets/secondary/pacifidlog/anim/1/7.4bpp" gTilesetAnims_Pacifidlog1:: @ 8514E04 -@ replacing .incbin "baserom.gba", 0x00514e04, 0x20 .4byte gUnknown_08514604 .4byte gUnknown_08514704 .4byte gUnknown_08514804 @@ -225,39 +216,38 @@ gTilesetAnims_Pacifidlog1:: @ 8514E04 .4byte gUnknown_08514D04 gUnknown_08514E24:: - .incbin "baserom.gba", 0x514e24, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/a/0.4bpp" gUnknown_08514EA4:: - .incbin "baserom.gba", 0x514ea4, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/a/1.4bpp" gUnknown_08514F24:: - .incbin "baserom.gba", 0x514f24, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/a/2.4bpp" gUnknown_08514FA4:: - .incbin "baserom.gba", 0x514fa4, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/a/3.4bpp" gUnknown_08515024:: - .incbin "baserom.gba", 0x515024, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/1/a/1.4bpp" gUnknown_085150A4:: - .incbin "baserom.gba", 0x5150a4, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/b/0.4bpp" gUnknown_08515124:: - .incbin "baserom.gba", 0x515124, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/b/1.4bpp" gUnknown_085151A4:: - .incbin "baserom.gba", 0x5151a4, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/b/2.4bpp" gUnknown_08515224:: - .incbin "baserom.gba", 0x515224, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/0/b/3.4bpp" gUnknown_085152A4:: - .incbin "baserom.gba", 0x5152a4, 0x80 + .incbin "data/tilesets/secondary/mauville/anim/1/b/1.4bpp" .space 0x20 gTilesetAnims_MauvilleVDests0:: @ 8515344 -@ replacing .incbin "baserom.gba", 0x00515344, 0x20 .4byte BG_VRAM + 0x4c00 .4byte BG_VRAM + 0x4c80 .4byte BG_VRAM + 0x4d00 @@ -268,7 +258,6 @@ gTilesetAnims_MauvilleVDests0:: @ 8515344 .4byte BG_VRAM + 0x4f80 gTilesetAnims_MauvilleVDests1:: @ 8515364 -@ replacing .incbin "baserom.gba", 0x00515364, 0x20 .4byte BG_VRAM + 0x5000 .4byte BG_VRAM + 0x5080 .4byte BG_VRAM + 0x5100 @@ -279,7 +268,6 @@ gTilesetAnims_MauvilleVDests1:: @ 8515364 .4byte BG_VRAM + 0x5380 gTilesetAnims_Mauville0a:: @ 8515384 -@ replacing .incbin "baserom.gba", 0x00515384, 0x30 .4byte gUnknown_08514E24 .4byte gUnknown_08514E24 .4byte gUnknown_08514EA4 @@ -294,7 +282,6 @@ gTilesetAnims_Mauville0a:: @ 8515384 .4byte gUnknown_08514EA4 gTilesetAnims_Mauville0b:: @ 85153B4 -@ replacing .incbin "baserom.gba", 0x005153b4, 0x30 .4byte gUnknown_085150A4 .4byte gUnknown_085150A4 .4byte gUnknown_08515124 @@ -309,42 +296,40 @@ gTilesetAnims_Mauville0b:: @ 85153B4 .4byte gUnknown_08515124 gTilesetAnims_Mauville1a:: @ 85153E4 -@ replacing .incbin "baserom.gba", 0x005153e4, 0x10 .4byte gUnknown_08514E24 .4byte gUnknown_08514E24 .4byte gUnknown_08515024 .4byte gUnknown_08515024 gTilesetAnims_Mauville1b:: @ 85153F4 -@ replacing .incbin "baserom.gba", 0x005153f4, 0x10 .4byte gUnknown_085150A4 .4byte gUnknown_085150A4 .4byte gUnknown_085152A4 .4byte gUnknown_085152A4 gUnknown_08515404:: - .incbin "baserom.gba", 0x515404, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/0.4bpp" gUnknown_08515484:: - .incbin "baserom.gba", 0x515484, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/1.4bpp" gUnknown_08515504:: - .incbin "baserom.gba", 0x515504, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/2.4bpp" gUnknown_08515584:: - .incbin "baserom.gba", 0x515584, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/3.4bpp" gUnknown_08515604:: - .incbin "baserom.gba", 0x515604, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/4.4bpp" gUnknown_08515684:: - .incbin "baserom.gba", 0x515684, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/5.4bpp" gUnknown_08515704:: - .incbin "baserom.gba", 0x515704, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/6.4bpp" gUnknown_08515784:: - .incbin "baserom.gba", 0x515784, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/0/7.4bpp" gTilesetAnims_RustboroVDests0:: @ 8515804 @@ -358,7 +343,6 @@ gTilesetAnims_RustboroVDests0:: @ 8515804 .4byte BG_VRAM + 0x5380 gTilesetAnims_Rustboro0:: @ 8515824 -@ replacing .incbin "baserom.gba", 0x00515824, 0x20 .4byte gUnknown_08515404 .4byte gUnknown_08515484 .4byte gUnknown_08515504 @@ -369,82 +353,79 @@ gTilesetAnims_Rustboro0:: @ 8515824 .4byte gUnknown_08515784 gUnknown_08515844:: - .incbin "baserom.gba", 0x515844, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/1/0.4bpp" gUnknown_085158C4:: - .incbin "baserom.gba", 0x5158c4, 0x80 + .incbin "data/tilesets/secondary/rustboro/anim/1/1.4bpp" .space 0x20 gTilesetAnims_Rustboro1:: @ 8515964 -@ replacing .incbin "baserom.gba", 0x00515964, 0x8 .4byte gUnknown_08515844 .4byte gUnknown_085158C4 gUnknown_0851596C:: - .incbin "baserom.gba", 0x51596c, 0x80 + .incbin "data/tilesets/secondary/cave/anim/0.4bpp" gUnknown_085159EC:: - .incbin "baserom.gba", 0x5159ec, 0x80 + .incbin "data/tilesets/secondary/cave/anim/1.4bpp" gUnknown_08515A6C:: - .incbin "baserom.gba", 0x515a6c, 0x80 + .incbin "data/tilesets/secondary/cave/anim/2.4bpp" gUnknown_08515AEC:: - .incbin "baserom.gba", 0x515aec, 0x80 + .incbin "data/tilesets/secondary/cave/anim/3.4bpp" gUnknown_08515B6C:: - .incbin "baserom.gba", 0x515b6c, 0x80 + .incbin "data/tilesets/secondary/cave/anim/unused/0.4bpp" gUnknown_08515BEC:: - .incbin "baserom.gba", 0x515bec, 0x80 + .incbin "data/tilesets/secondary/cave/anim/unused/1.4bpp" gUnknown_08515C6C:: - .incbin "baserom.gba", 0x515c6c, 0x80 + .incbin "data/tilesets/secondary/cave/anim/unused/2.4bpp" gUnknown_08515CEC:: - .incbin "baserom.gba", 0x515cec, 0x80 + .incbin "data/tilesets/secondary/cave/anim/unused/3.4bpp" .space 0x20 gTilesetAnims_Lavaridge1_Cave0:: @ 8515D8C -@ replacing .incbin "baserom.gba", 0x00515d8c, 0x10 .4byte gUnknown_0851596C .4byte gUnknown_085159EC .4byte gUnknown_08515A6C .4byte gUnknown_08515AEC gUnknown_08515D9C:: - .incbin "baserom.gba", 0x515d9c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/0.4bpp" gUnknown_08515E1C:: - .incbin "baserom.gba", 0x515e1c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/1.4bpp" gUnknown_08515E9C:: - .incbin "baserom.gba", 0x515e9c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/2.4bpp" gUnknown_08515F1C:: - .incbin "baserom.gba", 0x515f1c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/3.4bpp" gUnknown_08515F9C:: - .incbin "baserom.gba", 0x515f9c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/4.4bpp" gUnknown_0851601C:: - .incbin "baserom.gba", 0x51601c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/5.4bpp" gUnknown_0851609C:: - .incbin "baserom.gba", 0x51609c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/6.4bpp" gUnknown_0851611C:: - .incbin "baserom.gba", 0x51611c, 0x80 + .incbin "data/tilesets/secondary/ever_grande/anim/7.4bpp" .space 0x20 gTilesetAnims_EverGrandeVDests0:: @ 85161BC -@ replacing .incbin "baserom.gba", 0x005161bc, 0x20 .4byte BG_VRAM + 0x5c00 .4byte BG_VRAM + 0x5c80 .4byte BG_VRAM + 0x5d00 @@ -455,7 +436,6 @@ gTilesetAnims_EverGrandeVDests0:: @ 85161BC .4byte BG_VRAM + 0x5f80 gTilesetAnims_EverGrande0:: @ 85161DC -@ replacing .incbin "baserom.gba", 0x005161dc, 0x20 .4byte gUnknown_08515D9C .4byte gUnknown_08515E1C .4byte gUnknown_08515E9C @@ -466,228 +446,216 @@ gTilesetAnims_EverGrande0:: @ 85161DC .4byte gUnknown_0851611C gUnknown_085161FC:: - .incbin "baserom.gba", 0x5161fc, 0xc0 + .incbin "data/tilesets/secondary/dewford/anim/0.4bpp" gUnknown_085162BC:: - .incbin "baserom.gba", 0x5162bc, 0xc0 + .incbin "data/tilesets/secondary/dewford/anim/1.4bpp" gUnknown_0851637C:: - .incbin "baserom.gba", 0x51637c, 0xc0 + .incbin "data/tilesets/secondary/dewford/anim/2.4bpp" gUnknown_0851643C:: - .incbin "baserom.gba", 0x51643c, 0xc0 + .incbin "data/tilesets/secondary/dewford/anim/3.4bpp" gTilesetAnims_Dewford0:: @ 85164FC -@ replacing .incbin "baserom.gba", 0x005164fc, 0x10 .4byte gUnknown_085161FC .4byte gUnknown_085162BC .4byte gUnknown_0851637C .4byte gUnknown_0851643C gUnknown_0851650C:: - .incbin "baserom.gba", 0x51650c, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp" gUnknown_085165CC:: - .incbin "baserom.gba", 0x5165cc, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp" gUnknown_0851668C:: - .incbin "baserom.gba", 0x51668c, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp" gUnknown_0851674C:: - .incbin "baserom.gba", 0x51674c, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp" gTilesetAnims_BattleFrontierOutsideWest0:: @ 851680C -@ replacing .incbin "baserom.gba", 0x0051680c, 0x10 .4byte gUnknown_0851650C .4byte gUnknown_085165CC .4byte gUnknown_0851668C .4byte gUnknown_0851674C gUnknown_0851681C:: @ 851680C - .incbin "baserom.gba", 0x51681c, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp" gUnknown_085168DC:: - .incbin "baserom.gba", 0x5168dc, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp" gUnknown_0851699C:: - .incbin "baserom.gba", 0x51699c, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp" gUnknown_08516A5C:: - .incbin "baserom.gba", 0x516a5c, 0xc0 + .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp" gTilesetAnims_BattleFrontierOutsideEast0:: @ 8516B1C -@ replacing .incbin "baserom.gba", 0x00516b1c, 0x10 .4byte gUnknown_0851681C .4byte gUnknown_085168DC .4byte gUnknown_0851699C .4byte gUnknown_08516A5C gUnknown_08516B2C:: - .incbin "baserom.gba", 0x516b2c, 0x80 + .incbin "data/tilesets/secondary/slateport/anim/0.4bpp" gUnknown_08516BAC:: - .incbin "baserom.gba", 0x516bac, 0x80 + .incbin "data/tilesets/secondary/slateport/anim/1.4bpp" gUnknown_08516C2C:: - .incbin "baserom.gba", 0x516c2c, 0x80 + .incbin "data/tilesets/secondary/slateport/anim/2.4bpp" gUnknown_08516CAC:: - .incbin "baserom.gba", 0x516cac, 0x80 + .incbin "data/tilesets/secondary/slateport/anim/3.4bpp" gTilesetAnims_Slateport0:: @ 8516D2C -@ replacing .incbin "baserom.gba", 0x00516d2c, 0x10 .4byte gUnknown_08516B2C .4byte gUnknown_08516BAC .4byte gUnknown_08516C2C .4byte gUnknown_08516CAC gUnknown_08516D3C:: - .incbin "baserom.gba", 0x516d3c, 0x80 + .incbin "data/tilesets/primary/building/anim/0.4bpp" gUnknown_08516DBC:: - .incbin "baserom.gba", 0x516dbc, 0x80 + .incbin "data/tilesets/primary/building/anim/1.4bpp" gTilesetAnims_InsideBuilding0:: @ 8516E3C -@ replacing .incbin "baserom.gba", 0x00516e3c, 0x8 .4byte gUnknown_08516D3C .4byte gUnknown_08516DBC gUnknown_08516E44:: - .incbin "baserom.gba", 0x516e44, 0x180 + .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp" gUnknown_08516FC4:: - .incbin "baserom.gba", 0x516fc4, 0x180 + .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp" gUnknown_08517144:: - .incbin "baserom.gba", 0x517144, 0x180 + .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp" gUnknown_085172C4:: - .incbin "baserom.gba", 0x5172c4, 0x280 + .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp" gUnknown_08517544:: - .incbin "baserom.gba", 0x517544, 0x280 + .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp" gUnknown_085177C4:: - .incbin "baserom.gba", 0x5177c4, 0x280 + .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp" gTilesetAnims_SootopolisGym0:: @ 8517A44 -@ replacing .incbin "baserom.gba", 0x00517a44, 0xc .4byte gUnknown_08516E44 .4byte gUnknown_08516FC4 .4byte gUnknown_08517144 gTilesetAnims_SootopolisGym1:: @ 8517A50 -@ replacing .incbin "baserom.gba", 0x00517a50, 0xc .4byte gUnknown_085172C4 .4byte gUnknown_08517544 .4byte gUnknown_085177C4 gUnknown_08517A5C:: - .incbin "baserom.gba", 0x517a5c, 0x80 + .incbin "data/tilesets/secondary/elite_four/anim/1/0.4bpp" gUnknown_08517ADC:: - .incbin "baserom.gba", 0x517adc, 0x80 + .incbin "data/tilesets/secondary/elite_four/anim/1/1.4bpp" gUnknown_08517B5C:: - .incbin "baserom.gba", 0x517b5c, 0x20 + .incbin "data/tilesets/secondary/elite_four/anim/0/0.4bpp" gUnknown_08517B7C:: - .incbin "baserom.gba", 0x517b7c, 0x20 + .incbin "data/tilesets/secondary/elite_four/anim/0/1.4bpp" gUnknown_08517B9C:: - .incbin "baserom.gba", 0x517b9c, 0x20 + .incbin "data/tilesets/secondary/elite_four/anim/0/2.4bpp" gUnknown_08517BBC:: - .incbin "baserom.gba", 0x517bbc, 0x20 + .incbin "data/tilesets/secondary/elite_four/anim/0/3.4bpp" .space 0x20 gTilesetAnims_EliteFour1:: @ 8517BFC -@ replacing .incbin "baserom.gba", 0x00517bfc, 0x10 .4byte gUnknown_08517B5C .4byte gUnknown_08517B7C .4byte gUnknown_08517B9C .4byte gUnknown_08517BBC gTilesetAnims_EliteFour0:: @ 8517C0C -@ replacing .incbin "baserom.gba", 0x00517c0c, 0x8 .4byte gUnknown_08517A5C .4byte gUnknown_08517ADC gUnknown_08517C14:: - .incbin "baserom.gba", 0x517c14, 0x200 + .incbin "data/tilesets/secondary/mauville_gym/anim/0.4bpp" gUnknown_08517E14:: - .incbin "baserom.gba", 0x517e14, 0x200 + .incbin "data/tilesets/secondary/mauville_gym/anim/1.4bpp" .space 0x20 gTilesetAnims_MauvilleGym0:: @ 8518034 -@ replacing .incbin "baserom.gba", 0x00518034, 0x8 .4byte gUnknown_08517C14 .4byte gUnknown_08517E14 gUnknown_0851803C:: - .incbin "baserom.gba", 0x51803c, 0x120 + .incbin "data/tilesets/secondary/bike_shop/anim/0.4bpp" gUnknown_0851815C:: - .incbin "baserom.gba", 0x51815c, 0x120 + .incbin "data/tilesets/secondary/bike_shop/anim/1.4bpp" .space 0x20 gTilesetAnims_BikeShop0:: @ 851829C -@ replacing .incbin "baserom.gba", 0x0051829c, 0x8 .4byte gUnknown_0851803C .4byte gUnknown_0851815C gUnknown_085182A4:: - .incbin "baserom.gba", 0x5182a4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/0.4bpp" gUnknown_08518EA4:: - .incbin "baserom.gba", 0x518ea4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/1.4bpp" gUnknown_08519AA4:: - .incbin "baserom.gba", 0x519aa4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/2.4bpp" gUnknown_0851A6A4:: - .incbin "baserom.gba", 0x51a6a4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/3.4bpp" gUnknown_0851B2A4:: - .incbin "baserom.gba", 0x51b2a4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/4.4bpp" gUnknown_0851BEA4:: - .incbin "baserom.gba", 0x51bea4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/5.4bpp" gUnknown_0851CAA4:: - .incbin "baserom.gba", 0x51caa4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/6.4bpp" gUnknown_0851D6A4:: - .incbin "baserom.gba", 0x51d6a4, 0xc00 + .incbin "data/tilesets/secondary/sootopolis/anim/7.4bpp" .space 0x20 gUnknown_0851E2C4:: - .incbin "baserom.gba", 0x51e2c4, 0x800 + .incbin "data/tilesets/secondary/unused_1/0.4bpp" gUnknown_0851EAC4:: - .incbin "baserom.gba", 0x51eac4, 0x800 + .incbin "data/tilesets/secondary/unused_1/1.4bpp" gUnknown_0851F2C4:: - .incbin "baserom.gba", 0x51f2c4, 0x800 + .incbin "data/tilesets/secondary/unused_1/2.4bpp" gUnknown_0851FAC4:: - .incbin "baserom.gba", 0x51fac4, 0x800 + .incbin "data/tilesets/secondary/unused_1/3.4bpp" gTilesetAnims_Sootopolis0:: @ 85202C4 -@ replacing .incbin "baserom.gba", 0x005202c4, 0x20 .4byte gUnknown_085182A4 .4byte gUnknown_08518EA4 .4byte gUnknown_08519AA4 @@ -698,43 +666,41 @@ gTilesetAnims_Sootopolis0:: @ 85202C4 .4byte gUnknown_0851D6A4 gUnknown_085202E4:: - .incbin "baserom.gba", 0x5202e4, 0x100 + .incbin "data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp" gUnknown_085203E4:: - .incbin "baserom.gba", 0x5203e4, 0x100 + .incbin "data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp" gUnknown_085204E4:: - .incbin "baserom.gba", 0x5204e4, 0x100 + .incbin "data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp" .space 0x20 gUnknown_08520604:: - .incbin "baserom.gba", 0x520604, 0x100 + .incbin "data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp" gUnknown_08520704:: - .incbin "baserom.gba", 0x520704, 0x100 + .incbin "data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp" gUnknown_08520804:: - .incbin "baserom.gba", 0x520804, 0x100 + .incbin "data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp" .space 0x3d00 gUnknown_08524604:: - .incbin "baserom.gba", 0x524604, 0x40 + .incbin "data/tilesets/secondary/unused_2/0.4bpp" .space 0x1c0 gUnknown_08524804:: - .incbin "baserom.gba", 0x524804, 0x60 + .incbin "data/tilesets/secondary/unused_2/1.4bpp" gTilesetAnims_BattlePyramid0:: @ 8524864 -@ replacing .incbin "baserom.gba", 0x00524864, 0xc .4byte gUnknown_085202E4 .4byte gUnknown_085203E4 .4byte gUnknown_085204E4 gTilesetAnims_BattlePyramid1:: @ 8524870 -@ replacing .incbin "baserom.gba", 0x00524870, 0xc .4byte gUnknown_08520604 .4byte gUnknown_08520704 .4byte gUnknown_08520804 diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png new file mode 100644 index 000000000..004eccc67 Binary files /dev/null and b/data/tilesets/primary/building/anim/0.png differ diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png new file mode 100644 index 000000000..e28281dea Binary files /dev/null and b/data/tilesets/primary/building/anim/1.png differ diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png new file mode 100644 index 000000000..d535d920e Binary files /dev/null and b/data/tilesets/primary/general/anim/0/0.png differ diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png new file mode 100644 index 000000000..74f93ecce Binary files /dev/null and b/data/tilesets/primary/general/anim/0/1.png differ diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png new file mode 100644 index 000000000..fb0bfe89f Binary files /dev/null and b/data/tilesets/primary/general/anim/0/2.png differ diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png new file mode 100644 index 000000000..a7bb2e631 Binary files /dev/null and b/data/tilesets/primary/general/anim/1/0.png differ diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png new file mode 100644 index 000000000..c215f1683 Binary files /dev/null and b/data/tilesets/primary/general/anim/1/1.png differ diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png new file mode 100644 index 000000000..f8e0ee273 Binary files /dev/null and b/data/tilesets/primary/general/anim/1/2.png differ diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png new file mode 100644 index 000000000..6c6ce3611 Binary files /dev/null and b/data/tilesets/primary/general/anim/1/3.png differ diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png new file mode 100644 index 000000000..cc1f9576c Binary files /dev/null and b/data/tilesets/primary/general/anim/1/4.png differ diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png new file mode 100644 index 000000000..3c0c57a86 Binary files /dev/null and b/data/tilesets/primary/general/anim/1/5.png differ diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png new file mode 100644 index 000000000..be5ecacaa Binary files /dev/null and b/data/tilesets/primary/general/anim/1/6.png differ diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png new file mode 100644 index 000000000..85bc7561a Binary files /dev/null and b/data/tilesets/primary/general/anim/1/7.png differ diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png new file mode 100644 index 000000000..6f9f0c309 Binary files /dev/null and b/data/tilesets/primary/general/anim/2/0.png differ diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png new file mode 100644 index 000000000..bef1f3023 Binary files /dev/null and b/data/tilesets/primary/general/anim/2/1.png differ diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png new file mode 100644 index 000000000..b5d7a9ee9 Binary files /dev/null and b/data/tilesets/primary/general/anim/2/2.png differ diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png new file mode 100644 index 000000000..42a953a83 Binary files /dev/null and b/data/tilesets/primary/general/anim/2/3.png differ diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png new file mode 100644 index 000000000..112b20077 Binary files /dev/null and b/data/tilesets/primary/general/anim/2/4.png differ diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png new file mode 100644 index 000000000..7f58c0b94 Binary files /dev/null and b/data/tilesets/primary/general/anim/2/5.png differ diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png new file mode 100644 index 000000000..784a543b4 Binary files /dev/null and b/data/tilesets/primary/general/anim/2/6.png differ diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png new file mode 100644 index 000000000..2f8bb49b6 Binary files /dev/null and b/data/tilesets/primary/general/anim/3/0.png differ diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png new file mode 100644 index 000000000..5a2744a66 Binary files /dev/null and b/data/tilesets/primary/general/anim/3/1.png differ diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png new file mode 100644 index 000000000..0ddf1cda7 Binary files /dev/null and b/data/tilesets/primary/general/anim/3/2.png differ diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png new file mode 100644 index 000000000..f3fee8470 Binary files /dev/null and b/data/tilesets/primary/general/anim/3/3.png differ diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png new file mode 100644 index 000000000..90dc0bc02 Binary files /dev/null and b/data/tilesets/primary/general/anim/4/0.png differ diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png new file mode 100644 index 000000000..4459a94e5 Binary files /dev/null and b/data/tilesets/primary/general/anim/4/1.png differ diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png new file mode 100644 index 000000000..389875c31 Binary files /dev/null and b/data/tilesets/primary/general/anim/4/2.png differ diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png new file mode 100644 index 000000000..ac8936cce Binary files /dev/null and b/data/tilesets/primary/general/anim/4/3.png differ diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png index 3d1e90510..121e835a2 100644 Binary files a/data/tilesets/primary/general/tiles.png and b/data/tilesets/primary/general/tiles.png differ diff --git a/data/tilesets/primary/inside_building/tiles.png b/data/tilesets/primary/inside_building/tiles.png index 7d267dfb7..506bb7400 100644 Binary files a/data/tilesets/primary/inside_building/tiles.png and b/data/tilesets/primary/inside_building/tiles.png differ diff --git a/data/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png index 9adc0e13f..9dee014ea 100644 Binary files a/data/tilesets/primary/secret_base/tiles.png and b/data/tilesets/primary/secret_base/tiles.png differ diff --git a/data/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png index dd5c4e16a..3ca4d9e87 100644 Binary files a/data/tilesets/primary/secret_base/unknown_tiles.png and b/data/tilesets/primary/secret_base/unknown_tiles.png differ diff --git a/data/tilesets/secondary/battle_arena/tiles.png b/data/tilesets/secondary/battle_arena/tiles.png index 43297aa7b..7414666df 100644 Binary files a/data/tilesets/secondary/battle_arena/tiles.png and b/data/tilesets/secondary/battle_arena/tiles.png differ diff --git a/data/tilesets/secondary/battle_dome/tiles.png b/data/tilesets/secondary/battle_dome/tiles.png index e0fce3196..be3708bfd 100644 Binary files a/data/tilesets/secondary/battle_dome/tiles.png and b/data/tilesets/secondary/battle_dome/tiles.png differ diff --git a/data/tilesets/secondary/battle_factory/tiles.png b/data/tilesets/secondary/battle_factory/tiles.png index 7857f0813..4d9463b20 100644 Binary files a/data/tilesets/secondary/battle_factory/tiles.png and b/data/tilesets/secondary/battle_factory/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier/tiles.png b/data/tilesets/secondary/battle_frontier/tiles.png index 70ec420e9..1b14ce555 100644 Binary files a/data/tilesets/secondary/battle_frontier/tiles.png and b/data/tilesets/secondary/battle_frontier/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png new file mode 100644 index 000000000..8a9905198 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png new file mode 100644 index 000000000..836986b12 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png new file mode 100644 index 000000000..660d3080f Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png new file mode 100644 index 000000000..7fe571b4a Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png index 20cb7d67e..da34656d1 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png and b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png new file mode 100644 index 000000000..8a9905198 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png new file mode 100644 index 000000000..836986b12 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png new file mode 100644 index 000000000..660d3080f Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png new file mode 100644 index 000000000..7fe571b4a Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png index 3d5ea94f9..03704bfd0 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png and b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png index cf54e1d77..1c1f700c0 100644 Binary files a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png and b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png differ diff --git a/data/tilesets/secondary/battle_palace/tiles.png b/data/tilesets/secondary/battle_palace/tiles.png index a848a9eef..4e11e3596 100644 Binary files a/data/tilesets/secondary/battle_palace/tiles.png and b/data/tilesets/secondary/battle_palace/tiles.png differ diff --git a/data/tilesets/secondary/battle_pike/tiles.png b/data/tilesets/secondary/battle_pike/tiles.png index cba2f5794..fc11f1d1a 100644 Binary files a/data/tilesets/secondary/battle_pike/tiles.png and b/data/tilesets/secondary/battle_pike/tiles.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/0/0.png new file mode 100644 index 000000000..c0fb59c0e Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/0/0.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/0/1.png new file mode 100644 index 000000000..29c019209 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/0/1.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/0/2.png new file mode 100644 index 000000000..7c463d9c3 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/0/2.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/1/0.png new file mode 100644 index 000000000..2a0921dea Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/0.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/1/1.png new file mode 100644 index 000000000..3474d081f Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/1.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/1/2.png new file mode 100644 index 000000000..b9f1c4423 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/2.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/3.png b/data/tilesets/secondary/battle_pyramid/anim/1/3.png new file mode 100644 index 000000000..8ad81b1e1 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/3.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/4.png b/data/tilesets/secondary/battle_pyramid/anim/1/4.png new file mode 100644 index 000000000..bea921d90 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/4.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/5.png b/data/tilesets/secondary/battle_pyramid/anim/1/5.png new file mode 100644 index 000000000..bea921d90 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/5.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/6.png b/data/tilesets/secondary/battle_pyramid/anim/1/6.png new file mode 100644 index 000000000..16652df19 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/6.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/7.png b/data/tilesets/secondary/battle_pyramid/anim/1/7.png new file mode 100644 index 000000000..8ea7a49e6 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/7.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/8.png b/data/tilesets/secondary/battle_pyramid/anim/1/8.png new file mode 100644 index 000000000..2895d3319 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/8.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/9.png b/data/tilesets/secondary/battle_pyramid/anim/1/9.png new file mode 100644 index 000000000..63c22acf2 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/1/9.png differ diff --git a/data/tilesets/secondary/battle_pyramid/tiles.png b/data/tilesets/secondary/battle_pyramid/tiles.png index cd45ea045..d9609f3dd 100644 Binary files a/data/tilesets/secondary/battle_pyramid/tiles.png and b/data/tilesets/secondary/battle_pyramid/tiles.png differ diff --git a/data/tilesets/secondary/battle_tent/tiles.png b/data/tilesets/secondary/battle_tent/tiles.png index 919e3878f..35e5c4b65 100644 Binary files a/data/tilesets/secondary/battle_tent/tiles.png and b/data/tilesets/secondary/battle_tent/tiles.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png new file mode 100644 index 000000000..069509b27 Binary files /dev/null and b/data/tilesets/secondary/bike_shop/anim/0.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png new file mode 100644 index 000000000..4123bb0bf Binary files /dev/null and b/data/tilesets/secondary/bike_shop/anim/1.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/2.png b/data/tilesets/secondary/bike_shop/anim/2.png new file mode 100644 index 000000000..7c463d9c3 Binary files /dev/null and b/data/tilesets/secondary/bike_shop/anim/2.png differ diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png index ec109c3be..e068538f5 100644 Binary files a/data/tilesets/secondary/bike_shop/tiles.png and b/data/tilesets/secondary/bike_shop/tiles.png differ diff --git a/data/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png index 10163e9f1..6d6a5f047 100644 Binary files a/data/tilesets/secondary/brendans_mays_house/tiles.png and b/data/tilesets/secondary/brendans_mays_house/tiles.png differ diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png index 2b153c1f4..c5ad4cfac 100644 Binary files a/data/tilesets/secondary/cable_club/tiles.png and b/data/tilesets/secondary/cable_club/tiles.png differ diff --git a/data/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png index da68cdff2..84e79f720 100644 Binary files a/data/tilesets/secondary/cable_club/unknown_tiles.png and b/data/tilesets/secondary/cable_club/unknown_tiles.png differ diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png new file mode 100644 index 000000000..67f294ffe Binary files /dev/null and b/data/tilesets/secondary/cave/anim/0.png differ diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png new file mode 100644 index 000000000..9c92be807 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/1.png differ diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png new file mode 100644 index 000000000..78ea00e04 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/2.png differ diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png new file mode 100644 index 000000000..7edd52eaa Binary files /dev/null and b/data/tilesets/secondary/cave/anim/3.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png new file mode 100644 index 000000000..44564e67a Binary files /dev/null and b/data/tilesets/secondary/cave/anim/unused/0.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png new file mode 100644 index 000000000..47e7e17ee Binary files /dev/null and b/data/tilesets/secondary/cave/anim/unused/1.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png new file mode 100644 index 000000000..d1447cde2 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/unused/2.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png new file mode 100644 index 000000000..8ad81b1e1 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/unused/3.png differ diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png index f905c6b21..e8c98dd71 100644 Binary files a/data/tilesets/secondary/cave/tiles.png and b/data/tilesets/secondary/cave/tiles.png differ diff --git a/data/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png index 09ddee472..710654f5f 100644 Binary files a/data/tilesets/secondary/contest/tiles.png and b/data/tilesets/secondary/contest/tiles.png differ diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/0.png new file mode 100644 index 000000000..adf42975f Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/0.png differ diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/1.png new file mode 100644 index 000000000..6e7c23a18 Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/1.png differ diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/2.png new file mode 100644 index 000000000..86075ffb0 Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/2.png differ diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/3.png new file mode 100644 index 000000000..6e3c57621 Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/3.png differ diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png index f79972197..1cf4c165c 100644 Binary files a/data/tilesets/secondary/dewford/tiles.png and b/data/tilesets/secondary/dewford/tiles.png differ diff --git a/data/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png index 1dad6f205..7d923b505 100644 Binary files a/data/tilesets/secondary/dewford_gym/tiles.png and b/data/tilesets/secondary/dewford_gym/tiles.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png new file mode 100644 index 000000000..806d26e57 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/0/0.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png new file mode 100644 index 000000000..2a8e6a31c Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/0/1.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png new file mode 100644 index 000000000..c4e6161a6 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/0/2.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png new file mode 100644 index 000000000..2a8e6a31c Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/0/3.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png new file mode 100644 index 000000000..7822d1896 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/0.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png new file mode 100644 index 000000000..66d60e90b Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/1.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/2.png b/data/tilesets/secondary/elite_four/anim/1/2.png new file mode 100644 index 000000000..09fb59fbf Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/2.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/3.png b/data/tilesets/secondary/elite_four/anim/1/3.png new file mode 100644 index 000000000..0c7c05034 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/3.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/4.png b/data/tilesets/secondary/elite_four/anim/1/4.png new file mode 100644 index 000000000..317db1714 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/4.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/5.png b/data/tilesets/secondary/elite_four/anim/1/5.png new file mode 100644 index 000000000..d0cbfeb57 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/5.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/6.png b/data/tilesets/secondary/elite_four/anim/1/6.png new file mode 100644 index 000000000..4b35ededd Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/6.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/7.png b/data/tilesets/secondary/elite_four/anim/1/7.png new file mode 100644 index 000000000..dfe698edb Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/1/7.png differ diff --git a/data/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png index 834be3701..d16b2db03 100644 Binary files a/data/tilesets/secondary/elite_four/tiles.png and b/data/tilesets/secondary/elite_four/tiles.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png new file mode 100644 index 000000000..7536d08ad Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/0.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png new file mode 100644 index 000000000..7536d08ad Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/1.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png new file mode 100644 index 000000000..f0835aa3b Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/2.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png new file mode 100644 index 000000000..c07cbbd17 Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/3.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png new file mode 100644 index 000000000..7536d08ad Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/4.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png new file mode 100644 index 000000000..7536d08ad Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/5.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png new file mode 100644 index 000000000..9b5030306 Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/6.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png new file mode 100644 index 000000000..9b5030306 Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/7.png differ diff --git a/data/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png index 0f3689c24..943a3f8f4 100644 Binary files a/data/tilesets/secondary/ever_grande/tiles.png and b/data/tilesets/secondary/ever_grande/tiles.png differ diff --git a/data/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png index 5585dee3b..f99c24150 100644 Binary files a/data/tilesets/secondary/facility/tiles.png and b/data/tilesets/secondary/facility/tiles.png differ diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png index 4c5d72277..21ab321ef 100644 Binary files a/data/tilesets/secondary/fallarbor/tiles.png and b/data/tilesets/secondary/fallarbor/tiles.png differ diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png index 0875d1d47..78cb1c1ae 100644 Binary files a/data/tilesets/secondary/fortree/tiles.png and b/data/tilesets/secondary/fortree/tiles.png differ diff --git a/data/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png index bb16dd0ca..932b5c06a 100644 Binary files a/data/tilesets/secondary/fortree_gym/tiles.png and b/data/tilesets/secondary/fortree_gym/tiles.png differ diff --git a/data/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png index d94085b06..6f681f837 100644 Binary files a/data/tilesets/secondary/generic_building/tiles.png and b/data/tilesets/secondary/generic_building/tiles.png differ diff --git a/data/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png index 44f923a5a..65a82e888 100644 Binary files a/data/tilesets/secondary/inside_of_truck/tiles.png and b/data/tilesets/secondary/inside_of_truck/tiles.png differ diff --git a/data/tilesets/secondary/inside_ship/tiles.png b/data/tilesets/secondary/inside_ship/tiles.png index d4b0471b2..77142a755 100644 Binary files a/data/tilesets/secondary/inside_ship/tiles.png and b/data/tilesets/secondary/inside_ship/tiles.png differ diff --git a/data/tilesets/secondary/island_harbor/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png index e70a72977..82e419e72 100644 Binary files a/data/tilesets/secondary/island_harbor/tiles.png and b/data/tilesets/secondary/island_harbor/tiles.png differ diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png index c2a86a73d..6a213d960 100644 Binary files a/data/tilesets/secondary/lab/tiles.png and b/data/tilesets/secondary/lab/tiles.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png new file mode 100644 index 000000000..303855f71 Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/0.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png new file mode 100644 index 000000000..7cdee79e2 Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/1.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png new file mode 100644 index 000000000..b5810b806 Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/2.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png new file mode 100644 index 000000000..caf7b5698 Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/3.png differ diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png index 4886aa28e..896c43194 100644 Binary files a/data/tilesets/secondary/lavaridge/tiles.png and b/data/tilesets/secondary/lavaridge/tiles.png differ diff --git a/data/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png index 0865ea207..8734cc3bf 100644 Binary files a/data/tilesets/secondary/lavaridge_gym/tiles.png and b/data/tilesets/secondary/lavaridge_gym/tiles.png differ diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png index 88c5c7a28..b77f3d379 100644 Binary files a/data/tilesets/secondary/lilycove/tiles.png and b/data/tilesets/secondary/lilycove/tiles.png differ diff --git a/data/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png index 495187301..5bcc0ecfe 100644 Binary files a/data/tilesets/secondary/lilycove_museum/tiles.png and b/data/tilesets/secondary/lilycove_museum/tiles.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/0/a/0.png new file mode 100644 index 000000000..88b028b52 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/0/a/1.png new file mode 100644 index 000000000..ce4010db2 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/0/a/2.png new file mode 100644 index 000000000..5ea20f6db Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/0/a/3.png new file mode 100644 index 000000000..fdf4d30bf Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/4.png b/data/tilesets/secondary/mauville/anim/0/a/4.png new file mode 100644 index 000000000..c8097808c Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/4.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/5.png b/data/tilesets/secondary/mauville/anim/0/a/5.png new file mode 100644 index 000000000..88b028b52 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/5.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/6.png b/data/tilesets/secondary/mauville/anim/0/a/6.png new file mode 100644 index 000000000..ce4010db2 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/6.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/7.png b/data/tilesets/secondary/mauville/anim/0/a/7.png new file mode 100644 index 000000000..5ea20f6db Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/7.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/8.png b/data/tilesets/secondary/mauville/anim/0/a/8.png new file mode 100644 index 000000000..fdf4d30bf Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/8.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/9.png b/data/tilesets/secondary/mauville/anim/0/a/9.png new file mode 100644 index 000000000..c8097808c Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/a/9.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/0/b/0.png new file mode 100644 index 000000000..88b028b52 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/0/b/1.png new file mode 100644 index 000000000..ce4010db2 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/0/b/2.png new file mode 100644 index 000000000..5ea20f6db Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/0/b/3.png new file mode 100644 index 000000000..fdf4d30bf Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/4.png b/data/tilesets/secondary/mauville/anim/0/b/4.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/4.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/5.png b/data/tilesets/secondary/mauville/anim/0/b/5.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/5.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/6.png b/data/tilesets/secondary/mauville/anim/0/b/6.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/6.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/7.png b/data/tilesets/secondary/mauville/anim/0/b/7.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/0/b/7.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/0.png b/data/tilesets/secondary/mauville/anim/1/a/0.png new file mode 100644 index 000000000..88b028b52 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/a/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/1/a/1.png new file mode 100644 index 000000000..c8097808c Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/a/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/2.png b/data/tilesets/secondary/mauville/anim/1/a/2.png new file mode 100644 index 000000000..5ea20f6db Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/a/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/3.png b/data/tilesets/secondary/mauville/anim/1/a/3.png new file mode 100644 index 000000000..fdf4d30bf Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/a/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/0.png b/data/tilesets/secondary/mauville/anim/1/b/0.png new file mode 100644 index 000000000..88b028b52 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/1/b/1.png new file mode 100644 index 000000000..c8097808c Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/2.png b/data/tilesets/secondary/mauville/anim/1/b/2.png new file mode 100644 index 000000000..5ea20f6db Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/3.png b/data/tilesets/secondary/mauville/anim/1/b/3.png new file mode 100644 index 000000000..fdf4d30bf Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/4.png b/data/tilesets/secondary/mauville/anim/1/b/4.png new file mode 100644 index 000000000..44564e67a Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/4.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/5.png b/data/tilesets/secondary/mauville/anim/1/b/5.png new file mode 100644 index 000000000..47e7e17ee Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/5.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/6.png b/data/tilesets/secondary/mauville/anim/1/b/6.png new file mode 100644 index 000000000..d1447cde2 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/6.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/7.png b/data/tilesets/secondary/mauville/anim/1/b/7.png new file mode 100644 index 000000000..8ad81b1e1 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/1/b/7.png differ diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png index a015fe5b4..e4ce0d4f8 100644 Binary files a/data/tilesets/secondary/mauville/tiles.png and b/data/tilesets/secondary/mauville/tiles.png differ diff --git a/data/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png index c8f0dd1ee..3f7f565c9 100644 Binary files a/data/tilesets/secondary/mauville_game_corner/tiles.png and b/data/tilesets/secondary/mauville_game_corner/tiles.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png new file mode 100644 index 000000000..090fe6a1a Binary files /dev/null and b/data/tilesets/secondary/mauville_gym/anim/0.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png new file mode 100644 index 000000000..48f325890 Binary files /dev/null and b/data/tilesets/secondary/mauville_gym/anim/1.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/2.png b/data/tilesets/secondary/mauville_gym/anim/2.png new file mode 100644 index 000000000..16652df19 Binary files /dev/null and b/data/tilesets/secondary/mauville_gym/anim/2.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/3.png b/data/tilesets/secondary/mauville_gym/anim/3.png new file mode 100644 index 000000000..8ea7a49e6 Binary files /dev/null and b/data/tilesets/secondary/mauville_gym/anim/3.png differ diff --git a/data/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png index d710d2e40..5606bb101 100644 Binary files a/data/tilesets/secondary/mauville_gym/tiles.png and b/data/tilesets/secondary/mauville_gym/tiles.png differ diff --git a/data/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png index 5b0342f9b..9c7532805 100644 Binary files a/data/tilesets/secondary/meteor_falls/tiles.png and b/data/tilesets/secondary/meteor_falls/tiles.png differ diff --git a/data/tilesets/secondary/mirage_tower/tiles.png b/data/tilesets/secondary/mirage_tower/tiles.png index 8eab57f93..fd2904ca1 100644 Binary files a/data/tilesets/secondary/mirage_tower/tiles.png and b/data/tilesets/secondary/mirage_tower/tiles.png differ diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png index 1933b8983..818406b23 100644 Binary files a/data/tilesets/secondary/mossdeep/tiles.png and b/data/tilesets/secondary/mossdeep/tiles.png differ diff --git a/data/tilesets/secondary/mossdeep_game_corner/tiles.png b/data/tilesets/secondary/mossdeep_game_corner/tiles.png index 379c4f42f..f09edf436 100644 Binary files a/data/tilesets/secondary/mossdeep_game_corner/tiles.png and b/data/tilesets/secondary/mossdeep_game_corner/tiles.png differ diff --git a/data/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png index 919d0334e..36a0873a4 100644 Binary files a/data/tilesets/secondary/mossdeep_gym/tiles.png and b/data/tilesets/secondary/mossdeep_gym/tiles.png differ diff --git a/data/tilesets/secondary/mystery_events_house/tiles.png b/data/tilesets/secondary/mystery_events_house/tiles.png index 1f5f8639b..5afa07fcf 100644 Binary files a/data/tilesets/secondary/mystery_events_house/tiles.png and b/data/tilesets/secondary/mystery_events_house/tiles.png differ diff --git a/data/tilesets/secondary/navel_rock/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png index 06d8065f1..ffbc04584 100644 Binary files a/data/tilesets/secondary/navel_rock/tiles.png and b/data/tilesets/secondary/navel_rock/tiles.png differ diff --git a/data/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png index 25a20d586..a074d4a05 100644 Binary files a/data/tilesets/secondary/oceanic_museum/tiles.png and b/data/tilesets/secondary/oceanic_museum/tiles.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png new file mode 100644 index 000000000..e7bcfd743 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/0/0.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png new file mode 100644 index 000000000..dde024f6e Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/0/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png new file mode 100644 index 000000000..1a4cea24d Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/0/2.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png new file mode 100644 index 000000000..beb8ee82d Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/0.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png new file mode 100644 index 000000000..594655120 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png new file mode 100644 index 000000000..747306d5c Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/2.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png new file mode 100644 index 000000000..20e0a7cdd Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/3.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png new file mode 100644 index 000000000..7b74ee349 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/4.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png new file mode 100644 index 000000000..b135bdfbe Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/5.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png new file mode 100644 index 000000000..4eae151e6 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/6.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png new file mode 100644 index 000000000..f1863fdd5 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/1/7.png differ diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png index 496232735..94fe6d96b 100644 Binary files a/data/tilesets/secondary/pacifidlog/tiles.png and b/data/tilesets/secondary/pacifidlog/tiles.png differ diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png index 97e8bf187..dd0e23ca4 100644 Binary files a/data/tilesets/secondary/petalburg/tiles.png and b/data/tilesets/secondary/petalburg/tiles.png differ diff --git a/data/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png index 8c996f701..cb7c40e5a 100644 Binary files a/data/tilesets/secondary/petalburg_gym/tiles.png and b/data/tilesets/secondary/petalburg_gym/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png index 826da07bf..673746c5a 100644 Binary files a/data/tilesets/secondary/pokemon_center/tiles.png and b/data/tilesets/secondary/pokemon_center/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png index eab49af32..76cd9ab96 100644 Binary files a/data/tilesets/secondary/pokemon_day_care/tiles.png and b/data/tilesets/secondary/pokemon_day_care/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png index 2714292f0..62dd0f03f 100644 Binary files a/data/tilesets/secondary/pokemon_fan_club/tiles.png and b/data/tilesets/secondary/pokemon_fan_club/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png index 3c8c4dffe..20e3f32c8 100644 Binary files a/data/tilesets/secondary/pokemon_school/tiles.png and b/data/tilesets/secondary/pokemon_school/tiles.png differ diff --git a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png index 7a9e44935..f10306e7a 100644 Binary files a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png and b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png new file mode 100644 index 000000000..358745e4b Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/0.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png new file mode 100644 index 000000000..f5a095b15 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/1.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/2.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/3.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/4.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/5.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/6.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png new file mode 100644 index 000000000..91f368cf8 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/0/7.png differ diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png new file mode 100644 index 000000000..75bd2f8a4 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/1/0.png differ diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png new file mode 100644 index 000000000..9f8b3a02f Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/1/1.png differ diff --git a/data/tilesets/secondary/rustboro/anim/1/2.png b/data/tilesets/secondary/rustboro/anim/1/2.png new file mode 100644 index 000000000..86075ffb0 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/1/2.png differ diff --git a/data/tilesets/secondary/rustboro/anim/1/3.png b/data/tilesets/secondary/rustboro/anim/1/3.png new file mode 100644 index 000000000..6e3c57621 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/1/3.png differ diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png index 8cea2a4d9..fbfc72d46 100644 Binary files a/data/tilesets/secondary/rustboro/tiles.png and b/data/tilesets/secondary/rustboro/tiles.png differ diff --git a/data/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png index bfdc07c07..d4ebc14a1 100644 Binary files a/data/tilesets/secondary/rustboro_gym/tiles.png and b/data/tilesets/secondary/rustboro_gym/tiles.png differ diff --git a/data/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png index dc947bcc5..913935f77 100644 Binary files a/data/tilesets/secondary/rusturf_tunnel/tiles.png and b/data/tilesets/secondary/rusturf_tunnel/tiles.png differ diff --git a/data/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png index 695f83037..ea48f5006 100644 Binary files a/data/tilesets/secondary/seashore_house/tiles.png and b/data/tilesets/secondary/seashore_house/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png index 207e8d845..9d820463b 100644 Binary files a/data/tilesets/secondary/secret_base/blue_cave/tiles.png and b/data/tilesets/secondary/secret_base/blue_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png new file mode 100644 index 000000000..1e42fed54 Binary files /dev/null and b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png index 7888f8cc2..a1c8bfe72 100644 Binary files a/data/tilesets/secondary/secret_base/brown_cave/tiles.png and b/data/tilesets/secondary/secret_base/brown_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png new file mode 100644 index 000000000..dfd187d51 Binary files /dev/null and b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png index 5c21865e2..2652f6bbf 100644 Binary files a/data/tilesets/secondary/secret_base/red_cave/tiles.png and b/data/tilesets/secondary/secret_base/red_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png new file mode 100644 index 000000000..5cfebd309 Binary files /dev/null and b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png index 2e0a6d028..692141b04 100644 Binary files a/data/tilesets/secondary/secret_base/shrub/tiles.png and b/data/tilesets/secondary/secret_base/shrub/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/shrub/unused_tiles.png b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png new file mode 100644 index 000000000..461d620ae Binary files /dev/null and b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png index 83ddd6144..94887cc1f 100644 Binary files a/data/tilesets/secondary/secret_base/tree/tiles.png and b/data/tilesets/secondary/secret_base/tree/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/tree/unused_tiles.png b/data/tilesets/secondary/secret_base/tree/unused_tiles.png new file mode 100644 index 000000000..567cf7800 Binary files /dev/null and b/data/tilesets/secondary/secret_base/tree/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png index e8386a804..b171b5ec6 100644 Binary files a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png and b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png new file mode 100644 index 000000000..f825201cc Binary files /dev/null and b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png index 31e3c5319..f253a2e53 100644 Binary files a/data/tilesets/secondary/shop/tiles.png and b/data/tilesets/secondary/shop/tiles.png differ diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/0.png new file mode 100644 index 000000000..ef62c4143 Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/0.png differ diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/1.png new file mode 100644 index 000000000..9b926bdfc Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/1.png differ diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/2.png new file mode 100644 index 000000000..c5974f105 Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/2.png differ diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/3.png new file mode 100644 index 000000000..9b926bdfc Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/3.png differ diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png index f89ca2b0c..d8661b99a 100644 Binary files a/data/tilesets/secondary/slateport/tiles.png and b/data/tilesets/secondary/slateport/tiles.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/0.png new file mode 100644 index 000000000..63f97ad47 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/0.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/1.png new file mode 100644 index 000000000..aa14ec04a Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/1.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/2.png new file mode 100644 index 000000000..09fb59fbf Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/2.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/3.png new file mode 100644 index 000000000..0c7c05034 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/3.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/4.png new file mode 100644 index 000000000..317db1714 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/4.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/5.png new file mode 100644 index 000000000..d0cbfeb57 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/5.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/6.png new file mode 100644 index 000000000..4b35ededd Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/6.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/7.png new file mode 100644 index 000000000..dfe698edb Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/7.png differ diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png index 5e9866821..92df774ae 100644 Binary files a/data/tilesets/secondary/sootopolis/tiles.png and b/data/tilesets/secondary/sootopolis/tiles.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png new file mode 100644 index 000000000..f0ec1ac00 Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png new file mode 100644 index 000000000..4fefe4598 Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png new file mode 100644 index 000000000..f603b3046 Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/3.png b/data/tilesets/secondary/sootopolis_gym/anim/0/3.png new file mode 100644 index 000000000..2a8e6a31c Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/0/3.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png new file mode 100644 index 000000000..e0f807ef4 Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png new file mode 100644 index 000000000..08413b63c Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png new file mode 100644 index 000000000..6681b5e96 Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png index b2533b243..4f6b25769 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/tiles.png and b/data/tilesets/secondary/sootopolis_gym/tiles.png differ diff --git a/data/tilesets/secondary/trainer_hill/tiles.png b/data/tilesets/secondary/trainer_hill/tiles.png index f5330af84..78d292513 100644 Binary files a/data/tilesets/secondary/trainer_hill/tiles.png and b/data/tilesets/secondary/trainer_hill/tiles.png differ diff --git a/data/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png index eb81554cc..5ef1bf9ca 100644 Binary files a/data/tilesets/secondary/trick_house_puzzle/tiles.png and b/data/tilesets/secondary/trick_house_puzzle/tiles.png differ diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png new file mode 100644 index 000000000..7609cc82a Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/0.png differ diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png new file mode 100644 index 000000000..64cddd371 Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/1.png differ diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png new file mode 100644 index 000000000..ff6ff8437 Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/2.png differ diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png new file mode 100644 index 000000000..2863c2261 Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/3.png differ diff --git a/data/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png index e0569d970..5af21f353 100644 Binary files a/data/tilesets/secondary/underwater/tiles.png and b/data/tilesets/secondary/underwater/tiles.png differ diff --git a/data/tilesets/secondary/union_room/tiles.png b/data/tilesets/secondary/union_room/tiles.png index 50d44bf93..b38ffe9e5 100644 Binary files a/data/tilesets/secondary/union_room/tiles.png and b/data/tilesets/secondary/union_room/tiles.png differ diff --git a/data/tilesets/secondary/unused_1/0.png b/data/tilesets/secondary/unused_1/0.png new file mode 100644 index 000000000..bea921d90 Binary files /dev/null and b/data/tilesets/secondary/unused_1/0.png differ diff --git a/data/tilesets/secondary/unused_1/1.png b/data/tilesets/secondary/unused_1/1.png new file mode 100644 index 000000000..bea921d90 Binary files /dev/null and b/data/tilesets/secondary/unused_1/1.png differ diff --git a/data/tilesets/secondary/unused_1/2.png b/data/tilesets/secondary/unused_1/2.png new file mode 100644 index 000000000..16652df19 Binary files /dev/null and b/data/tilesets/secondary/unused_1/2.png differ diff --git a/data/tilesets/secondary/unused_1/3.png b/data/tilesets/secondary/unused_1/3.png new file mode 100644 index 000000000..8ea7a49e6 Binary files /dev/null and b/data/tilesets/secondary/unused_1/3.png differ diff --git a/data/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png index 0a35187c8..3ae8bce42 100644 Binary files a/data/tilesets/secondary/unused_1/tiles.png and b/data/tilesets/secondary/unused_1/tiles.png differ diff --git a/data/tilesets/secondary/unused_2/0.png b/data/tilesets/secondary/unused_2/0.png new file mode 100644 index 000000000..2895d3319 Binary files /dev/null and b/data/tilesets/secondary/unused_2/0.png differ diff --git a/data/tilesets/secondary/unused_2/1.png b/data/tilesets/secondary/unused_2/1.png new file mode 100644 index 000000000..63c22acf2 Binary files /dev/null and b/data/tilesets/secondary/unused_2/1.png differ diff --git a/data/tilesets/secondary/unused_2/2.png b/data/tilesets/secondary/unused_2/2.png new file mode 100644 index 000000000..d1447cde2 Binary files /dev/null and b/data/tilesets/secondary/unused_2/2.png differ diff --git a/data/tilesets/secondary/unused_2/3.png b/data/tilesets/secondary/unused_2/3.png new file mode 100644 index 000000000..8ad81b1e1 Binary files /dev/null and b/data/tilesets/secondary/unused_2/3.png differ diff --git a/data/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png index b9c594303..2ab3b63d6 100644 Binary files a/data/tilesets/secondary/unused_2/tiles.png and b/data/tilesets/secondary/unused_2/tiles.png differ -- cgit v1.2.3 From df0b715207ad6d025995dd5612190d8d51fc049f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Oct 2017 21:08:54 -0400 Subject: Decompile data/tileset.s --- data/tileset.s | 707 --------------------------------------------------------- 1 file changed, 707 deletions(-) delete mode 100644 data/tileset.s (limited to 'data') diff --git a/data/tileset.s b/data/tileset.s deleted file mode 100644 index 0ca02d41c..000000000 --- a/data/tileset.s +++ /dev/null @@ -1,707 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_085105C4:: - .incbin "data/tilesets/primary/general/anim/0/1.4bpp" - -gUnknown_08510644:: - .incbin "data/tilesets/primary/general/anim/0/0.4bpp" - -gUnknown_085106C4:: - .incbin "data/tilesets/primary/general/anim/0/2.4bpp" - - .space 0x20 - -gTilesetAnims_General0:: @ 8510764 - .4byte gUnknown_08510644 - .4byte gUnknown_085105C4 - .4byte gUnknown_08510644 - .4byte gUnknown_085106C4 - -gUnknown_08510774:: - .incbin "data/tilesets/primary/general/anim/1/0.4bpp" - -gUnknown_08510B34:: - .incbin "data/tilesets/primary/general/anim/1/1.4bpp" - -gUnknown_08510EF4:: - .incbin "data/tilesets/primary/general/anim/1/2.4bpp" - -gUnknown_085112B4:: - .incbin "data/tilesets/primary/general/anim/1/3.4bpp" - -gUnknown_08511674:: - .incbin "data/tilesets/primary/general/anim/1/4.4bpp" - -gUnknown_08511A34:: - .incbin "data/tilesets/primary/general/anim/1/5.4bpp" - -gUnknown_08511DF4:: - .incbin "data/tilesets/primary/general/anim/1/6.4bpp" - -gUnknown_085121B4:: - .incbin "data/tilesets/primary/general/anim/1/7.4bpp" - - -gTilesetAnims_General1:: @ 8512574 - .4byte gUnknown_08510774 - .4byte gUnknown_08510B34 - .4byte gUnknown_08510EF4 - .4byte gUnknown_085112B4 - .4byte gUnknown_08511674 - .4byte gUnknown_08511A34 - .4byte gUnknown_08511DF4 - .4byte gUnknown_085121B4 - -gUnknown_08512594:: - .incbin "data/tilesets/primary/general/anim/2/0.4bpp" - -gUnknown_085126D4:: - .incbin "data/tilesets/primary/general/anim/2/1.4bpp" - -gUnknown_08512814:: - .incbin "data/tilesets/primary/general/anim/2/2.4bpp" - -gUnknown_08512954:: - .incbin "data/tilesets/primary/general/anim/2/3.4bpp" - -gUnknown_08512A94:: - .incbin "data/tilesets/primary/general/anim/2/4.4bpp" - -gUnknown_08512BD4:: - .incbin "data/tilesets/primary/general/anim/2/5.4bpp" - -gUnknown_08512D14:: - .incbin "data/tilesets/primary/general/anim/2/6.4bpp" - - -gTilesetAnims_General2:: @ 8512E54 - .4byte gUnknown_08512594 - .4byte gUnknown_085126D4 - .4byte gUnknown_08512814 - .4byte gUnknown_08512954 - .4byte gUnknown_08512A94 - .4byte gUnknown_08512BD4 - .4byte gUnknown_08512D14 - .4byte gUnknown_08512594 - -gUnknown_08512E74:: - .incbin "data/tilesets/primary/general/anim/3/0.4bpp" - -gUnknown_08512F34:: - .incbin "data/tilesets/primary/general/anim/3/1.4bpp" - -gUnknown_08512FF4:: - .incbin "data/tilesets/primary/general/anim/3/2.4bpp" - -gUnknown_085130B4:: - .incbin "data/tilesets/primary/general/anim/3/3.4bpp" - - -gTilesetAnims_General3:: @ 8513174 - .4byte gUnknown_08512E74 - .4byte gUnknown_08512F34 - .4byte gUnknown_08512FF4 - .4byte gUnknown_085130B4 - -gUnknown_08513184:: - .incbin "data/tilesets/primary/general/anim/4/0.4bpp" - -gUnknown_085132C4:: - .incbin "data/tilesets/primary/general/anim/4/1.4bpp" - -gUnknown_08513404:: - .incbin "data/tilesets/primary/general/anim/4/2.4bpp" - -gUnknown_08513544:: - .incbin "data/tilesets/primary/general/anim/4/3.4bpp" - - -gTilesetAnims_General4:: @ 8513684 - .4byte gUnknown_08513184 - .4byte gUnknown_085132C4 - .4byte gUnknown_08513404 - .4byte gUnknown_08513544 - -gUnknown_08513694:: - .incbin "data/tilesets/secondary/lavaridge/anim/0.4bpp" - -gUnknown_08513714:: - .incbin "data/tilesets/secondary/lavaridge/anim/1.4bpp" - -gUnknown_08513794:: - .incbin "data/tilesets/secondary/lavaridge/anim/2.4bpp" - -gUnknown_08513814:: - .incbin "data/tilesets/secondary/lavaridge/anim/3.4bpp" - - -gTilesetAnims_Lavaridge0:: @ 8513894 - .4byte gUnknown_08513694 - .4byte gUnknown_08513714 - .4byte gUnknown_08513794 - .4byte gUnknown_08513814 - -gUnknown_085138A4:: - .incbin "data/tilesets/secondary/pacifidlog/anim/0/0.4bpp" - -gUnknown_08513C64:: - .incbin "data/tilesets/secondary/pacifidlog/anim/0/1.4bpp" - -gUnknown_08514024:: - .incbin "data/tilesets/secondary/pacifidlog/anim/0/2.4bpp" - - -gTilesetAnims_Pacifidlog0:: @ 85143E4 - .4byte gUnknown_085138A4 - .4byte gUnknown_08513C64 - .4byte gUnknown_08514024 - .4byte gUnknown_08513C64 - -gUnknown_085143F4:: - .incbin "data/tilesets/secondary/underwater/anim/0.4bpp" - -gUnknown_08514474:: - .incbin "data/tilesets/secondary/underwater/anim/1.4bpp" - -gUnknown_085144F4:: - .incbin "data/tilesets/secondary/underwater/anim/2.4bpp" - -gUnknown_08514574:: - .incbin "data/tilesets/secondary/underwater/anim/3.4bpp" - - -gTilesetAnims_Underwater0:: @ 85145F4 - .4byte gUnknown_085143F4 - .4byte gUnknown_08514474 - .4byte gUnknown_085144F4 - .4byte gUnknown_08514574 - -gUnknown_08514604:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/0.4bpp" - -gUnknown_08514704:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/1.4bpp" - -gUnknown_08514804:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/2.4bpp" - -gUnknown_08514904:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/3.4bpp" - -gUnknown_08514A04:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/4.4bpp" - -gUnknown_08514B04:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/5.4bpp" - -gUnknown_08514C04:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/6.4bpp" - -gUnknown_08514D04:: - .incbin "data/tilesets/secondary/pacifidlog/anim/1/7.4bpp" - - -gTilesetAnims_Pacifidlog1:: @ 8514E04 - .4byte gUnknown_08514604 - .4byte gUnknown_08514704 - .4byte gUnknown_08514804 - .4byte gUnknown_08514904 - .4byte gUnknown_08514A04 - .4byte gUnknown_08514B04 - .4byte gUnknown_08514C04 - .4byte gUnknown_08514D04 - -gUnknown_08514E24:: - .incbin "data/tilesets/secondary/mauville/anim/0/a/0.4bpp" - -gUnknown_08514EA4:: - .incbin "data/tilesets/secondary/mauville/anim/0/a/1.4bpp" - -gUnknown_08514F24:: - .incbin "data/tilesets/secondary/mauville/anim/0/a/2.4bpp" - -gUnknown_08514FA4:: - .incbin "data/tilesets/secondary/mauville/anim/0/a/3.4bpp" - -gUnknown_08515024:: - .incbin "data/tilesets/secondary/mauville/anim/1/a/1.4bpp" - -gUnknown_085150A4:: - .incbin "data/tilesets/secondary/mauville/anim/0/b/0.4bpp" - -gUnknown_08515124:: - .incbin "data/tilesets/secondary/mauville/anim/0/b/1.4bpp" - -gUnknown_085151A4:: - .incbin "data/tilesets/secondary/mauville/anim/0/b/2.4bpp" - -gUnknown_08515224:: - .incbin "data/tilesets/secondary/mauville/anim/0/b/3.4bpp" - -gUnknown_085152A4:: - .incbin "data/tilesets/secondary/mauville/anim/1/b/1.4bpp" - - .space 0x20 - -gTilesetAnims_MauvilleVDests0:: @ 8515344 - .4byte BG_VRAM + 0x4c00 - .4byte BG_VRAM + 0x4c80 - .4byte BG_VRAM + 0x4d00 - .4byte BG_VRAM + 0x4d80 - .4byte BG_VRAM + 0x4e00 - .4byte BG_VRAM + 0x4e80 - .4byte BG_VRAM + 0x4f00 - .4byte BG_VRAM + 0x4f80 - -gTilesetAnims_MauvilleVDests1:: @ 8515364 - .4byte BG_VRAM + 0x5000 - .4byte BG_VRAM + 0x5080 - .4byte BG_VRAM + 0x5100 - .4byte BG_VRAM + 0x5180 - .4byte BG_VRAM + 0x5200 - .4byte BG_VRAM + 0x5280 - .4byte BG_VRAM + 0x5300 - .4byte BG_VRAM + 0x5380 - -gTilesetAnims_Mauville0a:: @ 8515384 - .4byte gUnknown_08514E24 - .4byte gUnknown_08514E24 - .4byte gUnknown_08514EA4 - .4byte gUnknown_08514F24 - .4byte gUnknown_08514FA4 - .4byte gUnknown_08514FA4 - .4byte gUnknown_08514FA4 - .4byte gUnknown_08514FA4 - .4byte gUnknown_08514FA4 - .4byte gUnknown_08514FA4 - .4byte gUnknown_08514F24 - .4byte gUnknown_08514EA4 - -gTilesetAnims_Mauville0b:: @ 85153B4 - .4byte gUnknown_085150A4 - .4byte gUnknown_085150A4 - .4byte gUnknown_08515124 - .4byte gUnknown_085151A4 - .4byte gUnknown_08515224 - .4byte gUnknown_08515224 - .4byte gUnknown_08515224 - .4byte gUnknown_08515224 - .4byte gUnknown_08515224 - .4byte gUnknown_08515224 - .4byte gUnknown_085151A4 - .4byte gUnknown_08515124 - -gTilesetAnims_Mauville1a:: @ 85153E4 - .4byte gUnknown_08514E24 - .4byte gUnknown_08514E24 - .4byte gUnknown_08515024 - .4byte gUnknown_08515024 - -gTilesetAnims_Mauville1b:: @ 85153F4 - .4byte gUnknown_085150A4 - .4byte gUnknown_085150A4 - .4byte gUnknown_085152A4 - .4byte gUnknown_085152A4 - -gUnknown_08515404:: - .incbin "data/tilesets/secondary/rustboro/anim/0/0.4bpp" - -gUnknown_08515484:: - .incbin "data/tilesets/secondary/rustboro/anim/0/1.4bpp" - -gUnknown_08515504:: - .incbin "data/tilesets/secondary/rustboro/anim/0/2.4bpp" - -gUnknown_08515584:: - .incbin "data/tilesets/secondary/rustboro/anim/0/3.4bpp" - -gUnknown_08515604:: - .incbin "data/tilesets/secondary/rustboro/anim/0/4.4bpp" - -gUnknown_08515684:: - .incbin "data/tilesets/secondary/rustboro/anim/0/5.4bpp" - -gUnknown_08515704:: - .incbin "data/tilesets/secondary/rustboro/anim/0/6.4bpp" - -gUnknown_08515784:: - .incbin "data/tilesets/secondary/rustboro/anim/0/7.4bpp" - - -gTilesetAnims_RustboroVDests0:: @ 8515804 - .4byte BG_VRAM + 0x5000 - .4byte BG_VRAM + 0x5080 - .4byte BG_VRAM + 0x5100 - .4byte BG_VRAM + 0x5180 - .4byte BG_VRAM + 0x5200 - .4byte BG_VRAM + 0x5280 - .4byte BG_VRAM + 0x5300 - .4byte BG_VRAM + 0x5380 - -gTilesetAnims_Rustboro0:: @ 8515824 - .4byte gUnknown_08515404 - .4byte gUnknown_08515484 - .4byte gUnknown_08515504 - .4byte gUnknown_08515584 - .4byte gUnknown_08515604 - .4byte gUnknown_08515684 - .4byte gUnknown_08515704 - .4byte gUnknown_08515784 - -gUnknown_08515844:: - .incbin "data/tilesets/secondary/rustboro/anim/1/0.4bpp" - -gUnknown_085158C4:: - .incbin "data/tilesets/secondary/rustboro/anim/1/1.4bpp" - - .space 0x20 - - -gTilesetAnims_Rustboro1:: @ 8515964 - .4byte gUnknown_08515844 - .4byte gUnknown_085158C4 - -gUnknown_0851596C:: - .incbin "data/tilesets/secondary/cave/anim/0.4bpp" - -gUnknown_085159EC:: - .incbin "data/tilesets/secondary/cave/anim/1.4bpp" - -gUnknown_08515A6C:: - .incbin "data/tilesets/secondary/cave/anim/2.4bpp" - -gUnknown_08515AEC:: - .incbin "data/tilesets/secondary/cave/anim/3.4bpp" - -gUnknown_08515B6C:: - .incbin "data/tilesets/secondary/cave/anim/unused/0.4bpp" - -gUnknown_08515BEC:: - .incbin "data/tilesets/secondary/cave/anim/unused/1.4bpp" - -gUnknown_08515C6C:: - .incbin "data/tilesets/secondary/cave/anim/unused/2.4bpp" - -gUnknown_08515CEC:: - .incbin "data/tilesets/secondary/cave/anim/unused/3.4bpp" - - .space 0x20 - - -gTilesetAnims_Lavaridge1_Cave0:: @ 8515D8C - .4byte gUnknown_0851596C - .4byte gUnknown_085159EC - .4byte gUnknown_08515A6C - .4byte gUnknown_08515AEC - -gUnknown_08515D9C:: - .incbin "data/tilesets/secondary/ever_grande/anim/0.4bpp" - -gUnknown_08515E1C:: - .incbin "data/tilesets/secondary/ever_grande/anim/1.4bpp" - -gUnknown_08515E9C:: - .incbin "data/tilesets/secondary/ever_grande/anim/2.4bpp" - -gUnknown_08515F1C:: - .incbin "data/tilesets/secondary/ever_grande/anim/3.4bpp" - -gUnknown_08515F9C:: - .incbin "data/tilesets/secondary/ever_grande/anim/4.4bpp" - -gUnknown_0851601C:: - .incbin "data/tilesets/secondary/ever_grande/anim/5.4bpp" - -gUnknown_0851609C:: - .incbin "data/tilesets/secondary/ever_grande/anim/6.4bpp" - -gUnknown_0851611C:: - .incbin "data/tilesets/secondary/ever_grande/anim/7.4bpp" - - .space 0x20 - - -gTilesetAnims_EverGrandeVDests0:: @ 85161BC - .4byte BG_VRAM + 0x5c00 - .4byte BG_VRAM + 0x5c80 - .4byte BG_VRAM + 0x5d00 - .4byte BG_VRAM + 0x5d80 - .4byte BG_VRAM + 0x5e00 - .4byte BG_VRAM + 0x5e80 - .4byte BG_VRAM + 0x5f00 - .4byte BG_VRAM + 0x5f80 - -gTilesetAnims_EverGrande0:: @ 85161DC - .4byte gUnknown_08515D9C - .4byte gUnknown_08515E1C - .4byte gUnknown_08515E9C - .4byte gUnknown_08515F1C - .4byte gUnknown_08515F9C - .4byte gUnknown_0851601C - .4byte gUnknown_0851609C - .4byte gUnknown_0851611C - -gUnknown_085161FC:: - .incbin "data/tilesets/secondary/dewford/anim/0.4bpp" - -gUnknown_085162BC:: - .incbin "data/tilesets/secondary/dewford/anim/1.4bpp" - -gUnknown_0851637C:: - .incbin "data/tilesets/secondary/dewford/anim/2.4bpp" - -gUnknown_0851643C:: - .incbin "data/tilesets/secondary/dewford/anim/3.4bpp" - - -gTilesetAnims_Dewford0:: @ 85164FC - .4byte gUnknown_085161FC - .4byte gUnknown_085162BC - .4byte gUnknown_0851637C - .4byte gUnknown_0851643C - -gUnknown_0851650C:: - .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp" - -gUnknown_085165CC:: - .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp" - -gUnknown_0851668C:: - .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp" - -gUnknown_0851674C:: - .incbin "data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp" - - -gTilesetAnims_BattleFrontierOutsideWest0:: @ 851680C - .4byte gUnknown_0851650C - .4byte gUnknown_085165CC - .4byte gUnknown_0851668C - .4byte gUnknown_0851674C - -gUnknown_0851681C:: @ 851680C - .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp" - -gUnknown_085168DC:: - .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp" - -gUnknown_0851699C:: - .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp" - -gUnknown_08516A5C:: - .incbin "data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp" - - -gTilesetAnims_BattleFrontierOutsideEast0:: @ 8516B1C - .4byte gUnknown_0851681C - .4byte gUnknown_085168DC - .4byte gUnknown_0851699C - .4byte gUnknown_08516A5C - -gUnknown_08516B2C:: - .incbin "data/tilesets/secondary/slateport/anim/0.4bpp" - -gUnknown_08516BAC:: - .incbin "data/tilesets/secondary/slateport/anim/1.4bpp" - -gUnknown_08516C2C:: - .incbin "data/tilesets/secondary/slateport/anim/2.4bpp" - -gUnknown_08516CAC:: - .incbin "data/tilesets/secondary/slateport/anim/3.4bpp" - - -gTilesetAnims_Slateport0:: @ 8516D2C - .4byte gUnknown_08516B2C - .4byte gUnknown_08516BAC - .4byte gUnknown_08516C2C - .4byte gUnknown_08516CAC - -gUnknown_08516D3C:: - .incbin "data/tilesets/primary/building/anim/0.4bpp" - -gUnknown_08516DBC:: - .incbin "data/tilesets/primary/building/anim/1.4bpp" - - -gTilesetAnims_InsideBuilding0:: @ 8516E3C - .4byte gUnknown_08516D3C - .4byte gUnknown_08516DBC - -gUnknown_08516E44:: - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp" - -gUnknown_08516FC4:: - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp" - -gUnknown_08517144:: - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp" - -gUnknown_085172C4:: - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp" - -gUnknown_08517544:: - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp" - -gUnknown_085177C4:: - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp" - - -gTilesetAnims_SootopolisGym0:: @ 8517A44 - .4byte gUnknown_08516E44 - .4byte gUnknown_08516FC4 - .4byte gUnknown_08517144 - -gTilesetAnims_SootopolisGym1:: @ 8517A50 - .4byte gUnknown_085172C4 - .4byte gUnknown_08517544 - .4byte gUnknown_085177C4 - -gUnknown_08517A5C:: - .incbin "data/tilesets/secondary/elite_four/anim/1/0.4bpp" - -gUnknown_08517ADC:: - .incbin "data/tilesets/secondary/elite_four/anim/1/1.4bpp" - -gUnknown_08517B5C:: - .incbin "data/tilesets/secondary/elite_four/anim/0/0.4bpp" - -gUnknown_08517B7C:: - .incbin "data/tilesets/secondary/elite_four/anim/0/1.4bpp" - -gUnknown_08517B9C:: - .incbin "data/tilesets/secondary/elite_four/anim/0/2.4bpp" - -gUnknown_08517BBC:: - .incbin "data/tilesets/secondary/elite_four/anim/0/3.4bpp" - - .space 0x20 - - -gTilesetAnims_EliteFour1:: @ 8517BFC - .4byte gUnknown_08517B5C - .4byte gUnknown_08517B7C - .4byte gUnknown_08517B9C - .4byte gUnknown_08517BBC - -gTilesetAnims_EliteFour0:: @ 8517C0C - .4byte gUnknown_08517A5C - .4byte gUnknown_08517ADC - -gUnknown_08517C14:: - .incbin "data/tilesets/secondary/mauville_gym/anim/0.4bpp" - -gUnknown_08517E14:: - .incbin "data/tilesets/secondary/mauville_gym/anim/1.4bpp" - - .space 0x20 - - -gTilesetAnims_MauvilleGym0:: @ 8518034 - .4byte gUnknown_08517C14 - .4byte gUnknown_08517E14 - -gUnknown_0851803C:: - .incbin "data/tilesets/secondary/bike_shop/anim/0.4bpp" - -gUnknown_0851815C:: - .incbin "data/tilesets/secondary/bike_shop/anim/1.4bpp" - - .space 0x20 - -gTilesetAnims_BikeShop0:: @ 851829C - .4byte gUnknown_0851803C - .4byte gUnknown_0851815C - -gUnknown_085182A4:: - .incbin "data/tilesets/secondary/sootopolis/anim/0.4bpp" - -gUnknown_08518EA4:: - .incbin "data/tilesets/secondary/sootopolis/anim/1.4bpp" - -gUnknown_08519AA4:: - .incbin "data/tilesets/secondary/sootopolis/anim/2.4bpp" - -gUnknown_0851A6A4:: - .incbin "data/tilesets/secondary/sootopolis/anim/3.4bpp" - -gUnknown_0851B2A4:: - .incbin "data/tilesets/secondary/sootopolis/anim/4.4bpp" - -gUnknown_0851BEA4:: - .incbin "data/tilesets/secondary/sootopolis/anim/5.4bpp" - -gUnknown_0851CAA4:: - .incbin "data/tilesets/secondary/sootopolis/anim/6.4bpp" - -gUnknown_0851D6A4:: - .incbin "data/tilesets/secondary/sootopolis/anim/7.4bpp" - - .space 0x20 - -gUnknown_0851E2C4:: - .incbin "data/tilesets/secondary/unused_1/0.4bpp" - -gUnknown_0851EAC4:: - .incbin "data/tilesets/secondary/unused_1/1.4bpp" - -gUnknown_0851F2C4:: - .incbin "data/tilesets/secondary/unused_1/2.4bpp" - -gUnknown_0851FAC4:: - .incbin "data/tilesets/secondary/unused_1/3.4bpp" - -gTilesetAnims_Sootopolis0:: @ 85202C4 - .4byte gUnknown_085182A4 - .4byte gUnknown_08518EA4 - .4byte gUnknown_08519AA4 - .4byte gUnknown_0851A6A4 - .4byte gUnknown_0851B2A4 - .4byte gUnknown_0851BEA4 - .4byte gUnknown_0851CAA4 - .4byte gUnknown_0851D6A4 - -gUnknown_085202E4:: - .incbin "data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp" - -gUnknown_085203E4:: - .incbin "data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp" - -gUnknown_085204E4:: - .incbin "data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp" - - .space 0x20 - -gUnknown_08520604:: - .incbin "data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp" - -gUnknown_08520704:: - .incbin "data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp" - -gUnknown_08520804:: - .incbin "data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp" - - .space 0x3d00 - -gUnknown_08524604:: - .incbin "data/tilesets/secondary/unused_2/0.4bpp" - - .space 0x1c0 - -gUnknown_08524804:: - .incbin "data/tilesets/secondary/unused_2/1.4bpp" - -gTilesetAnims_BattlePyramid0:: @ 8524864 - .4byte gUnknown_085202E4 - .4byte gUnknown_085203E4 - .4byte gUnknown_085204E4 - -gTilesetAnims_BattlePyramid1:: @ 8524870 - .4byte gUnknown_08520604 - .4byte gUnknown_08520704 - .4byte gUnknown_08520804 - -- cgit v1.2.3