From aa15a03ffddcffd70b24c3aa1bc88710c2729dcc Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Thu, 7 Sep 2023 05:20:15 -0400 Subject: [PATCH] gulpin_shop data --- data/data_80DBD98.s | 187 +++++++---------------------------------- data/data_80DC240.s | 103 +++++++++++++++++++++++ data/data_80DC464.s | 23 ----- ld_script.txt | 2 + src/code_801C620.c | 6 +- src/data/gulpin_shop.h | 43 ++++++++++ src/gulpin_shop.c | 30 +++---- 7 files changed, 192 insertions(+), 202 deletions(-) create mode 100644 data/data_80DC240.s create mode 100644 src/data/gulpin_shop.h diff --git a/data/data_80DBD98.s b/data/data_80DBD98.s index 99f0c979c..2d93e98d4 100644 --- a/data/data_80DBD98.s +++ b/data/data_80DBD98.s @@ -1,6 +1,6 @@ .section .rodata -@ code_801C620 +@ code_801C620 #1 .align 2,0 .string "pksdir0\0" @@ -26,8 +26,10 @@ gUnknown_80DBDB0: @ 80DBDB0 .global gUnknown_80DBDC8 gUnknown_80DBDC8: @ 80DBDC8 .string "Switch\0" + +@ code_801C620 #2 .align 2,0 - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DBDD8 @@ -64,8 +66,10 @@ gUnknown_80DBE18: @ 80DBE18 .global gUnknown_80DBE1C gUnknown_80DBE1C: @ 80DBE1C .string "{ARG_MOVE_ITEM_0}{ARG_MOVE_ITEM_1}\0" + +@ code_801C620 #3 .align 2,0 - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DBE2C @@ -76,7 +80,9 @@ gUnknown_80DBE2C: @ 80DBE2C .global gUnknown_80DBE30 gUnknown_80DBE30: @ 80DBE30 .string "{ARG_POKEMON_0}\0" - .string "pksdir0\0" + +@ code_801C620 #4 +.string "pksdir0\0" .align 2,0 .global gUnknown_80DBE3C @@ -99,8 +105,10 @@ gUnknown_80DBE54: @ 80DBE54 .global gUnknown_80DBE6C gUnknown_80DBE6C: @ 80DBE6C + +@ code_801C620 #5 .string "Storage\0" - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DBE7C @@ -172,8 +180,10 @@ gUnknown_80DBF4C: @ 80DBF4C .global gTeamRankBadgeFileName gTeamRankBadgeFileName: @ 80DBF60 .string "tmrkpat\0" + +@ code_801D760 .align 2,0 - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DBF70 @@ -197,8 +207,10 @@ gUnknown_80DBF88: @ 80DBF88 .global gUnknown_80DBFA0 gUnknown_80DBFA0: @ 80DBFA0 .string "Field\0" + +@ options_menu #1 .align 2,0 - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DBFB0 @@ -242,8 +254,10 @@ gOthers_GameOptions: @ 80DC000 .global gOthers_Hints gOthers_Hints: @ 80DC010 .string "Hints\0" + +@ options_menu #2 .align 2,0 - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DC020 @@ -269,8 +283,6 @@ gUnknown_80DC03C: @ 80DC03C .4byte UnkData_80DC038 -@ Window Settings - .global gWindowBGTitle gWindowBGTitle: @ 80DC054 .string "Game Options\0" @@ -296,8 +308,10 @@ gWindowBGRedString: @ 80DC08C .global gWindowBGGreenString gWindowBGGreenString: @ 80DC090 .string "Green\0" + +@ hints_menu #1 .align 2,0 - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DC0A0 @@ -326,8 +340,10 @@ gUnknown_80DC0BC: @ 80DC0BC .global gUnknown_80DC0D4 gUnknown_80DC0D4: @ 80DC0D4 .string "Hints\0" + +@ hints_menu #2 .align 2,0 - .string "pksdir0\0" +.string "pksdir0\0" .align 2,0 .global gUnknown_80DC0E4 @@ -346,149 +362,4 @@ gUnknown_80DC0FC: @ 80DC0FC .byte 0x02, 0x00, 0x02, 0x00 .byte 0x1a, 0x00, 0x10, 0x00 .byte 0x10, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80DC11C -gUnknown_80DC11C: @ 80DC11C - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DC134 -gUnknown_80DC134: @ 80DC134 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x16, 0x00, 0x04, 0x00 - .byte 0x06, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x16, 0x00, 0x0e, 0x00 - .byte 0x06, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DC164 -gUnknown_80DC164: @ 80DC164 - .string "Only four moves may be learned!\n" - .string "Will a move be forgotten?\0" - .align 2,0 - - .global gUnknown_80DC1A0 -gUnknown_80DC1A0: @ 80DC1A0 - .string "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and\n" - .string "{CENTER_ALIGN}any moves linked to it{COMMA} and learn the move\n" - .string "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" - .align 2,0 - - .global gUnknown_80DC1FC -gUnknown_80DC1FC: @ 80DC1FC - .string "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n" - .string "{CENTER_ALIGN}and learn {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" - .align 2,0 - - .global gUnknown_80DC230 -gUnknown_80DC230: @ 80DC230 - .string "Forget\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80DC240 -gUnknown_80DC240: @ 80DC240 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global Data_80DC258 - Data_80DC258: - .byte 0x01, 0x00, 0x0f, 0x00 - - .global gUnknown_80DC25C -gUnknown_80DC25C: @ 80DC25C - .byte 0x00, 0x00 - .byte 0x00, 0x00 - .byte 0x06, 0x00 - .byte 0x00, 0x00 - .byte 0x02, 0x00 - .byte 0x02, 0x00 - .byte 0x12, 0x00 - .byte 0x08, 0x00 - .byte 0x08, 0x00 - .byte 0x00, 0x00 - - .4byte Data_80DC258 - - .global gUnknown_80DC274 -gUnknown_80DC274: @ 80DC274 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x0f, 0x00 - .byte 0x1a, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DC28C -gUnknown_80DC28C: @ 80DC28C - .string "Moves: {COLOR_1 YELLOW}{ARG_POKEMON_0}{END_COLOR_TEXT_1} \0" - .align 2,0 - - .global gUnknown_80DC2A0 -gUnknown_80DC2A0: @ 80DC2A0 - .string "{ARG_MOVE_ITEM_0}\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80DC2AC -gUnknown_80DC2AC: @ 80DC2AC - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DC2C4 -gUnknown_80DC2C4: @ 80DC2C4 - .byte 0x00, 0x00 - .byte 0x00, 0x00 - .byte 0x06, 0x00 - .byte 0x00, 0x00 - .byte 0x02, 0x00 - .byte 0x02, 0x00 - .byte 0x0f, 0x00 - .byte 0x04, 0x00 - .byte 0x06, 0x00 - .byte 0x00, 0x00 - .byte 0x00, 0x00 - .byte 0x00, 0x00 - - .global gUnknown_80DC2DC -gUnknown_80DC2DC: @ 80DC2DC - .string "Moves Page: %d/%d \0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80DC2F8 -gUnknown_80DC2F8: @ 80DC2F8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80DC310 -gUnknown_80DC310: @ 80DC310 - .string "{ARG_POKEMON_0}\0" \ No newline at end of file + .byte 0x00, 0x00, 0x00, 0x00 \ No newline at end of file diff --git a/data/data_80DC240.s b/data/data_80DC240.s new file mode 100644 index 000000000..c04f02f30 --- /dev/null +++ b/data/data_80DC240.s @@ -0,0 +1,103 @@ + .section .rodata + +@ code_801EE10 + .align 2,0 +.string "pksdir0\0" + .align 2,0 + + .global gUnknown_80DC240 +gUnknown_80DC240: @ 80DC240 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global Data_80DC258 + Data_80DC258: + .byte 0x01, 0x00, 0x0f, 0x00 + + .global gUnknown_80DC25C +gUnknown_80DC25C: @ 80DC25C + .byte 0x00, 0x00 + .byte 0x00, 0x00 + .byte 0x06, 0x00 + .byte 0x00, 0x00 + .byte 0x02, 0x00 + .byte 0x02, 0x00 + .byte 0x12, 0x00 + .byte 0x08, 0x00 + .byte 0x08, 0x00 + .byte 0x00, 0x00 + + .4byte Data_80DC258 + + .global gUnknown_80DC274 +gUnknown_80DC274: @ 80DC274 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x0f, 0x00 + .byte 0x1a, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80DC28C +gUnknown_80DC28C: @ 80DC28C + .string "Moves: {COLOR_1 YELLOW}{ARG_POKEMON_0}{END_COLOR_TEXT_1} \0" + .align 2,0 + + .global gUnknown_80DC2A0 +gUnknown_80DC2A0: @ 80DC2A0 + .string "{ARG_MOVE_ITEM_0}\0" + +@ code_801EE10_mid #1 + .align 2,0 +.string "pksdir0\0" + .align 2,0 + + .global gUnknown_80DC2AC +gUnknown_80DC2AC: @ 80DC2AC + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80DC2C4 +gUnknown_80DC2C4: @ 80DC2C4 + .byte 0x00, 0x00 + .byte 0x00, 0x00 + .byte 0x06, 0x00 + .byte 0x00, 0x00 + .byte 0x02, 0x00 + .byte 0x02, 0x00 + .byte 0x0f, 0x00 + .byte 0x04, 0x00 + .byte 0x06, 0x00 + .byte 0x00, 0x00 + .byte 0x00, 0x00 + .byte 0x00, 0x00 + + .global gUnknown_80DC2DC +gUnknown_80DC2DC: @ 80DC2DC + .string "Moves Page: %d/%d \0" + + .align 2,0 +@ code_801EE10_mid #2 +.string "pksdir0\0" + .align 2,0 + + .global gUnknown_80DC2F8 +gUnknown_80DC2F8: @ 80DC2F8 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80DC310 +gUnknown_80DC310: @ 80DC310 + .string "{ARG_POKEMON_0}\0" \ No newline at end of file diff --git a/data/data_80DC464.s b/data/data_80DC464.s index 1d50acdda..2f982e210 100644 --- a/data/data_80DC464.s +++ b/data/data_80DC464.s @@ -225,21 +225,18 @@ gUnknown_80DC7B4: @ 80DC7B4 .global gUnknown_80DC7FC gUnknown_80DC7FC: @ 80DC7FC -@ replacing .incbin "baserom.gba", 0x000dc7fc, 0x20 .string "Yes!\n" .string "{ARG_POKEMON_1}{APOSTROPHE}s Attack rose by 1!\0" .align 2,0 .global gUnknown_80DC81C gUnknown_80DC81C: @ 80DC81C -@ replacing .incbin "baserom.gba", 0x000dc81c, 0x28 .string "Yes!\n" .string "{ARG_POKEMON_1}{APOSTROPHE}s Special Attack rose by 1!\0" .align 2,0 .global gUnknown_80DC844 gUnknown_80DC844: @ 80DC844 -@ replacing .incbin "baserom.gba", 0x000dc844, 0x20 .string "Yes!\n" .string "{ARG_POKEMON_1}{APOSTROPHE}s Defense rose by 1!\0" .align 2,0 @@ -247,26 +244,22 @@ gUnknown_80DC844: @ 80DC844 .global gUnknown_80DC864 gUnknown_80DC864: @ 80DC864 -@ replacing .incbin "baserom.gba", 0x000dc864, 0x28 .string "Yes!\n" .string "{ARG_POKEMON_1}{APOSTROPHE}s Special Defense rose by 1!\0" .align 2,0 .global gUnknown_80DC88C gUnknown_80DC88C: @ 80DC88C -@ replacing .incbin "baserom.gba", 0x000dc88c, 0x20 .string "You don{APOSTROPHE}t have any Gummis.\0" .align 2,0 .global gUnknown_80DC8AC gUnknown_80DC8AC: @ 80DC8AC -@ replacing .incbin "baserom.gba", 0x000dc8ac, 0x1c .string "You don{APOSTROPHE}t have an item.\0" .align 2,0 .global gUnknown_80DC8C8 gUnknown_80DC8C8: @ 80DC8C8 -@ replacing .incbin "baserom.gba", 0x000dc8c8, 0x14 .string "The Gummi is gone!\0" .align 2,0 @@ -282,7 +275,6 @@ gUnknown_80DC8F0: @ 80DC8F0 .global gUnknown_80DC8F8 gUnknown_80DC8F8: @ 80DC8F8 -@ replacing .incbin "baserom.gba", 0x000dc8f8, 0xc .string "Use\0" .align 2,0 @@ -292,7 +284,6 @@ gUnknown_80DC8F8: @ 80DC8F8 .global gUnknown_80DC904 gUnknown_80DC904: @ 80DC904 -@ replacing .incbin "baserom.gba", 0x000dc904, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -302,7 +293,6 @@ gUnknown_80DC904: @ 80DC904 .global gUnknown_80DC91C gUnknown_80DC91C: @ 80DC91C -@ replacing .incbin "baserom.gba", 0x000dc91c, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x02, 0x00 @@ -312,13 +302,11 @@ gUnknown_80DC91C: @ 80DC91C .global gUnknown_80DC934 gUnknown_80DC934: @ 80DC934 -@ replacing .incbin "baserom.gba", 0x000dc934, 0x8 .string "Pokémon\0" .align 2,0 .global gUnknown_80DC93C gUnknown_80DC93C: @ 80DC93C -@ replacing .incbin "baserom.gba", 0x000dc93c, 0x14 .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0" .align 2,0 @@ -328,7 +316,6 @@ gUnknown_80DC93C: @ 80DC93C .global gUnknown_80DC950 gUnknown_80DC950: @ 80DC950 -@ replacing .incbin "baserom.gba", 0x000dc950, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -338,7 +325,6 @@ gUnknown_80DC950: @ 80DC950 .global gUnknown_80DC968 gUnknown_80DC968: @ 80DC968 -@ replacing .incbin "baserom.gba", 0x000dc968, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x02, 0x00 @@ -348,23 +334,19 @@ gUnknown_80DC968: @ 80DC968 .global gUnknown_80DC980 gUnknown_80DC980: @ 80DC980 -@ replacing .incbin "baserom.gba", 0x000dc980, 0x8 .string "Friends\0" .global gUnknown_80DC988 gUnknown_80DC988: @ 80DC988 -@ replacing .incbin "baserom.gba", 0x000dc988, 0x10 .string "Pokémon Friends\0" .global gUnknown_80DC998 gUnknown_80DC998: @ 80DC998 -@ replacing .incbin "baserom.gba", 0x000dc998, 0xc .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0" .align 2,0 .global gUnknown_80DC9A4 gUnknown_80DC9A4: @ 80DC9A4 -@ replacing .incbin "baserom.gba", 0x000dc9a4, 0xc .string "%s\0" .align 2,0 @@ -374,7 +356,6 @@ gUnknown_80DC9A4: @ 80DC9A4 .global gUnknown_80DC9B0 gUnknown_80DC9B0: @ 80DC9B0 -@ replacing .incbin "baserom.gba", 0x000dc9b0, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -384,7 +365,6 @@ gUnknown_80DC9B0: @ 80DC9B0 .global gUnknown_80DC9C8 gUnknown_80DC9C8: @ 80DC9C8 -@ replacing .incbin "baserom.gba", 0x000dc9c8, 0x20 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x02, 0x00 @@ -398,7 +378,6 @@ gUnknown_80DC9C8: @ 80DC9C8 .global gUnknown_80DC9E8 gUnknown_80DC9E8: @ 80DC9E8 -@ replacing .incbin "baserom.gba", 0x000dc9e8, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -408,7 +387,6 @@ gUnknown_80DC9E8: @ 80DC9E8 .global gUnknown_80DCA00 gUnknown_80DCA00: @ 80DCA00 -@ replacing .incbin "baserom.gba", 0x000dca00, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x04, 0x00 @@ -430,7 +408,6 @@ gUnknown_80DCA24: @ 80DCA24 .global gUnknown_80DCA2C gUnknown_80DCA2C: @ 80DCA2C -@ replacing .incbin "baserom.gba", 0x000dca2c, 0x8 .string "Yes\0" .align 2,0 .4byte gUnknown_80DCA2C \ No newline at end of file diff --git a/ld_script.txt b/ld_script.txt index 4b58602ec..96decf675 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -410,6 +410,8 @@ SECTIONS { src/code_801B3C0.o(.rodata); src/code_801B60C.o(.rodata); data/data_80DBD98.o(.rodata); + src/gulpin_shop.o(.rodata); + data/data_80DC240.o(.rodata); src/gulpin_shop_801FB50.o(.rodata); data/data_80DC464.o(.rodata); src/luminous_cave.o(.rodata); diff --git a/src/code_801C620.c b/src/code_801C620.c index 67392c477..af9208153 100644 --- a/src/code_801C620.c +++ b/src/code_801C620.c @@ -14,9 +14,11 @@ #include "sprite.h" #include "code_80130A8.h" +// TODO: This 1 file was originally 5 files. Split properly + +// size: 0x124 struct unkStruct_203B238 { - // size: 0x124 u32 state; s16 species; PokemonStruct1 *pokeStruct; @@ -75,7 +77,7 @@ struct unkStruct_203B244 u8 unk550[4]; }; -// size: 118 +// size: 0x118 struct unk_203B250 { /* 0x0 */ PokemonStruct1 *pokeStruct; diff --git a/src/data/gulpin_shop.h b/src/data/gulpin_shop.h new file mode 100644 index 000000000..aac130482 --- /dev/null +++ b/src/data/gulpin_shop.h @@ -0,0 +1,43 @@ +ALIGNED(4) static const u8 sFill[] = _("pksdir0"); + +static const UnkTextStruct2 gUnknown_80DC11C = { + 0, 0, 0, 0, + 3, + 0, 0, + 0, 0, + 0, 0, + NULL +}; + +static const UnkTextStruct2 gUnknown_80DC134 = { + 0, 0, 0, 0, + 3, + 22, 4, + 6, 3, + 3, 0, + NULL +}; + +UNUSED static const UnkTextStruct2 gUnknown_80DC14C = { + 0, 0, 0, 0, + 3, + 22, 14, + 6, 3, + 3, 0, + NULL +}; + +ALIGNED(4) static const u8 sWillAMoveBeForgotten[] = _( + "Only four moves may be learned!\n" + "Will a move be forgotten?"); + +ALIGNED(4) static const u8 sForgetMoveAndLinkedOnes[] = _( + "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and\n" + "{CENTER_ALIGN}any moves linked to it{COMMA} and learn the move\n" + "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + +ALIGNED(4) static const u8 sForgetMoveOnly[] = _( + "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n" + "{CENTER_ALIGN}and learn {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?"); + +ALIGNED(4) static const u8 sForget[] = _("Forget"); \ No newline at end of file diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c index d32aa808f..642513059 100644 --- a/src/gulpin_shop.c +++ b/src/gulpin_shop.c @@ -20,12 +20,8 @@ extern const u8 *gUnknown_80D4920[]; extern const u8 *gUnknown_80D4928[]; extern const u8 *gUnknown_80D4970[]; extern const u8 *gGulpinDialogue[2][25]; // 80D8888 -extern const UnkTextStruct2 gUnknown_80DC11C; -extern const UnkTextStruct2 gUnknown_80DC134; -extern const u8 gUnknown_80DC164[]; -extern const u8 gUnknown_80DC1A0[]; -extern const u8 gUnknown_80DC1FC[]; -extern const u8 gUnknown_80DC230[]; + +#include "data/gulpin_shop.h" static void SetGulpinShopState(u32); @@ -145,7 +141,7 @@ static void sub_801EA28(void) { switch (sGulpinShopWork->state) { case 0: - sub_801EE10(2, sGulpinShopWork->speciesNum, sGulpinShopWork->moves, 0, gUnknown_80DC164, 0); + sub_801EE10(2, sGulpinShopWork->speciesNum, sGulpinShopWork->moves, 0, sWillAMoveBeForgotten, 0); break; case 1: sub_801F1B0(TRUE, FALSE); @@ -167,19 +163,15 @@ static void sub_801EA28(void) case 0: case 1: if (sGulpinShopWork->isNextMoveLinked) - sub_8014248(gGulpinDialogue[sGulpinShopWork->isAsleep][12], 0, 5, &sGulpinShopWork->unk28[0], - &sGulpinShopWork->unk68, 4, 0, sGulpinShopWork->unk128, 12); // Forget the move and any moves linked to it and learn? + sub_8014248(gGulpinDialogue[sGulpinShopWork->isAsleep][12], 0, 5, &sGulpinShopWork->unk28[0], &sGulpinShopWork->unk68, 4, 0, sGulpinShopWork->unk128, 12); else - sub_8014248(gGulpinDialogue[sGulpinShopWork->isAsleep][11], 0, 5, &sGulpinShopWork->unk28[0], - &sGulpinShopWork->unk68, 4, 0, sGulpinShopWork->unk128, 12); // Forget the move and learn? + sub_8014248(gGulpinDialogue[sGulpinShopWork->isAsleep][11], 0, 5, &sGulpinShopWork->unk28[0], &sGulpinShopWork->unk68, 4, 0, sGulpinShopWork->unk128, 12); break; case 2: if (sGulpinShopWork->isNextMoveLinked) - sub_8014248(gUnknown_80DC1A0, 0, 5, &sGulpinShopWork->unk28[0], - &sGulpinShopWork->unk68, 4, 0, NULL, 32); + sub_8014248(sForgetMoveAndLinkedOnes, 0, 5, &sGulpinShopWork->unk28[0], &sGulpinShopWork->unk68, 4, 0, NULL, 32); else - sub_8014248(gUnknown_80DC1FC, 0, 5, &sGulpinShopWork->unk28[0], - &sGulpinShopWork->unk68, 4, 0, NULL, 32); + sub_8014248(sForgetMoveOnly, 0, 5, &sGulpinShopWork->unk28[0], &sGulpinShopWork->unk68, 4, 0, NULL, 32); break; } break; @@ -194,14 +186,14 @@ static void sub_801EBC4(void) MemoryFill16(sGulpinShopWork->unk68, 0, sizeof(sGulpinShopWork->unk68)); - sGulpinShopWork->unk28[which].text = gUnknown_80DC230; // "Forget" + sGulpinShopWork->unk28[which].text = sForget; sGulpinShopWork->unk28[which].menuAction = 2; if (!IsAnyMoveLinked(sGulpinShopWork->unk1E, sGulpinShopWork->moves) || (s32)sGulpinShopWork->unk20 >= 4) sGulpinShopWork->unk68[0] = 1; which++; - sGulpinShopWork->unk28[which].text = *gUnknown_80D4970; // "Info" + sGulpinShopWork->unk28[which].text = *gUnknown_80D4970; sGulpinShopWork->unk28[which].menuAction = 3; which++; sGulpinShopWork->unk28[which].text = NULL; @@ -229,10 +221,10 @@ static void sub_801EC7C(void) which = 0; MemoryFill16(sGulpinShopWork->unk68, 0, sizeof(sGulpinShopWork->unk68)); - sGulpinShopWork->unk28[which].text = *gUnknown_80D4920; // "Yes" + sGulpinShopWork->unk28[which].text = *gUnknown_80D4920; sGulpinShopWork->unk28[which].menuAction = 4; which++; - sGulpinShopWork->unk28[which].text = *gUnknown_80D4928; // "No" + sGulpinShopWork->unk28[which].text = *gUnknown_80D4928; sGulpinShopWork->unk28[which].menuAction = 5; which++; sGulpinShopWork->unk28[which].text = NULL;