From b6c7c6523fedb21e5928fbaf8e01747f4283cfc1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 28 Sep 2019 16:11:41 -0400 Subject: berry_pouch through sub_813D0E4 --- data/berry_pouch.s | 9 ++++----- data/graphics.s | 12 ++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/berry_pouch.s b/data/berry_pouch.s index 172443b5e..ac62b258b 100644 --- a/data/berry_pouch.s +++ b/data/berry_pouch.s @@ -1,9 +1,8 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_846434C:: @ 846434C - .incbin "baserom.gba", 0x46434C, 0xC - gUnknown_8464358:: @ 8464358 .incbin "baserom.gba", 0x464358, 0x14 @@ -50,10 +49,10 @@ gUnknown_8464448:: @ 8464448 .incbin "baserom.gba", 0x464448, 0x60 gUnknown_84644A8:: @ 84644A8 - .incbin "baserom.gba", 0x4644A8, 0x8 + obj_tiles gUnknown_8E8560C, 0x800, 100 gUnknown_84644B0:: @ 84644B0 - .incbin "baserom.gba", 0x4644B0, 0x8 + obj_pal gUnknown_8E85C1C, 100 gUnknown_84644B8:: @ 84644B8 .incbin "baserom.gba", 0x4644B8, 0x32C diff --git a/data/graphics.s b/data/graphics.s index 96ef720e9..a7f262aca 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13989,22 +13989,22 @@ gItemPcTilemap:: @ 8E85458 .incbin "graphics/item_pc/unk_8E85458.bin.lz" gUnknown_8E8560C:: @ 8E8560C - .incbin "baserom.gba", 0xE8560C, 0x3C4 + .incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz" gUnknown_8E859D0:: @ 8E859D0 - .incbin "baserom.gba", 0xE859D0, 0x1D4 + .incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz" gUnknown_8E85BA4:: @ 8E85BA4 - .incbin "baserom.gba", 0xE85BA4, 0x50 + .incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz" gUnknown_8E85BF4:: @ 8E85BF4 - .incbin "baserom.gba", 0xE85BF4, 0x28 + .incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz" gUnknown_8E85C1C:: @ 8E85C1C - .incbin "baserom.gba", 0xE85C1C, 0x28 + .incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz" gUnknown_8E85C44:: @ 8E85C44 - .incbin "baserom.gba", 0xE85C44, 0x184 + .incbin "graphics/berry_pouch/unk_8E85C44.bin.lz" gUnknown_8E85DC8:: @ 8E85DC8 .incbin "baserom.gba", 0xE85DC8, 0x134 -- cgit v1.2.3 From 0993cb64f7c3a4ff8827da72acc76afccca682e6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 28 Sep 2019 20:27:41 -0400 Subject: Berry_pouch through sub_813D5BC --- data/berry_pouch.s | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/berry_pouch.s b/data/berry_pouch.s index ac62b258b..7c45b0383 100644 --- a/data/berry_pouch.s +++ b/data/berry_pouch.s @@ -28,8 +28,9 @@ gUnknown_84643B0:: @ 84643B0 .incbin "baserom.gba", 0x4643B0, 0x4 gUnknown_84643B4:: @ 84643B4 - .incbin "baserom.gba", 0x4643B4, 0x4 + .string " $" + .align 2 gUnknown_84643B8:: @ 84643B8 .incbin "baserom.gba", 0x4643B8, 0x20 -- cgit v1.2.3 From 3766ddcfda811cff3a7c38808c9efe294c33ed7c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 29 Sep 2019 12:48:11 -0400 Subject: berry pouch through sub_813DD74 --- data/berry_pouch.s | 17 +++++++++-------- data/strings.s | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/berry_pouch.s b/data/berry_pouch.s index 7c45b0383..19bf0c3df 100644 --- a/data/berry_pouch.s +++ b/data/berry_pouch.s @@ -3,9 +3,6 @@ .section .rodata .align 2 -gUnknown_8464358:: @ 8464358 - .incbin "baserom.gba", 0x464358, 0x14 - gUnknown_846436C:: @ 846436C .incbin "baserom.gba", 0x46436C, 0x8 @@ -13,19 +10,23 @@ gUnknown_8464374:: @ 8464374 .incbin "baserom.gba", 0x464374, 0x8 gUnknown_846437C:: @ 846437C - .incbin "baserom.gba", 0x46437C, 0x28 + .4byte gOtherText_Use, sub_813DE0C + .4byte gOtherText_Toss, sub_813DEBC + .4byte gOtherText_Give, sub_813E200 + .4byte gOtherText_Exit, sub_813E320 + .4byte gString_Dummy, NULL gUnknown_84643A4:: @ 84643A4 - .incbin "baserom.gba", 0x4643A4, 0x4 + .byte 0, 2, 1, 3 gUnknown_84643A8:: @ 84643A8 - .incbin "baserom.gba", 0x4643A8, 0x4 + .byte 2, 3, 4, 4 gUnknown_84643AC:: @ 84643AC - .incbin "baserom.gba", 0x4643AC, 0x4 + .byte 3, 4, 4, 4 gUnknown_84643B0:: @ 84643B0 - .incbin "baserom.gba", 0x4643B0, 0x4 + .byte 0, 1, 3, 4 gUnknown_84643B4:: @ 84643B4 .string " $" diff --git a/data/strings.s b/data/strings.s index 603bce34f..bb12c0ad3 100644 --- a/data/strings.s +++ b/data/strings.s @@ -372,7 +372,7 @@ gUnknown_8416195:: gOtherText_Use:: .string "USE$" -gUnknown_84161A4:: +gOtherText_Toss:: .string "TOSS$" gUnknown_84161A9:: -- cgit v1.2.3 From e65487716a0afc3c48d712f706783c58cc82676c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 30 Sep 2019 16:59:39 -0400 Subject: berry_pouch through sub_813E2B8 --- data/berry_pouch.s | 29 ----------------------------- data/strings.s | 8 ++++---- 2 files changed, 4 insertions(+), 33 deletions(-) (limited to 'data') diff --git a/data/berry_pouch.s b/data/berry_pouch.s index 19bf0c3df..68d9cd5a3 100644 --- a/data/berry_pouch.s +++ b/data/berry_pouch.s @@ -3,35 +3,6 @@ .section .rodata .align 2 -gUnknown_846436C:: @ 846436C - .incbin "baserom.gba", 0x46436C, 0x8 - -gUnknown_8464374:: @ 8464374 - .incbin "baserom.gba", 0x464374, 0x8 - -gUnknown_846437C:: @ 846437C - .4byte gOtherText_Use, sub_813DE0C - .4byte gOtherText_Toss, sub_813DEBC - .4byte gOtherText_Give, sub_813E200 - .4byte gOtherText_Exit, sub_813E320 - .4byte gString_Dummy, NULL - -gUnknown_84643A4:: @ 84643A4 - .byte 0, 2, 1, 3 - -gUnknown_84643A8:: @ 84643A8 - .byte 2, 3, 4, 4 - -gUnknown_84643AC:: @ 84643AC - .byte 3, 4, 4, 4 - -gUnknown_84643B0:: @ 84643B0 - .byte 0, 1, 3, 4 - -gUnknown_84643B4:: @ 84643B4 - .string " $" - - .align 2 gUnknown_84643B8:: @ 84643B8 .incbin "baserom.gba", 0x4643B8, 0x20 diff --git a/data/strings.s b/data/strings.s index bb12c0ad3..5f1616eaf 100644 --- a/data/strings.s +++ b/data/strings.s @@ -559,19 +559,19 @@ gUnknown_8416374:: @ 8416374 .string "The {STR_VAR_1} can't be held\nhere.$" gUnknown_841638F:: @ 841638F - .string "Deposit how many\n{STR_VAR_1}シsス?$" + .string "Deposit how many\n{STR_VAR_1}(s)?$" gUnknown_84163A7:: @ 84163A7 - .string "Deposited {STR_VAR_2}\n{STR_VAR_1}シsス.$" + .string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$" gUnknown_84163BB:: @ 84163BB .string "There's no room to\nstore items.$" gUnknown_84163DB:: @ 84163DB - .string "Toss out how many\n{STR_VAR_1}シsス?$" + .string "Toss out how many\n{STR_VAR_1}(s)?$" gUnknown_84163F4:: @ 84163F4 - .string "Threw away {STR_VAR_2}\n{STR_VAR_1}シsス.$" + .string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$" gUnknown_8416409:: @ 8416409 .string "Throw away {STR_VAR_2} of\nthis item?$" -- cgit v1.2.3 From 64362d3040b3defb722bf72203fda64b96da1e06 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 30 Sep 2019 17:33:57 -0400 Subject: Berry Pouch rodata --- data/berry_pouch.s | 31 ------------------------------- data/itemfinder.s | 4 ++++ 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 data/berry_pouch.s (limited to 'data') diff --git a/data/berry_pouch.s b/data/berry_pouch.s deleted file mode 100644 index 68d9cd5a3..000000000 --- a/data/berry_pouch.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_84643B8:: @ 84643B8 - .incbin "baserom.gba", 0x4643B8, 0x20 - -gUnknown_84643D8:: @ 84643D8 - .incbin "baserom.gba", 0x4643D8, 0x18 - -gUnknown_84643F0:: @ 84643F0 - .incbin "baserom.gba", 0x4643F0, 0x8 - -gUnknown_84643F8:: @ 84643F8 - .incbin "baserom.gba", 0x4643F8, 0x8 - -gUnknown_8464400:: @ 8464400 - .incbin "baserom.gba", 0x464400, 0x48 - -gUnknown_8464448:: @ 8464448 - .incbin "baserom.gba", 0x464448, 0x60 - -gUnknown_84644A8:: @ 84644A8 - obj_tiles gUnknown_8E8560C, 0x800, 100 - -gUnknown_84644B0:: @ 84644B0 - obj_pal gUnknown_8E85C1C, 100 - -gUnknown_84644B8:: @ 84644B8 - .incbin "baserom.gba", 0x4644B8, 0x32C diff --git a/data/itemfinder.s b/data/itemfinder.s index 3a955deeb..88e9910f4 100644 --- a/data/itemfinder.s +++ b/data/itemfinder.s @@ -1,5 +1,9 @@ .section .rodata .align 2 + +gUnknown_84644D0:: @ 84644D0 + .incbin "baserom.gba", 0x4644D0, 0x314 + gUnknown_84647E4:: @ 84647E4 .incbin "baserom.gba", 0x4647E4, 0x18 -- cgit v1.2.3 From beedb8d73f40b045906f521b48f40367697b6ebb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 30 Sep 2019 20:58:29 -0400 Subject: Tidy global namespace and document --- data/graphics.s | 4 ++-- data/strings.s | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index a7f262aca..e03266f85 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13988,7 +13988,7 @@ gItemPcBgPals:: @ 8E85408 gItemPcTilemap:: @ 8E85458 .incbin "graphics/item_pc/unk_8E85458.bin.lz" -gUnknown_8E8560C:: @ 8E8560C +gBerryPouchSpriteTiles:: @ 8E8560C .incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz" gUnknown_8E859D0:: @ 8E859D0 @@ -14000,7 +14000,7 @@ gUnknown_8E85BA4:: @ 8E85BA4 gUnknown_8E85BF4:: @ 8E85BF4 .incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz" -gUnknown_8E85C1C:: @ 8E85C1C +gBerryPouchSpritePalette:: @ 8E85C1C .incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz" gUnknown_8E85C44:: @ 8E85C44 diff --git a/data/strings.s b/data/strings.s index 5f1616eaf..05bd47c88 100644 --- a/data/strings.s +++ b/data/strings.s @@ -555,7 +555,7 @@ gOtherText_WhereShouldTheStrVar1BePlaced:: @ 841633F gText_ItemCantBeHeld:: @ 841635E .string "The {STR_VAR_1} can't be held.$" -gUnknown_8416374:: @ 8416374 +gText_TheStrVar1CantBeHeldHere:: @ 8416374 .string "The {STR_VAR_1} can't be held\nhere.$" gUnknown_841638F:: @ 841638F @@ -567,13 +567,13 @@ gUnknown_84163A7:: @ 84163A7 gUnknown_84163BB:: @ 84163BB .string "There's no room to\nstore items.$" -gUnknown_84163DB:: @ 84163DB +gText_TossOutHowManyStrVar1s:: @ 84163DB .string "Toss out how many\n{STR_VAR_1}(s)?$" -gUnknown_84163F4:: @ 84163F4 +gText_ThrewAwayStrVar2StrVar1s:: @ 84163F4 .string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$" -gUnknown_8416409:: @ 8416409 +gText_ThrowAwayStrVar2OfThisItemQM:: @ 8416409 .string "Throw away {STR_VAR_2} of\nthis item?$" gUnknown_8416425:: @ 8416425 @@ -654,10 +654,10 @@ gText_FontSize2:: @ 8416703 gUnknown_8416707:: @ 8416707 .string " $" -gUnknown_841670A:: @ 841670A +gText_BerryPouch:: @ 841670A .string "BERRY POUCH$" -gUnknown_8416716:: @ 8416716 +gText_TheBerryPouchWillBePutAway:: @ 8416716 .string "The BERRY POUCH will be\nput away.$" gUnknown_8416738:: @ 0x8416738 -- cgit v1.2.3 From 07064bd58603de0f0470bab373196a40fe5d929c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 30 Sep 2019 21:04:25 -0400 Subject: Name extern berry pouch gfx --- data/graphics.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index e03266f85..9c5d1c3f9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13991,19 +13991,19 @@ gItemPcTilemap:: @ 8E85458 gBerryPouchSpriteTiles:: @ 8E8560C .incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz" -gUnknown_8E859D0:: @ 8E859D0 +gBerryPouchBgGfx:: @ 8E859D0 .incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz" -gUnknown_8E85BA4:: @ 8E85BA4 +gBerryPouchBgPals:: @ 8E85BA4 .incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz" -gUnknown_8E85BF4:: @ 8E85BF4 +gBerryPouchBgPal0FemaleOverride:: @ 8E85BF4 .incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz" gBerryPouchSpritePalette:: @ 8E85C1C .incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz" -gUnknown_8E85C44:: @ 8E85C44 +gBerryPouchBg1Tilemap:: @ 8E85C44 .incbin "graphics/berry_pouch/unk_8E85C44.bin.lz" gUnknown_8E85DC8:: @ 8E85DC8 -- cgit v1.2.3