From f316b22f96753c8580d86a8b7957ec69d7bd0c3c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 11 Nov 2019 17:08:21 -0500 Subject: Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata --- data/box_party_pokemon_dropdown.s | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/box_party_pokemon_dropdown.s b/data/box_party_pokemon_dropdown.s index 929aa6ab5..275b53db2 100644 --- a/data/box_party_pokemon_dropdown.s +++ b/data/box_party_pokemon_dropdown.s @@ -7,4 +7,12 @@ .align 2 gUnknown_841F4B4:: @ 841F4B4 - .incbin "baserom.gba", 0x41f4b4, 0x20 + .2byte 0x0100, 0x0100 + .2byte 0x0200, 0x0100 + .2byte 0x0100, 0x0200 + .2byte 0x0200, 0x0200 + + .2byte 0x0080, 0x0080 + .2byte 0x0100, 0x0100 + .2byte 0x0200, 0x0200 + .2byte 0x0400, 0x0400 -- cgit v1.2.3 From 734cbfdb202f366ed39b5304e030478aaa3ea090 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 11 Nov 2019 21:46:57 -0500 Subject: Decomp map_name_popup --- data/item_use.s | 15 --------------- data/map_name_popup.s | 10 ---------- 2 files changed, 25 deletions(-) delete mode 100644 data/item_use.s delete mode 100644 data/map_name_popup.s (limited to 'data') diff --git a/data/item_use.s b/data/item_use.s deleted file mode 100644 index aa78ac919..000000000 --- a/data/item_use.s +++ /dev/null @@ -1,15 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - - .incbin "baserom.gba", 0x3E27B4, 0x1A0 - -gUnknown_83E2954:: @ 83E2954 - .4byte sub_8124C8C - .4byte CB2_ReturnToField - .4byte NULL - .4byte NULL diff --git a/data/map_name_popup.s b/data/map_name_popup.s deleted file mode 100644 index 6509df895..000000000 --- a/data/map_name_popup.s +++ /dev/null @@ -1,10 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83D4164:: @ 83D4164 - .incbin "baserom.gba", 0x3D4164, 0x8 -- cgit v1.2.3 From 3cbc3121304a0dfb34566a16b828dda96c474700 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 11:21:49 -0500 Subject: Dump field_door data; start field_door decomp --- data/field_door.s | 539 ++++++++++++++++++++++++++++++++++++++++++++++- data/metatile_behavior.s | 6 - 2 files changed, 534 insertions(+), 11 deletions(-) delete mode 100644 data/metatile_behavior.s (limited to 'data') diff --git a/data/field_door.s b/data/field_door.s index a29cf3e24..be76e845d 100644 --- a/data/field_door.s +++ b/data/field_door.s @@ -1,17 +1,546 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata + .align 2, 0 + +gUnknown_8353088:: @ 8353088 + .incbin "graphics/door_anims/frame_8353088_1.4bpp" + .incbin "graphics/door_anims/frame_8353088_2.4bpp" + .incbin "graphics/door_anims/frame_8353088_3.4bpp" + .space 32 + +gUnknown_8353228:: @ 8353228 + .incbin "graphics/door_anims/frame_8353228_1.4bpp" + .incbin "graphics/door_anims/frame_8353228_2.4bpp" + .incbin "graphics/door_anims/frame_8353228_3.4bpp" + .space 32 + +gUnknown_83533C8:: @ 83533C8 + .incbin "graphics/door_anims/frame_83533C8_1.4bpp" + .incbin "graphics/door_anims/frame_83533C8_2.4bpp" + .incbin "graphics/door_anims/frame_83533C8_3.4bpp" + .space 32 + +gUnknown_8353568:: @ 8353568 + .incbin "graphics/door_anims/frame_8353568_1.4bpp" + .incbin "graphics/door_anims/frame_8353568_2.4bpp" + .incbin "graphics/door_anims/frame_8353568_3.4bpp" + .space 32 + +gUnknown_8353708:: @ 8353708 + .incbin "graphics/door_anims/frame_8353708_1.4bpp" + .incbin "graphics/door_anims/frame_8353708_2.4bpp" + .incbin "graphics/door_anims/frame_8353708_3.4bpp" + .space 32 + +gUnknown_83538A8:: @ 83538A8 + .incbin "graphics/door_anims/frame_83538A8_1.4bpp" + .incbin "graphics/door_anims/frame_83538A8_2.4bpp" + .incbin "graphics/door_anims/frame_83538A8_3.4bpp" + .space 32 + +gUnknown_8353A48:: @ 8353A48 + .incbin "graphics/door_anims/frame_8353A48_1.4bpp" + .incbin "graphics/door_anims/frame_8353A48_2.4bpp" + .incbin "graphics/door_anims/frame_8353A48_3.4bpp" + .space 32 + +gUnknown_8353BE8:: @ 8353BE8 + .incbin "graphics/door_anims/frame_8353BE8_1.4bpp" + .incbin "graphics/door_anims/frame_8353BE8_2.4bpp" + .incbin "graphics/door_anims/frame_8353BE8_3.4bpp" + .space 32 + +gUnknown_8353D88:: @ 8353D88 + .incbin "graphics/door_anims/frame_8353D88_1.4bpp" + .incbin "graphics/door_anims/frame_8353D88_2.4bpp" + .incbin "graphics/door_anims/frame_8353D88_3.4bpp" + .space 32 + +gUnknown_8353F28:: @ 8353F28 + .incbin "graphics/door_anims/frame_8353F28_1.4bpp" + .incbin "graphics/door_anims/frame_8353F28_2.4bpp" + .incbin "graphics/door_anims/frame_8353F28_3.4bpp" + .space 32 + +gUnknown_83540C8:: @ 83540C8 + .incbin "graphics/door_anims/frame_83540C8_1.4bpp" + .incbin "graphics/door_anims/frame_83540C8_2.4bpp" + .incbin "graphics/door_anims/frame_83540C8_3.4bpp" + .space 32 + +gUnknown_8354268:: @ 8354268 + .incbin "graphics/door_anims/frame_8354268_1.4bpp" + .incbin "graphics/door_anims/frame_8354268_2.4bpp" + .incbin "graphics/door_anims/frame_8354268_3.4bpp" + .space 32 + +gUnknown_8354408:: @ 8354408 + .incbin "graphics/door_anims/frame_8354408_1.4bpp" + .incbin "graphics/door_anims/frame_8354408_2.4bpp" + .incbin "graphics/door_anims/frame_8354408_3.4bpp" + .space 32 + +gUnknown_83545A8:: @ 83545A8 + .incbin "graphics/door_anims/frame_83545A8_1.4bpp" + .incbin "graphics/door_anims/frame_83545A8_2.4bpp" + .incbin "graphics/door_anims/frame_83545A8_3.4bpp" + .space 32 + +gUnknown_8354748:: @ 8354748 + .incbin "graphics/door_anims/frame_8354748_1.4bpp" + .incbin "graphics/door_anims/frame_8354748_2.4bpp" + .incbin "graphics/door_anims/frame_8354748_3.4bpp" + .space 32 + +gUnknown_83548E8:: @ 83548E8 + .incbin "graphics/door_anims/frame_83548E8_1.4bpp" + .incbin "graphics/door_anims/frame_83548E8_2.4bpp" + .incbin "graphics/door_anims/frame_83548E8_3.4bpp" + .space 32 + +gUnknown_8354A88:: @ 8354A88 + .incbin "graphics/door_anims/frame_8354A88_1.4bpp" + .incbin "graphics/door_anims/frame_8354A88_2.4bpp" + .incbin "graphics/door_anims/frame_8354A88_3.4bpp" + .space 32 + +gUnknown_8354C28:: @ 8354C28 + .incbin "graphics/door_anims/frame_8354C28_1.4bpp" + .incbin "graphics/door_anims/frame_8354C28_2.4bpp" + .incbin "graphics/door_anims/frame_8354C28_3.4bpp" + .space 32 + +gUnknown_8354F48:: @ 8354F48 + .incbin "graphics/door_anims/frame_8354F48_1.4bpp" + .incbin "graphics/door_anims/frame_8354F48_2.4bpp" + .incbin "graphics/door_anims/frame_8354F48_3.4bpp" + .space 32 + +gUnknown_8355268:: @ 8355268 + .incbin "graphics/door_anims/frame_8355268_1.4bpp" + .incbin "graphics/door_anims/frame_8355268_2.4bpp" + .incbin "graphics/door_anims/frame_8355268_3.4bpp" + .space 32 + +gUnknown_8355588:: @ 8355588 + .incbin "graphics/door_anims/frame_8355588_1.4bpp" + .incbin "graphics/door_anims/frame_8355588_2.4bpp" + .incbin "graphics/door_anims/frame_8355588_3.4bpp" + .space 32 + +gUnknown_83558A8:: + .space 0x320 + .space 0x320 + .space 0x320 + .space 0x320 + .space 0x320 + .space 0x320 + .space 0x320 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .space 0x1A0 + .incbin "graphics/door_anims/frame_8359588_1.4bpp" + .incbin "graphics/door_anims/frame_8359588_2.4bpp" + .space 0x100 + .incbin "graphics/door_anims/frame_8359788_1.4bpp" + .incbin "graphics/door_anims/frame_8359788_2.4bpp" + .incbin "graphics/door_anims/frame_8359788_3.4bpp" + .incbin "graphics/door_anims/frame_8359788_4.4bpp" + .space 0x100 + .incbin "graphics/door_anims/frame_8359988_1.4bpp" + .incbin "graphics/door_anims/frame_8359988_2.4bpp" + .incbin "graphics/door_anims/frame_8359988_3.4bpp" + .incbin "graphics/door_anims/frame_8359988_4.4bpp" + .space 0x100 + .incbin "graphics/door_anims/frame_8359B88_1.4bpp" + .incbin "graphics/door_anims/frame_8359B88_2.4bpp" + .incbin "graphics/door_anims/frame_8359B88_3.4bpp" + .incbin "graphics/door_anims/frame_8359B88_4.4bpp" + .space 0x20 + +gUnknown_8359CA8:: @ 8359CA8 + .incbin "graphics/door_anims/frame_8359CA8_1.4bpp" + .incbin "graphics/door_anims/frame_8359CA8_2.4bpp" + .incbin "graphics/door_anims/frame_8359CA8_3.4bpp" + .space 32 + +gUnknown_8359FC8:: @ 8359FC8 + .incbin "graphics/door_anims/frame_8359FC8_1.4bpp" + .incbin "graphics/door_anims/frame_8359FC8_2.4bpp" + .incbin "graphics/door_anims/frame_8359FC8_3.4bpp" + .space 32 + +gUnknown_835A168:: @ 835A168 + .incbin "graphics/door_anims/frame_835A168_1.4bpp" + .incbin "graphics/door_anims/frame_835A168_2.4bpp" + .incbin "graphics/door_anims/frame_835A168_3.4bpp" + .space 32 + +gUnknown_835A308:: @ 835A308 + .incbin "graphics/door_anims/frame_835A308_1.4bpp" + .incbin "graphics/door_anims/frame_835A308_2.4bpp" + .incbin "graphics/door_anims/frame_835A308_3.4bpp" + .space 32 + +gUnknown_835A4A8:: @ 835A4A8 + .incbin "graphics/door_anims/frame_835A4A8_1.4bpp" + .incbin "graphics/door_anims/frame_835A4A8_2.4bpp" + .incbin "graphics/door_anims/frame_835A4A8_3.4bpp" + .space 32 + +gUnknown_835A648:: @ 835A648 + .incbin "graphics/door_anims/frame_835A648_1.4bpp" + .incbin "graphics/door_anims/frame_835A648_2.4bpp" + .incbin "graphics/door_anims/frame_835A648_3.4bpp" + .space 32 + +gUnknown_835A7E8:: @ 835A7E8 + .incbin "graphics/door_anims/frame_835A7E8_1.4bpp" + .incbin "graphics/door_anims/frame_835A7E8_2.4bpp" + .incbin "graphics/door_anims/frame_835A7E8_3.4bpp" + .space 32 + +gUnknown_835A988:: @ 835A988 + .incbin "graphics/door_anims/frame_835A988_1.4bpp" + .incbin "graphics/door_anims/frame_835A988_2.4bpp" + .incbin "graphics/door_anims/frame_835A988_3.4bpp" + .space 32 + +gUnknown_835AB28:: @ 835AB28 + .incbin "graphics/door_anims/frame_835AB28_1.4bpp" + .incbin "graphics/door_anims/frame_835AB28_2.4bpp" + .incbin "graphics/door_anims/frame_835AB28_3.4bpp" + .space 32 + +gUnknown_835AE48:: @ 835AE48 + .incbin "graphics/door_anims/frame_835AE48_1.4bpp" + .incbin "graphics/door_anims/frame_835AE48_2.4bpp" + .incbin "graphics/door_anims/frame_835AE48_3.4bpp" + .space 32 + +gUnknown_835B168:: @ 835B168 + .incbin "graphics/door_anims/frame_835B168_1.4bpp" + .incbin "graphics/door_anims/frame_835B168_2.4bpp" + .incbin "graphics/door_anims/frame_835B168_3.4bpp" + .space 32 .align 2 gUnknown_835B488:: @ 835B488 - .incbin "baserom.gba", 0x35B488, 0x14 + .byte 0x04 + .align 1 + .2byte 0xffff + .byte 0x04 + .align 1 + .2byte 0x0000 + .byte 0x04 + .align 1 + .2byte 0x0080 + .byte 0x04 + .align 1 + .2byte 0x0100 + .byte 0x00 + .align 1 + .2byte 0x0000 gUnknown_835B49C:: @ 835B49C - .incbin "baserom.gba", 0x35B49C, 0x14 + .byte 0x04 + .align 1 + .2byte 0xffff + .byte 0x04 + .align 1 + .2byte 0x0000 + .byte 0x04 + .align 1 + .2byte 0x0100 + .byte 0x04 + .align 1 + .2byte 0x0200 + .byte 0x00 + .align 1 + .2byte 0x0000 gUnknown_835B4B0:: @ 835B4B0 - .incbin "baserom.gba", 0x35B4B0, 0x14 + .byte 0x04 + .align 1 + .2byte 0x0100 + .byte 0x04 + .align 1 + .2byte 0x0080 + .byte 0x04 + .align 1 + .2byte 0x0000 + .byte 0x04 + .align 1 + .2byte 0xffff + .byte 0x00 + .align 1 + .2byte 0x0000 gUnknown_835B4C4:: @ 835B4C4 - .incbin "baserom.gba", 0x35B4C4, 0x114 + .byte 0x04 + .align 1 + .2byte 0x0200 + .byte 0x04 + .align 1 + .2byte 0x0100 + .byte 0x04 + .align 1 + .2byte 0x0000 + .byte 0x04 + .align 1 + .2byte 0xffff + .byte 0x00 + .align 1 + .2byte 0x0000 + +gUnknown_835B4D8:: @ 835B4D8 + .byte 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 + +gUnknown_835B4E0:: @ 835B4E0 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B4E8:: @ 835B4E8 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B4F0:: @ 835B4F0 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B4F8:: @ 835B4F8 + .byte 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa + +gUnknown_835B500:: @ 835B500 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B508:: @ 835B508 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B510:: @ 835B510 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B518:: @ 835B518 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B520:: @ 835B520 + .byte 0xc, 0xc, 0xc, 0xc, 0xc, 0xc, 0xc, 0xc + +gUnknown_835B528:: @ 835B528 + .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 + +gUnknown_835B530:: @ 835B530 + .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 + +gUnknown_835B538:: @ 835B538 + .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 + +gUnknown_835B540:: @ 835B540 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B548:: @ 835B548 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B550:: @ 835B550 + .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 + +gUnknown_835B558:: @ 835B558 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B560:: @ 835B560 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B568:: @ 835B568 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B570:: @ 835B570 + .byte 0xc, 0xc, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 + +gUnknown_835B578:: @ 835B578 + .byte 0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0x7 + +gUnknown_835B580:: @ 835B580 + .byte 0x8, 0x8, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 + +gUnknown_835B588:: @ 835B588 + .byte 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5 + +gUnknown_835B590:: @ 835B590 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B598:: @ 835B598 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B5A0:: @ 835B5A0 + .byte 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5 + +gUnknown_835B5A8:: @ 835B5A8 + .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 + +gUnknown_835B5B0:: @ 835B5B0 + .byte 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa + +gUnknown_835B5B8:: @ 835B5B8 + .byte 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5 + +gUnknown_835B5C0:: @ 835B5C0 + .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 + +gUnknown_835B5C8:: @ 835B5C8 + .byte 0x8, 0x8, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 + +gUnknown_835B5D0:: @ 835B5D0 + .byte 0xb, 0xb, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 gUnknown_835B5D8:: @ 835B5D8 - .incbin "baserom.gba", 0x35B5D8, 0x18C + .2byte 0x003d + .byte 0x00, 0x00 + .4byte gUnknown_8353088 + .4byte gUnknown_835B4D8 + .2byte 0x0062 + .byte 0x01, 0x00 + .4byte gUnknown_8353228 + .4byte gUnknown_835B4E0 + .2byte 0x015b + .byte 0x01, 0x00 + .4byte gUnknown_83533C8 + .4byte gUnknown_835B4E8 + .2byte 0x02a3 + .byte 0x00, 0x00 + .4byte gUnknown_8353568 + .4byte gUnknown_835B4F0 + .2byte 0x02ac + .byte 0x00, 0x00 + .4byte gUnknown_8353708 + .4byte gUnknown_835B4F8 + .2byte 0x0299 + .byte 0x00, 0x00 + .4byte gUnknown_83538A8 + .4byte gUnknown_835B500 + .2byte 0x02ce + .byte 0x00, 0x00 + .4byte gUnknown_8353A48 + .4byte gUnknown_835B508 + .2byte 0x0284 + .byte 0x00, 0x00 + .4byte gUnknown_8353BE8 + .4byte gUnknown_835B510 + .2byte 0x02bc + .byte 0x01, 0x00 + .4byte gUnknown_8353D88 + .4byte gUnknown_835B518 + .2byte 0x0298 + .byte 0x00, 0x00 + .4byte gUnknown_8353F28 + .4byte gUnknown_835B520 + .2byte 0x02a2 + .byte 0x00, 0x00 + .4byte gUnknown_83540C8 + .4byte gUnknown_835B528 + .2byte 0x029e + .byte 0x00, 0x00 + .4byte gUnknown_8354268 + .4byte gUnknown_835B530 + .2byte 0x02e1 + .byte 0x00, 0x00 + .4byte gUnknown_8354408 + .4byte gUnknown_835B538 + .2byte 0x0294 + .byte 0x01, 0x00 + .4byte gUnknown_83545A8 + .4byte gUnknown_835B540 + .2byte 0x02bf + .byte 0x00, 0x00 + .4byte gUnknown_8354748 + .4byte gUnknown_835B548 + .2byte 0x02d2 + .byte 0x01, 0x00 + .4byte gUnknown_83548E8 + .4byte gUnknown_835B550 + .2byte 0x02ad + .byte 0x00, 0x00 + .4byte gUnknown_8354A88 + .4byte gUnknown_835B558 + .2byte 0x0297 + .byte 0x00, 0x00 + .4byte gUnknown_8359FC8 + .4byte gUnknown_835B588 + .2byte 0x029b + .byte 0x01, 0x00 + .4byte gUnknown_835A168 + .4byte gUnknown_835B590 + .2byte 0x02eb + .byte 0x00, 0x00 + .4byte gUnknown_835A308 + .4byte gUnknown_835B598 + .2byte 0x029a + .byte 0x00, 0x00 + .4byte gUnknown_835A4A8 + .4byte gUnknown_835B5A0 + .2byte 0x02b9 + .byte 0x00, 0x00 + .4byte gUnknown_835A648 + .4byte gUnknown_835B5A8 + .2byte 0x02af + .byte 0x00, 0x00 + .4byte gUnknown_835A7E8 + .4byte gUnknown_835B5B0 + .2byte 0x030c + .byte 0x00, 0x00 + .4byte gUnknown_835A988 + .4byte gUnknown_835B5B8 + .2byte 0x028d + .byte 0x01, 0x01 + .4byte gUnknown_8354C28 + .4byte gUnknown_835B560 + .2byte 0x02de + .byte 0x01, 0x01 + .4byte gUnknown_8354F48 + .4byte gUnknown_835B568 + .2byte 0x02ab + .byte 0x01, 0x01 + .4byte gUnknown_8355268 + .4byte gUnknown_835B570 + .2byte 0x0281 + .byte 0x00, 0x01 + .4byte gUnknown_8355588 + .4byte gUnknown_835B578 + .2byte 0x02e2 + .byte 0x01, 0x01 + .4byte gUnknown_8359CA8 + .4byte gUnknown_835B580 + .2byte 0x0296 + .byte 0x01, 0x01 + .4byte gUnknown_835AB28 + .4byte gUnknown_835B5C0 + .2byte 0x02c3 + .byte 0x01, 0x01 + .4byte gUnknown_835AE48 + .4byte gUnknown_835B5C8 + .2byte 0x0356 + .byte 0x01, 0x01 + .4byte gUnknown_835B168 + .4byte gUnknown_835B5D0 + .2byte 0x0000 + .byte 0x00, 0x00 + .4byte 0x00000000 + .4byte 0x00000000 diff --git a/data/metatile_behavior.s b/data/metatile_behavior.s deleted file mode 100644 index 64d88840d..000000000 --- a/data/metatile_behavior.s +++ /dev/null @@ -1,6 +0,0 @@ - .section .rodata - - .align 2 - -gUnknown_8353068:: @ 8353068 - .incbin "baserom.gba", 0x353068, 0x8420 -- cgit v1.2.3 From 4c61bead05968e0404ea074bed4da5edb2645b90 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 13:53:47 -0500 Subject: Document field_door code --- data/field_door.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/field_door.s b/data/field_door.s index be76e845d..c26398742 100644 --- a/data/field_door.s +++ b/data/field_door.s @@ -247,7 +247,7 @@ gUnknown_835B168:: @ 835B168 .space 32 .align 2 -gUnknown_835B488:: @ 835B488 +sDoorAnimFrames_OpenSmall:: @ 835B488 .byte 0x04 .align 1 .2byte 0xffff @@ -264,7 +264,7 @@ gUnknown_835B488:: @ 835B488 .align 1 .2byte 0x0000 -gUnknown_835B49C:: @ 835B49C +sDoorAnimFrames_OpenLarge:: @ 835B49C .byte 0x04 .align 1 .2byte 0xffff @@ -281,7 +281,7 @@ gUnknown_835B49C:: @ 835B49C .align 1 .2byte 0x0000 -gUnknown_835B4B0:: @ 835B4B0 +sDoorAnimFrames_CloseSmall:: @ 835B4B0 .byte 0x04 .align 1 .2byte 0x0100 @@ -298,7 +298,7 @@ gUnknown_835B4B0:: @ 835B4B0 .align 1 .2byte 0x0000 -gUnknown_835B4C4:: @ 835B4C4 +sDoorAnimFrames_CloseLarge:: @ 835B4C4 .byte 0x04 .align 1 .2byte 0x0200 @@ -411,7 +411,7 @@ gUnknown_835B5C8:: @ 835B5C8 gUnknown_835B5D0:: @ 835B5D0 .byte 0xb, 0xb, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 -gUnknown_835B5D8:: @ 835B5D8 +sDoorGraphics:: @ 835B5D8 .2byte 0x003d .byte 0x00, 0x00 .4byte gUnknown_8353088 -- cgit v1.2.3 From e2005e194dee022b422e07c0f8efeeea490e55e0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 14:34:14 -0500 Subject: Port field_door data to C --- data/field_door.s | 546 ------------------------------------------------------ 1 file changed, 546 deletions(-) delete mode 100644 data/field_door.s (limited to 'data') diff --git a/data/field_door.s b/data/field_door.s deleted file mode 100644 index c26398742..000000000 --- a/data/field_door.s +++ /dev/null @@ -1,546 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2, 0 - -gUnknown_8353088:: @ 8353088 - .incbin "graphics/door_anims/frame_8353088_1.4bpp" - .incbin "graphics/door_anims/frame_8353088_2.4bpp" - .incbin "graphics/door_anims/frame_8353088_3.4bpp" - .space 32 - -gUnknown_8353228:: @ 8353228 - .incbin "graphics/door_anims/frame_8353228_1.4bpp" - .incbin "graphics/door_anims/frame_8353228_2.4bpp" - .incbin "graphics/door_anims/frame_8353228_3.4bpp" - .space 32 - -gUnknown_83533C8:: @ 83533C8 - .incbin "graphics/door_anims/frame_83533C8_1.4bpp" - .incbin "graphics/door_anims/frame_83533C8_2.4bpp" - .incbin "graphics/door_anims/frame_83533C8_3.4bpp" - .space 32 - -gUnknown_8353568:: @ 8353568 - .incbin "graphics/door_anims/frame_8353568_1.4bpp" - .incbin "graphics/door_anims/frame_8353568_2.4bpp" - .incbin "graphics/door_anims/frame_8353568_3.4bpp" - .space 32 - -gUnknown_8353708:: @ 8353708 - .incbin "graphics/door_anims/frame_8353708_1.4bpp" - .incbin "graphics/door_anims/frame_8353708_2.4bpp" - .incbin "graphics/door_anims/frame_8353708_3.4bpp" - .space 32 - -gUnknown_83538A8:: @ 83538A8 - .incbin "graphics/door_anims/frame_83538A8_1.4bpp" - .incbin "graphics/door_anims/frame_83538A8_2.4bpp" - .incbin "graphics/door_anims/frame_83538A8_3.4bpp" - .space 32 - -gUnknown_8353A48:: @ 8353A48 - .incbin "graphics/door_anims/frame_8353A48_1.4bpp" - .incbin "graphics/door_anims/frame_8353A48_2.4bpp" - .incbin "graphics/door_anims/frame_8353A48_3.4bpp" - .space 32 - -gUnknown_8353BE8:: @ 8353BE8 - .incbin "graphics/door_anims/frame_8353BE8_1.4bpp" - .incbin "graphics/door_anims/frame_8353BE8_2.4bpp" - .incbin "graphics/door_anims/frame_8353BE8_3.4bpp" - .space 32 - -gUnknown_8353D88:: @ 8353D88 - .incbin "graphics/door_anims/frame_8353D88_1.4bpp" - .incbin "graphics/door_anims/frame_8353D88_2.4bpp" - .incbin "graphics/door_anims/frame_8353D88_3.4bpp" - .space 32 - -gUnknown_8353F28:: @ 8353F28 - .incbin "graphics/door_anims/frame_8353F28_1.4bpp" - .incbin "graphics/door_anims/frame_8353F28_2.4bpp" - .incbin "graphics/door_anims/frame_8353F28_3.4bpp" - .space 32 - -gUnknown_83540C8:: @ 83540C8 - .incbin "graphics/door_anims/frame_83540C8_1.4bpp" - .incbin "graphics/door_anims/frame_83540C8_2.4bpp" - .incbin "graphics/door_anims/frame_83540C8_3.4bpp" - .space 32 - -gUnknown_8354268:: @ 8354268 - .incbin "graphics/door_anims/frame_8354268_1.4bpp" - .incbin "graphics/door_anims/frame_8354268_2.4bpp" - .incbin "graphics/door_anims/frame_8354268_3.4bpp" - .space 32 - -gUnknown_8354408:: @ 8354408 - .incbin "graphics/door_anims/frame_8354408_1.4bpp" - .incbin "graphics/door_anims/frame_8354408_2.4bpp" - .incbin "graphics/door_anims/frame_8354408_3.4bpp" - .space 32 - -gUnknown_83545A8:: @ 83545A8 - .incbin "graphics/door_anims/frame_83545A8_1.4bpp" - .incbin "graphics/door_anims/frame_83545A8_2.4bpp" - .incbin "graphics/door_anims/frame_83545A8_3.4bpp" - .space 32 - -gUnknown_8354748:: @ 8354748 - .incbin "graphics/door_anims/frame_8354748_1.4bpp" - .incbin "graphics/door_anims/frame_8354748_2.4bpp" - .incbin "graphics/door_anims/frame_8354748_3.4bpp" - .space 32 - -gUnknown_83548E8:: @ 83548E8 - .incbin "graphics/door_anims/frame_83548E8_1.4bpp" - .incbin "graphics/door_anims/frame_83548E8_2.4bpp" - .incbin "graphics/door_anims/frame_83548E8_3.4bpp" - .space 32 - -gUnknown_8354A88:: @ 8354A88 - .incbin "graphics/door_anims/frame_8354A88_1.4bpp" - .incbin "graphics/door_anims/frame_8354A88_2.4bpp" - .incbin "graphics/door_anims/frame_8354A88_3.4bpp" - .space 32 - -gUnknown_8354C28:: @ 8354C28 - .incbin "graphics/door_anims/frame_8354C28_1.4bpp" - .incbin "graphics/door_anims/frame_8354C28_2.4bpp" - .incbin "graphics/door_anims/frame_8354C28_3.4bpp" - .space 32 - -gUnknown_8354F48:: @ 8354F48 - .incbin "graphics/door_anims/frame_8354F48_1.4bpp" - .incbin "graphics/door_anims/frame_8354F48_2.4bpp" - .incbin "graphics/door_anims/frame_8354F48_3.4bpp" - .space 32 - -gUnknown_8355268:: @ 8355268 - .incbin "graphics/door_anims/frame_8355268_1.4bpp" - .incbin "graphics/door_anims/frame_8355268_2.4bpp" - .incbin "graphics/door_anims/frame_8355268_3.4bpp" - .space 32 - -gUnknown_8355588:: @ 8355588 - .incbin "graphics/door_anims/frame_8355588_1.4bpp" - .incbin "graphics/door_anims/frame_8355588_2.4bpp" - .incbin "graphics/door_anims/frame_8355588_3.4bpp" - .space 32 - -gUnknown_83558A8:: - .space 0x320 - .space 0x320 - .space 0x320 - .space 0x320 - .space 0x320 - .space 0x320 - .space 0x320 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .space 0x1A0 - .incbin "graphics/door_anims/frame_8359588_1.4bpp" - .incbin "graphics/door_anims/frame_8359588_2.4bpp" - .space 0x100 - .incbin "graphics/door_anims/frame_8359788_1.4bpp" - .incbin "graphics/door_anims/frame_8359788_2.4bpp" - .incbin "graphics/door_anims/frame_8359788_3.4bpp" - .incbin "graphics/door_anims/frame_8359788_4.4bpp" - .space 0x100 - .incbin "graphics/door_anims/frame_8359988_1.4bpp" - .incbin "graphics/door_anims/frame_8359988_2.4bpp" - .incbin "graphics/door_anims/frame_8359988_3.4bpp" - .incbin "graphics/door_anims/frame_8359988_4.4bpp" - .space 0x100 - .incbin "graphics/door_anims/frame_8359B88_1.4bpp" - .incbin "graphics/door_anims/frame_8359B88_2.4bpp" - .incbin "graphics/door_anims/frame_8359B88_3.4bpp" - .incbin "graphics/door_anims/frame_8359B88_4.4bpp" - .space 0x20 - -gUnknown_8359CA8:: @ 8359CA8 - .incbin "graphics/door_anims/frame_8359CA8_1.4bpp" - .incbin "graphics/door_anims/frame_8359CA8_2.4bpp" - .incbin "graphics/door_anims/frame_8359CA8_3.4bpp" - .space 32 - -gUnknown_8359FC8:: @ 8359FC8 - .incbin "graphics/door_anims/frame_8359FC8_1.4bpp" - .incbin "graphics/door_anims/frame_8359FC8_2.4bpp" - .incbin "graphics/door_anims/frame_8359FC8_3.4bpp" - .space 32 - -gUnknown_835A168:: @ 835A168 - .incbin "graphics/door_anims/frame_835A168_1.4bpp" - .incbin "graphics/door_anims/frame_835A168_2.4bpp" - .incbin "graphics/door_anims/frame_835A168_3.4bpp" - .space 32 - -gUnknown_835A308:: @ 835A308 - .incbin "graphics/door_anims/frame_835A308_1.4bpp" - .incbin "graphics/door_anims/frame_835A308_2.4bpp" - .incbin "graphics/door_anims/frame_835A308_3.4bpp" - .space 32 - -gUnknown_835A4A8:: @ 835A4A8 - .incbin "graphics/door_anims/frame_835A4A8_1.4bpp" - .incbin "graphics/door_anims/frame_835A4A8_2.4bpp" - .incbin "graphics/door_anims/frame_835A4A8_3.4bpp" - .space 32 - -gUnknown_835A648:: @ 835A648 - .incbin "graphics/door_anims/frame_835A648_1.4bpp" - .incbin "graphics/door_anims/frame_835A648_2.4bpp" - .incbin "graphics/door_anims/frame_835A648_3.4bpp" - .space 32 - -gUnknown_835A7E8:: @ 835A7E8 - .incbin "graphics/door_anims/frame_835A7E8_1.4bpp" - .incbin "graphics/door_anims/frame_835A7E8_2.4bpp" - .incbin "graphics/door_anims/frame_835A7E8_3.4bpp" - .space 32 - -gUnknown_835A988:: @ 835A988 - .incbin "graphics/door_anims/frame_835A988_1.4bpp" - .incbin "graphics/door_anims/frame_835A988_2.4bpp" - .incbin "graphics/door_anims/frame_835A988_3.4bpp" - .space 32 - -gUnknown_835AB28:: @ 835AB28 - .incbin "graphics/door_anims/frame_835AB28_1.4bpp" - .incbin "graphics/door_anims/frame_835AB28_2.4bpp" - .incbin "graphics/door_anims/frame_835AB28_3.4bpp" - .space 32 - -gUnknown_835AE48:: @ 835AE48 - .incbin "graphics/door_anims/frame_835AE48_1.4bpp" - .incbin "graphics/door_anims/frame_835AE48_2.4bpp" - .incbin "graphics/door_anims/frame_835AE48_3.4bpp" - .space 32 - -gUnknown_835B168:: @ 835B168 - .incbin "graphics/door_anims/frame_835B168_1.4bpp" - .incbin "graphics/door_anims/frame_835B168_2.4bpp" - .incbin "graphics/door_anims/frame_835B168_3.4bpp" - .space 32 - - .align 2 -sDoorAnimFrames_OpenSmall:: @ 835B488 - .byte 0x04 - .align 1 - .2byte 0xffff - .byte 0x04 - .align 1 - .2byte 0x0000 - .byte 0x04 - .align 1 - .2byte 0x0080 - .byte 0x04 - .align 1 - .2byte 0x0100 - .byte 0x00 - .align 1 - .2byte 0x0000 - -sDoorAnimFrames_OpenLarge:: @ 835B49C - .byte 0x04 - .align 1 - .2byte 0xffff - .byte 0x04 - .align 1 - .2byte 0x0000 - .byte 0x04 - .align 1 - .2byte 0x0100 - .byte 0x04 - .align 1 - .2byte 0x0200 - .byte 0x00 - .align 1 - .2byte 0x0000 - -sDoorAnimFrames_CloseSmall:: @ 835B4B0 - .byte 0x04 - .align 1 - .2byte 0x0100 - .byte 0x04 - .align 1 - .2byte 0x0080 - .byte 0x04 - .align 1 - .2byte 0x0000 - .byte 0x04 - .align 1 - .2byte 0xffff - .byte 0x00 - .align 1 - .2byte 0x0000 - -sDoorAnimFrames_CloseLarge:: @ 835B4C4 - .byte 0x04 - .align 1 - .2byte 0x0200 - .byte 0x04 - .align 1 - .2byte 0x0100 - .byte 0x04 - .align 1 - .2byte 0x0000 - .byte 0x04 - .align 1 - .2byte 0xffff - .byte 0x00 - .align 1 - .2byte 0x0000 - -gUnknown_835B4D8:: @ 835B4D8 - .byte 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 - -gUnknown_835B4E0:: @ 835B4E0 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B4E8:: @ 835B4E8 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B4F0:: @ 835B4F0 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B4F8:: @ 835B4F8 - .byte 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa - -gUnknown_835B500:: @ 835B500 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B508:: @ 835B508 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B510:: @ 835B510 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B518:: @ 835B518 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B520:: @ 835B520 - .byte 0xc, 0xc, 0xc, 0xc, 0xc, 0xc, 0xc, 0xc - -gUnknown_835B528:: @ 835B528 - .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 - -gUnknown_835B530:: @ 835B530 - .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 - -gUnknown_835B538:: @ 835B538 - .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 - -gUnknown_835B540:: @ 835B540 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B548:: @ 835B548 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B550:: @ 835B550 - .byte 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9, 0x9 - -gUnknown_835B558:: @ 835B558 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B560:: @ 835B560 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B568:: @ 835B568 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B570:: @ 835B570 - .byte 0xc, 0xc, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 - -gUnknown_835B578:: @ 835B578 - .byte 0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0x7 - -gUnknown_835B580:: @ 835B580 - .byte 0x8, 0x8, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 - -gUnknown_835B588:: @ 835B588 - .byte 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5 - -gUnknown_835B590:: @ 835B590 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B598:: @ 835B598 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B5A0:: @ 835B5A0 - .byte 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5 - -gUnknown_835B5A8:: @ 835B5A8 - .byte 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3 - -gUnknown_835B5B0:: @ 835B5B0 - .byte 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa, 0xa - -gUnknown_835B5B8:: @ 835B5B8 - .byte 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5, 0x5 - -gUnknown_835B5C0:: @ 835B5C0 - .byte 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8 - -gUnknown_835B5C8:: @ 835B5C8 - .byte 0x8, 0x8, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 - -gUnknown_835B5D0:: @ 835B5D0 - .byte 0xb, 0xb, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2 - -sDoorGraphics:: @ 835B5D8 - .2byte 0x003d - .byte 0x00, 0x00 - .4byte gUnknown_8353088 - .4byte gUnknown_835B4D8 - .2byte 0x0062 - .byte 0x01, 0x00 - .4byte gUnknown_8353228 - .4byte gUnknown_835B4E0 - .2byte 0x015b - .byte 0x01, 0x00 - .4byte gUnknown_83533C8 - .4byte gUnknown_835B4E8 - .2byte 0x02a3 - .byte 0x00, 0x00 - .4byte gUnknown_8353568 - .4byte gUnknown_835B4F0 - .2byte 0x02ac - .byte 0x00, 0x00 - .4byte gUnknown_8353708 - .4byte gUnknown_835B4F8 - .2byte 0x0299 - .byte 0x00, 0x00 - .4byte gUnknown_83538A8 - .4byte gUnknown_835B500 - .2byte 0x02ce - .byte 0x00, 0x00 - .4byte gUnknown_8353A48 - .4byte gUnknown_835B508 - .2byte 0x0284 - .byte 0x00, 0x00 - .4byte gUnknown_8353BE8 - .4byte gUnknown_835B510 - .2byte 0x02bc - .byte 0x01, 0x00 - .4byte gUnknown_8353D88 - .4byte gUnknown_835B518 - .2byte 0x0298 - .byte 0x00, 0x00 - .4byte gUnknown_8353F28 - .4byte gUnknown_835B520 - .2byte 0x02a2 - .byte 0x00, 0x00 - .4byte gUnknown_83540C8 - .4byte gUnknown_835B528 - .2byte 0x029e - .byte 0x00, 0x00 - .4byte gUnknown_8354268 - .4byte gUnknown_835B530 - .2byte 0x02e1 - .byte 0x00, 0x00 - .4byte gUnknown_8354408 - .4byte gUnknown_835B538 - .2byte 0x0294 - .byte 0x01, 0x00 - .4byte gUnknown_83545A8 - .4byte gUnknown_835B540 - .2byte 0x02bf - .byte 0x00, 0x00 - .4byte gUnknown_8354748 - .4byte gUnknown_835B548 - .2byte 0x02d2 - .byte 0x01, 0x00 - .4byte gUnknown_83548E8 - .4byte gUnknown_835B550 - .2byte 0x02ad - .byte 0x00, 0x00 - .4byte gUnknown_8354A88 - .4byte gUnknown_835B558 - .2byte 0x0297 - .byte 0x00, 0x00 - .4byte gUnknown_8359FC8 - .4byte gUnknown_835B588 - .2byte 0x029b - .byte 0x01, 0x00 - .4byte gUnknown_835A168 - .4byte gUnknown_835B590 - .2byte 0x02eb - .byte 0x00, 0x00 - .4byte gUnknown_835A308 - .4byte gUnknown_835B598 - .2byte 0x029a - .byte 0x00, 0x00 - .4byte gUnknown_835A4A8 - .4byte gUnknown_835B5A0 - .2byte 0x02b9 - .byte 0x00, 0x00 - .4byte gUnknown_835A648 - .4byte gUnknown_835B5A8 - .2byte 0x02af - .byte 0x00, 0x00 - .4byte gUnknown_835A7E8 - .4byte gUnknown_835B5B0 - .2byte 0x030c - .byte 0x00, 0x00 - .4byte gUnknown_835A988 - .4byte gUnknown_835B5B8 - .2byte 0x028d - .byte 0x01, 0x01 - .4byte gUnknown_8354C28 - .4byte gUnknown_835B560 - .2byte 0x02de - .byte 0x01, 0x01 - .4byte gUnknown_8354F48 - .4byte gUnknown_835B568 - .2byte 0x02ab - .byte 0x01, 0x01 - .4byte gUnknown_8355268 - .4byte gUnknown_835B570 - .2byte 0x0281 - .byte 0x00, 0x01 - .4byte gUnknown_8355588 - .4byte gUnknown_835B578 - .2byte 0x02e2 - .byte 0x01, 0x01 - .4byte gUnknown_8359CA8 - .4byte gUnknown_835B580 - .2byte 0x0296 - .byte 0x01, 0x01 - .4byte gUnknown_835AB28 - .4byte gUnknown_835B5C0 - .2byte 0x02c3 - .byte 0x01, 0x01 - .4byte gUnknown_835AE48 - .4byte gUnknown_835B5C8 - .2byte 0x0356 - .byte 0x01, 0x01 - .4byte gUnknown_835B168 - .4byte gUnknown_835B5D0 - .2byte 0x0000 - .byte 0x00, 0x00 - .4byte 0x00000000 - .4byte 0x00000000 -- cgit v1.2.3 From 5cc2701e4721bd885da7d9f01943d396775e51d9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 12 Nov 2019 15:20:54 -0500 Subject: Knock out a few more incbins --- data/clear_save_data_screen.s | 20 +++++++++++++++++--- data/evolution_graphics.s | 3 +++ data/field_tasks.s | 19 +++++++++++++++++-- data/save_failed_screen.s | 2 +- 4 files changed, 38 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s index 51149a021..32a2d422a 100644 --- a/data/clear_save_data_screen.s +++ b/data/clear_save_data_screen.s @@ -7,10 +7,24 @@ .align 2 gUnknown_841EE64:: @ 841EE64 - .incbin "baserom.gba", 0x41EE64, 0x4 + .4byte 0x000001f0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } gUnknown_841EE68:: @ 841EE68 - .incbin "baserom.gba", 0x41EE68, 0x18 + .byte 0, 3, 5, 6, 4, 15 + .2byte 0x000a + .byte 0, 3, 15, 23, 4, 15 + .2byte 0x0022 + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 gUnknown_841EE80:: @ 841EE80 - .incbin "baserom.gba", 0x41EE80, 0x44 + .byte 0x01, 0x02, 0x03 diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s index 0fd702447..08276557a 100644 --- a/data/evolution_graphics.s +++ b/data/evolution_graphics.s @@ -6,6 +6,9 @@ .section .rodata .align 2 +gUnknown_841EE84:: @ 841EE84 + .incbin "baserom.gba", 0x41EE84, 0x40 + gUnknown_841EEC4:: @ 841EEC4 .incbin "baserom.gba", 0x41EEC4, 0x10 diff --git a/data/field_tasks.s b/data/field_tasks.s index a91e6cec9..2ff9ad215 100644 --- a/data/field_tasks.s +++ b/data/field_tasks.s @@ -1,7 +1,22 @@ .section .rodata .align 2 gUnknown_83A7310:: @ 83A7310 - .incbin "baserom.gba", 0x3A7310, 0x20 + .4byte nullsub_40 + .4byte sub_806EB54 + .4byte nullsub_40 + .4byte nullsub_40 + .4byte sub_806E9E0 + .4byte nullsub_40 + .4byte nullsub_40 + .4byte sub_806EC40 gUnknown_83A7330:: @ 83A7330 - .incbin "baserom.gba", 0x3A7330, 0x14 + .byte 0x08, 0x03 + .byte 0x0a, 0x05 + .byte 0x0f, 0x05 + .byte 0x08, 0x09 + .byte 0x09, 0x09 + .byte 0x10, 0x09 + .byte 0x08, 0x0a + .byte 0x09, 0x0a + .byte 0x08, 0x0e diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s index cdf68c4de..e19763962 100644 --- a/data/save_failed_screen.s +++ b/data/save_failed_screen.s @@ -7,4 +7,4 @@ .align 2 gUnknown_841EE44:: @ 841EE44 - .incbin "baserom.gba", 0x41EE44, 0x20 + .incbin "graphics/interface/save_failed_screen.gbapal" -- cgit v1.2.3