diff --git a/data/common_strings.s b/data/common_strings.s index f8ab6a43e..774dc407f 100644 --- a/data/common_strings.s +++ b/data/common_strings.s @@ -2,371 +2,6 @@ .align 2,0 - .global gCommonWigglytuff -gCommonWigglytuff: @ 80D79A4 (Friend Area Shop) - .4byte gUnknown_80D883C - .4byte gUnknown_80D8818 - .4byte gUnknown_80D87E0 - .4byte gUnknown_80D8798 - .4byte gUnknown_80D876C - .4byte gUnknown_80D8738 - .4byte gUnknown_80D86E4 - .4byte gUnknown_80D8674 - .4byte gUnknown_80D8644 - .4byte gUnknown_80D8620 - .4byte gUnknown_80D85E4 - .4byte gUnknown_80D85AC - .4byte gUnknown_80D8584 - .4byte gUnknown_80D8550 - .4byte gUnknown_80D8528 - .4byte gUnknown_80D84F8 - .4byte gUnknown_80D8468 - .4byte gUnknown_80D8420 - .4byte gUnknown_80D8420 - .4byte gUnknown_80D8104 - .4byte gUnknown_80D80D4 - .4byte gUnknown_80D80B0 - .4byte gUnknown_80D8080 - .4byte gUnknown_80D8054 - .4byte gUnknown_80D8030 - .4byte gUnknown_80D8000 - .4byte gUnknown_80D7F7C - .4byte gUnknown_80D7F10 - .4byte gUnknown_80D7ED0 - .4byte gUnknown_80D7E9C - .4byte gUnknown_80D7E58 - .4byte gUnknown_80D7E2C - .4byte gUnknown_80D7E04 - .4byte gUnknown_80D7DE0 - .4byte gUnknown_80D7DA0 - .4byte gUnknown_80D7D64 - .4byte gUnknown_80D7CE8 - .4byte gUnknown_80D7C94 - .4byte gUnknown_80D7C94 - .4byte gUnknown_80D7A44 - - .global gUnknown_80D7A44 -gUnknown_80D7A44: - .string " Zzz...\n" - .string "Want more friends?{EXTRA_MSG}" - .string " Zzz... Kwoo...\n" - .string "You need Friend Areas for friends...{EXTRA_MSG}" - .string " Zzz... Zzz...\n" - .string "A Pokémon becomes your pal when it{APOSTROPHE}s in\n" - .string "the right Friend Area...{EXTRA_MSG}" - .string " Zzz... Dwee...\n" - .string "That{APOSTROPHE}s why you should get more Friend\n" - .string "Areas...{EXTRA_MSG}" - .string " Zzz... Pokémon can only\n" - .string "live in the right Friend Area for\n" - .string "their species...{EXTRA_MSG}" - .string " Kwoo... Sssnore...\n" - .string "See what Pokémon can live there by\n" - .string "checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}...{EXTRA_MSG}" - .string " Zzz...\n" - .string "I don{APOSTROPHE}t sell some Friend Areas...{EXTRA_MSG}" - .string " Kwoo...\n" - .string "Some rescue missions reward you with\n" - .string "Friend Areas...{EXTRA_MSG}" - .string " Zzz... Dwee...\n" - .string "Check the Pelipper Post Office{APOSTROPHE}s Bulletin\n" - .string "Board or your Mailbox for missions...\0" - .align 2, 0 - - .global gUnknown_80D7C94 -gUnknown_80D7C94: - .string " Sssnore...\n" - .string "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...?\n" - .string "I can{APOSTROPHE}t get that Friend Area...{EXTRA_MSG}" - .string " Zzz... Zzz...\n" - .string "Sorry...\0" - .align 2, 0 - - .global gUnknown_80D7CE8 -gUnknown_80D7CE8: - .string " Zzz... Hunh...?\n" - .string "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...?\n" - .string "I don{APOSTROPHE}t know... I{APOSTROPHE}ll check...{EXTRA_MSG}" - .string " Sssnore...\n" - .string "I{APOSTROPHE}ll have it for sale...\n" - .string "When I find out...\0" - .align 2, 0 - - .global gUnknown_80D7D64 -gUnknown_80D7D64: - .string " Sssnore...\n" - .string "You can already go...\n" - .string "Friend Area {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...\0" - .align 2, 0 - - .global gUnknown_80D7DA0 -gUnknown_80D7DA0: - .string " Dwee... Kwoo...\n" - .string "{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s Friend Area...\n" - .string "Zzz... {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...\0" - .align 2, 0 - - .global gUnknown_80D7DE0 -gUnknown_80D7DE0: - .string " Another Pokémon...\n" - .string "Zzz... Check?\0" - .align 2, 0 - - .global gUnknown_80D7E04 -gUnknown_80D7E04: - .string " Zzz... Kwoo...\n" - .string "Check which Pokémon?\0" - .align 2, 0 - - .global gUnknown_80D7E2C -gUnknown_80D7E2C: - .string " Zzz... Dwee...? Oops?{WAIT_PRESS}\n" - .string "Not enough money?\0" - .align 2, 0 - - .global gUnknown_80D7E58 -gUnknown_80D7E58: - .string " Zzz... Hunh?{WAIT_PRESS}\n" - .string "Sssnore... Sorry...\n" - .string "Fresh out of Friend Areas...\0" - .align 2, 0 - - .global gUnknown_80D7E9C -gUnknown_80D7E9C: - .string " Hunh...?{WAIT_PRESS}\n" - .string "You don{APOSTROPHE}t have any money...\n" - .string "Zzzzzz...\0" - .align 2, 0 - - .global gUnknown_80D7ED0 -gUnknown_80D7ED0: - .string " Zzz... Zzz?{WAIT_PRESS}\n" - .string "Hunh...?\n" - .string "You can{APOSTROPHE}t add to your Friend Areas...\0" - .align 2, 0 - - .global gUnknown_80D7F10 -gUnknown_80D7F10: - .string " Grats... Zzz...{WAIT_PRESS}\n" - .string "You can go to {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...{EXTRA_MSG}" - .string " Dwee... Sssnore...\n" - .string "Make friends with Pokémon in...\n" - .string "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...\0" - .align 2, 0 - - .global gUnknown_80D7F7C -gUnknown_80D7F7C: - .string " Zzz... Dwee... Gotcha...{WAIT_PRESS}\n" - .string "Zzz... Let{APOSTROPHE}s do it...{EXTRA_MSG}" - .string " Sssnore♪ Sssnore♪\n" - .string "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪\n" - .string "Let{APOSTROPHE}s be friends...{EXTRA_MSG}" - .string " Kwoo!\n" - .string "Taaaaaaah!\0" - .align 2, 0 - - .global gUnknown_80D8000 -gUnknown_80D8000: - .string " Kwoo? {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" - .string "That{APOSTROPHE}s {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n" - .string "OK?\0" - .align 2, 0 - - .global gUnknown_80D8030 -gUnknown_80D8030: - .string " Zzz... Wha--?\n" - .string "More Friend Areas?\0" - .align 2, 0 - - .global gUnknown_80D8054 -gUnknown_80D8054: - .string " Dwee... Hunh?\n" - .string "Friend Areas...?\n" - .string "Which one?\0" - .align 2, 0 - - .global gUnknown_80D8080 -gUnknown_80D8080: - .string " Thank... Zzz... You...\n" - .string "Friends{COMMA} friend...\0" - .align 2, 0 - - .global gUnknown_80D80B0 -gUnknown_80D80B0: - .string " Anything? Kwoo...\n" - .string "Anything else?\0" - .align 2, 0 - - .global gUnknown_80D80D4 -gUnknown_80D80D4: - .string " Friends... Zzz...\n" - .string "Welcome to the {ARG_POKEMON_6} Club...\0" - .align 2, 0 - - .global gUnknown_80D8104 -gUnknown_80D8104: - .string " Would you like to get more\n" - .string "friends...{WAIT_PRESS}\n" - .string "...More members for your team?{EXTRA_MSG}" - .string " To add new friends{COMMA} what\n" - .string "you need are Friend Areas.{EXTRA_MSG}" - .string " A Pokémon can join your\n" - .string "rescue team only after it settles in\n" - .string "the right Friend Area.{EXTRA_MSG}" - .string " So{COMMA} if you want to recruit\n" - .string "new members{COMMA} you should add to your\n" - .string "Friend Areas.{EXTRA_MSG}" - .string " Oh{COMMA} yes{COMMA} Pokémon can\n" - .string "only live in the right Friend Area for\n" - .string "their species.{EXTRA_MSG}" - .string " If you{APOSTROPHE}re buying a Friend\n" - .string "Area{COMMA} you should confirm what Pokémon\n" - .string "can live there by checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}.{EXTRA_MSG}" - .string " Also{COMMA} there are some Friend\n" - .string "Areas that I don{APOSTROPHE}t sell.{EXTRA_MSG}" - .string " I think there are some\n" - .string "rescue missions that give you access\n" - .string "to Friend Areas{COMMA} too.{EXTRA_MSG}" - .string " You should check the\n" - .string "Pelipper Post Office{APOSTROPHE}s Bulletin Board or\n" - .string "your Mailbox for rescue requests.{EXTRA_MSG}" - .string " You know{COMMA} it makes me\n" - .string "delighted when you make new friends!\0" - .align 2, 0 - - .global gUnknown_80D8420 -gUnknown_80D8420: - .string " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" - .string "I can{APOSTROPHE}t get that Friend Area for you.{WAIT_PRESS}\n" - .string "I{APOSTROPHE}m really sorry.\0" - .align 2, 0 - - .global gUnknown_80D8468 -gUnknown_80D8468: - .string " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" - .string "I don{APOSTROPHE}t know much about it at all.{WAIT_PRESS}\n" - .string "I{APOSTROPHE}ll check up on it.{EXTRA_MSG}" - .string " I{APOSTROPHE}ll add it to the Friend\n" - .string "Areas you can buy when I find out more.\0" - .align 2, 0 - - .global gUnknown_80D84F8 -gUnknown_80D84F8: - .string " You can already go to the\n" - .string "Friend Area {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}.\0" - .align 2, 0 - - .global gUnknown_80D8528 -gUnknown_80D8528: - .string " {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s Friend Area\n" - .string "is {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}.\0" - .align 2, 0 - - .global gUnknown_80D8550 -gUnknown_80D8550: - .string " Is there another Pokémon\n" - .string "you{APOSTROPHE}d like to check?\0" - .align 2, 0 - - .global gUnknown_80D8584 -gUnknown_80D8584: - .string " Which Pokémon would you\n" - .string "like to check?\0" - .align 2, 0 - - .global gUnknown_80D85AC -gUnknown_80D85AC: - .string " Oops?{WAIT_PRESS}\n" - .string "It doesn{APOSTROPHE}t look like you have enough\n" - .string "money!\0" - .align 2, 0 - - .global gUnknown_80D85E4 -gUnknown_80D85E4: - .string " Oops?{WAIT_PRESS}\n" - .string "Oh{COMMA} too bad.{WAIT_PRESS}\n" - .string "I{APOSTROPHE}m fresh out of Friend Areas.\0" - .align 2, 0 - - .global gUnknown_80D8620 -gUnknown_80D8620: - .string " Um?{WAIT_PRESS}\n" - .string "You don{APOSTROPHE}t have any money.\0" - .align 2, 0 - - .global gUnknown_80D8644 -gUnknown_80D8644: - .string " Oops!{WAIT_PRESS}\n" - .string "You can{APOSTROPHE}t add to your Friend Areas.\0" - .align 2, 0 - - .global gUnknown_80D8674 -gUnknown_80D8674: - .string " Congratulations!{WAIT_PRESS}\n" - .string "You can go to {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1} now!{EXTRA_MSG}" - .string " You can recruit\n" - .string "Pokémon that live in the Friend Area\n" - .string "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}.\0" - .align 2, 0 - - .global gUnknown_80D86E4 -gUnknown_80D86E4: - .string " Gotcha! Let{APOSTROPHE}s do it!{WAIT_PRESS}\n" - .string "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪{WAIT_PRESS}\n" - .string "Let{APOSTROPHE}s be friends... Yoomtaaaaaaah!\0" - .align 2, 0 - - .global gUnknown_80D8738 -gUnknown_80D8738: - .string " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" - .string "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" - .string "Is that OK?\0" - .align 2, 0 - - .global gUnknown_80D876C -gUnknown_80D876C: - .string " Would you like to add\n" - .string "other Friend Areas?\0" - .align 2, 0 - - .global gUnknown_80D8798 -gUnknown_80D8798: - .string " You{APOSTROPHE}d like to add to your\n" - .string "Friend Areas?\n" - .string "Which one would you like?\0" - .align 2, 0 - - .global gUnknown_80D87E0 -gUnknown_80D87E0: - .string " Thank you! Come again!\n" - .string "We{APOSTROPHE}re all friends{COMMA} friend!\0" - .align 2, 0 - - .global gUnknown_80D8818 -gUnknown_80D8818: - .string " Anything else I can do for\n" - .string "you?\0" - .align 2, 0 - - .global gUnknown_80D883C -gUnknown_80D883C: - .string " Friends are my treasures!\n" - .string "Welcome to the {ARG_POKEMON_6} Club--\n" - .string "a circle of friends! \0" - .align 2, 0 - - - - - - - - - - - - - .global gCommonGulpin gCommonGulpin: @ 80D8888 (Gulpin Link Shop) .4byte gUnknown_80D9F74 diff --git a/include/common_strings.h b/include/common_strings.h index d5e31a5ad..79bded698 100644 --- a/include/common_strings.h +++ b/include/common_strings.h @@ -4,13 +4,8 @@ #include "constants/common_strings_felicity_bank.h" #include "constants/common_strings_kangaskhan_storage.h" #include "constants/common_strings_kecleon_bros.h" +#include "constants/common_strings_wigglytuff_shop.h" -enum WigglytuffShopMode -{ - WIGGLYTUFF_SHOP_MODE_AWAKE, - WIGGLYTUFF_SHOP_MODE_ASLEEP, - WIGGLYTUFF_SHOP_MODE_COUNT -}; enum GulpinShopMode { GULPIN_SHOP_MODE_AWAKE, @@ -54,7 +49,7 @@ extern const u8* const gCommonWithdrawPrompt[]; extern const u8* const gCommonFelicity[FEL_MODE_COUNT][FEL_DLG_MAX]; extern const u8* const gCommonKangStorage[KANG_MODE_COUNT][KANG_DLG_MAX]; extern const u8* const gCommonKecleonBros[KECLEON_BROS_MODE_COUNT][KECLEON_DLG_MAX]; -extern const u8* const gCommonWigglytuff[WIGGLYTUFF_SHOP_MODE_COUNT][20]; // 80D79A4 +extern const u8* const gCommonWigglytuff[WIGGLYTUFF_SHOP_MODE_COUNT][WIGGLY_DLG_MAX]; extern const u8* const gCommonGulpin[GULPIN_SHOP_MODE_COUNT][25]; // 80D8888 extern const u8* const gCommonMakuhita[MAKUHITA_DOJO_MODE_COUNT][10]; // 80D9FC8 extern const Hints gCommonHints[MAX_HINTS]; // 80DAA98 diff --git a/include/constants/common_strings_wigglytuff_shop.h b/include/constants/common_strings_wigglytuff_shop.h new file mode 100644 index 000000000..91010a937 --- /dev/null +++ b/include/constants/common_strings_wigglytuff_shop.h @@ -0,0 +1,35 @@ +#ifndef GUARD_COMMON_STRINGS_WIGGLYTUFF_SHOP_H +#define GUARD_COMMON_STRINGS_WIGGLYTUFF_SHOP_H + +enum WigglytuffShopMode +{ + WIGGLYTUFF_SHOP_MODE_AWAKE, + WIGGLYTUFF_SHOP_MODE_ASLEEP, + WIGGLYTUFF_SHOP_MODE_COUNT +}; +enum WigglytuffShopDialogue +{ + WIGGLY_DLG_00, + WIGGLY_DLG_01, + WIGGLY_DLG_02, + WIGGLY_DLG_03, + WIGGLY_DLG_04, + WIGGLY_DLG_05, + WIGGLY_DLG_06, + WIGGLY_DLG_07, + WIGGLY_DLG_08, + WIGGLY_DLG_09, + WIGGLY_DLG_10, + WIGGLY_DLG_11, + WIGGLY_DLG_12, + WIGGLY_DLG_13, + WIGGLY_DLG_14, + WIGGLY_DLG_15, + WIGGLY_DLG_16, + WIGGLY_DLG_17, + WIGGLY_DLG_18, + WIGGLY_DLG_19, + WIGGLY_DLG_MAX +}; + +#endif // GUARD_COMMON_STRINGS_WIGGLYTUFF_SHOP_H \ No newline at end of file diff --git a/src/common_strings.c b/src/common_strings.c index b318b5b48..ce9397446 100644 --- a/src/common_strings.c +++ b/src/common_strings.c @@ -60,4 +60,5 @@ ALIGNED(4) const u8* const gCommonWithdrawPrompt[] = { sWithdrawPrompt0 }; #include "data/common_strings_felicity_bank.h" #include "data/common_strings_kangaskhan_storage.h" -#include "data/common_strings_kecleon_bros.h" \ No newline at end of file +#include "data/common_strings_kecleon_bros.h" +#include "data/common_strings_wigglytuff_shop.h" \ No newline at end of file diff --git a/src/data/common_strings_wigglytuff_shop.h b/src/data/common_strings_wigglytuff_shop.h new file mode 100644 index 000000000..532b0baca --- /dev/null +++ b/src/data/common_strings_wigglytuff_shop.h @@ -0,0 +1,320 @@ +static const u8 gUnknown_80D7A44[]; +static const u8 gUnknown_80D7C94[]; +static const u8 gUnknown_80D7CE8[]; +static const u8 gUnknown_80D7D64[]; +static const u8 gUnknown_80D7DA0[]; +static const u8 gUnknown_80D7DE0[]; +static const u8 gUnknown_80D7E04[]; +static const u8 gUnknown_80D7E2C[]; +static const u8 gUnknown_80D7E58[]; +static const u8 gUnknown_80D7E9C[]; +static const u8 gUnknown_80D7ED0[]; +static const u8 gUnknown_80D7F10[]; +static const u8 gUnknown_80D7F7C[]; +static const u8 gUnknown_80D8000[]; +static const u8 gUnknown_80D8030[]; +static const u8 gUnknown_80D8054[]; +static const u8 gUnknown_80D8080[]; +static const u8 gUnknown_80D80B0[]; +static const u8 gUnknown_80D80D4[]; +static const u8 gUnknown_80D8104[]; +static const u8 gUnknown_80D8420[]; +static const u8 gUnknown_80D8468[]; +static const u8 gUnknown_80D84F8[]; +static const u8 gUnknown_80D8528[]; +static const u8 gUnknown_80D8550[]; +static const u8 gUnknown_80D8584[]; +static const u8 gUnknown_80D85AC[]; +static const u8 gUnknown_80D85E4[]; +static const u8 gUnknown_80D8620[]; +static const u8 gUnknown_80D8644[]; +static const u8 gUnknown_80D8674[]; +static const u8 gUnknown_80D86E4[]; +static const u8 gUnknown_80D8738[]; +static const u8 gUnknown_80D876C[]; +static const u8 gUnknown_80D8798[]; +static const u8 gUnknown_80D87E0[]; +static const u8 gUnknown_80D8818[]; +static const u8 gUnknown_80D883C[]; + +ALIGNED(4) const u8* const gCommonWigglytuff[WIGGLYTUFF_SHOP_MODE_COUNT][WIGGLY_DLG_MAX] = +{ + [WIGGLYTUFF_SHOP_MODE_AWAKE] = { + [WIGGLY_DLG_00] = gUnknown_80D883C, + [WIGGLY_DLG_01] = gUnknown_80D8818, + [WIGGLY_DLG_02] = gUnknown_80D87E0, + [WIGGLY_DLG_03] = gUnknown_80D8798, + [WIGGLY_DLG_04] = gUnknown_80D876C, + [WIGGLY_DLG_05] = gUnknown_80D8738, + [WIGGLY_DLG_06] = gUnknown_80D86E4, + [WIGGLY_DLG_07] = gUnknown_80D8674, + [WIGGLY_DLG_08] = gUnknown_80D8644, + [WIGGLY_DLG_09] = gUnknown_80D8620, + [WIGGLY_DLG_10] = gUnknown_80D85E4, + [WIGGLY_DLG_11] = gUnknown_80D85AC, + [WIGGLY_DLG_12] = gUnknown_80D8584, + [WIGGLY_DLG_13] = gUnknown_80D8550, + [WIGGLY_DLG_14] = gUnknown_80D8528, + [WIGGLY_DLG_15] = gUnknown_80D84F8, + [WIGGLY_DLG_16] = gUnknown_80D8468, + [WIGGLY_DLG_17] = gUnknown_80D8420, + [WIGGLY_DLG_18] = gUnknown_80D8420, + [WIGGLY_DLG_19] = gUnknown_80D8104 + }, + [WIGGLYTUFF_SHOP_MODE_ASLEEP] = { + [WIGGLY_DLG_00] = gUnknown_80D80D4, + [WIGGLY_DLG_01] = gUnknown_80D80B0, + [WIGGLY_DLG_02] = gUnknown_80D8080, + [WIGGLY_DLG_03] = gUnknown_80D8054, + [WIGGLY_DLG_04] = gUnknown_80D8030, + [WIGGLY_DLG_05] = gUnknown_80D8000, + [WIGGLY_DLG_06] = gUnknown_80D7F7C, + [WIGGLY_DLG_07] = gUnknown_80D7F10, + [WIGGLY_DLG_08] = gUnknown_80D7ED0, + [WIGGLY_DLG_09] = gUnknown_80D7E9C, + [WIGGLY_DLG_10] = gUnknown_80D7E58, + [WIGGLY_DLG_11] = gUnknown_80D7E2C, + [WIGGLY_DLG_12] = gUnknown_80D7E04, + [WIGGLY_DLG_13] = gUnknown_80D7DE0, + [WIGGLY_DLG_14] = gUnknown_80D7DA0, + [WIGGLY_DLG_15] = gUnknown_80D7D64, + [WIGGLY_DLG_16] = gUnknown_80D7CE8, + [WIGGLY_DLG_17] = gUnknown_80D7C94, + [WIGGLY_DLG_18] = gUnknown_80D7C94, + [WIGGLY_DLG_19] = gUnknown_80D7A44 + } +}; + +ALIGNED(4) static const u8 gUnknown_80D7A44[] = _( + " Zzz...\n" + "Want more friends?{EXTRA_MSG}" + " Zzz... Kwoo...\n" + "You need Friend Areas for friends...{EXTRA_MSG}" + " Zzz... Zzz...\n" + "A Pokémon becomes your pal when it{APOSTROPHE}s in\n" + "the right Friend Area...{EXTRA_MSG}" + " Zzz... Dwee...\n" + "That{APOSTROPHE}s why you should get more Friend\n" + "Areas...{EXTRA_MSG}" + " Zzz... Pokémon can only\n" + "live in the right Friend Area for\n" + "their species...{EXTRA_MSG}" + " Kwoo... Sssnore...\n" + "See what Pokémon can live there by\n" + "checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}...{EXTRA_MSG}" + " Zzz...\n" + "I don{APOSTROPHE}t sell some Friend Areas...{EXTRA_MSG}" + " Kwoo...\n" + "Some rescue missions reward you with\n" + "Friend Areas...{EXTRA_MSG}" + " Zzz... Dwee...\n" + "Check the Pelipper Post Office{APOSTROPHE}s Bulletin\n" + "Board or your Mailbox for missions..."); + +ALIGNED(4) static const u8 gUnknown_80D7C94[] = _( + " Sssnore...\n" + "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...?\n" + "I can{APOSTROPHE}t get that Friend Area...{EXTRA_MSG}" + " Zzz... Zzz...\n" + "Sorry..."); + +ALIGNED(4) static const u8 gUnknown_80D7CE8[] = _( + " Zzz... Hunh...?\n" + "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...?\n" + "I don{APOSTROPHE}t know... I{APOSTROPHE}ll check...{EXTRA_MSG}" + " Sssnore...\n" + "I{APOSTROPHE}ll have it for sale...\n" + "When I find out..."); + +ALIGNED(4) static const u8 gUnknown_80D7D64[] = _( + " Sssnore...\n" + "You can already go...\n" + "Friend Area {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}..."); + +ALIGNED(4) static const u8 gUnknown_80D7DA0[] = _( + " Dwee... Kwoo...\n" + "{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s Friend Area...\n" + "Zzz... {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}..."); + +ALIGNED(4) static const u8 gUnknown_80D7DE0[] = _( + " Another Pokémon...\n" + "Zzz... Check?"); + +ALIGNED(4) static const u8 gUnknown_80D7E04[] = _( + " Zzz... Kwoo...\n" + "Check which Pokémon?"); + +ALIGNED(4) static const u8 gUnknown_80D7E2C[] = _( + " Zzz... Dwee...? Oops?{WAIT_PRESS}\n" + "Not enough money?"); + +ALIGNED(4) static const u8 gUnknown_80D7E58[] = _( + " Zzz... Hunh?{WAIT_PRESS}\n" + "Sssnore... Sorry...\n" + "Fresh out of Friend Areas..."); + +ALIGNED(4) static const u8 gUnknown_80D7E9C[] = _( + " Hunh...?{WAIT_PRESS}\n" + "You don{APOSTROPHE}t have any money...\n" + "Zzzzzz..."); + +ALIGNED(4) static const u8 gUnknown_80D7ED0[] = _( + " Zzz... Zzz?{WAIT_PRESS}\n" + "Hunh...?\n" + "You can{APOSTROPHE}t add to your Friend Areas..."); + +ALIGNED(4) static const u8 gUnknown_80D7F10[] = _( + " Grats... Zzz...{WAIT_PRESS}\n" + "You can go to {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}...{EXTRA_MSG}" + " Dwee... Sssnore...\n" + "Make friends with Pokémon in...\n" + "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}..."); + +ALIGNED(4) static const u8 gUnknown_80D7F7C[] = _( + " Zzz... Dwee... Gotcha...{WAIT_PRESS}\n" + "Zzz... Let{APOSTROPHE}s do it...{EXTRA_MSG}" + " Sssnore♪ Sssnore♪\n" + "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪\n" + "Let{APOSTROPHE}s be friends...{EXTRA_MSG}" + " Kwoo!\n" + "Taaaaaaah!"); + +ALIGNED(4) static const u8 gUnknown_80D8000[] = _( + " Kwoo? {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" + "That{APOSTROPHE}s {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n" + "OK?"); + +ALIGNED(4) static const u8 gUnknown_80D8030[] = _( + " Zzz... Wha--?\n" + "More Friend Areas?"); + +ALIGNED(4) static const u8 gUnknown_80D8054[] = _( + " Dwee... Hunh?\n" + "Friend Areas...?\n" + "Which one?"); + +ALIGNED(4) static const u8 gUnknown_80D8080[] = _( + " Thank... Zzz... You...\n" + "Friends{COMMA} friend..."); + +ALIGNED(4) static const u8 gUnknown_80D80B0[] = _( + " Anything? Kwoo...\n" + "Anything else?"); + +ALIGNED(4) static const u8 gUnknown_80D80D4[] = _( + " Friends... Zzz...\n" + "Welcome to the {ARG_POKEMON_6} Club..."); + +ALIGNED(4) static const u8 gUnknown_80D8104[] = _( + " Would you like to get more\n" + "friends...{WAIT_PRESS}\n" + "...More members for your team?{EXTRA_MSG}" + " To add new friends{COMMA} what\n" + "you need are Friend Areas.{EXTRA_MSG}" + " A Pokémon can join your\n" + "rescue team only after it settles in\n" + "the right Friend Area.{EXTRA_MSG}" + " So{COMMA} if you want to recruit\n" + "new members{COMMA} you should add to your\n" + "Friend Areas.{EXTRA_MSG}" + " Oh{COMMA} yes{COMMA} Pokémon can\n" + "only live in the right Friend Area for\n" + "their species.{EXTRA_MSG}" + " If you{APOSTROPHE}re buying a Friend\n" + "Area{COMMA} you should confirm what Pokémon\n" + "can live there by checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}.{EXTRA_MSG}" + " Also{COMMA} there are some Friend\n" + "Areas that I don{APOSTROPHE}t sell.{EXTRA_MSG}" + " I think there are some\n" + "rescue missions that give you access\n" + "to Friend Areas{COMMA} too.{EXTRA_MSG}" + " You should check the\n" + "Pelipper Post Office{APOSTROPHE}s Bulletin Board or\n" + "your Mailbox for rescue requests.{EXTRA_MSG}" + " You know{COMMA} it makes me\n" + "delighted when you make new friends!"); + +ALIGNED(4) static const u8 gUnknown_80D8420[] = _( + " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" + "I can{APOSTROPHE}t get that Friend Area for you.{WAIT_PRESS}\n" + "I{APOSTROPHE}m really sorry."); + +ALIGNED(4) static const u8 gUnknown_80D8468[] = _( + " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" + "I don{APOSTROPHE}t know much about it at all.{WAIT_PRESS}\n" + "I{APOSTROPHE}ll check up on it.{EXTRA_MSG}" + " I{APOSTROPHE}ll add it to the Friend\n" + "Areas you can buy when I find out more."); + +ALIGNED(4) static const u8 gUnknown_80D84F8[] = _( + " You can already go to the\n" + "Friend Area {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + +ALIGNED(4) static const u8 gUnknown_80D8528[] = _( + " {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s Friend Area\n" + "is {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + +ALIGNED(4) static const u8 gUnknown_80D8550[] = _( + " Is there another Pokémon\n" + "you{APOSTROPHE}d like to check?"); + +ALIGNED(4) static const u8 gUnknown_80D8584[] = _( + " Which Pokémon would you\n" + "like to check?"); + +ALIGNED(4) static const u8 gUnknown_80D85AC[] = _( + " Oops?{WAIT_PRESS}\n" + "It doesn{APOSTROPHE}t look like you have enough\n" + "money!"); + +ALIGNED(4) static const u8 gUnknown_80D85E4[] = _( + " Oops?{WAIT_PRESS}\n" + "Oh{COMMA} too bad.{WAIT_PRESS}\n" + "I{APOSTROPHE}m fresh out of Friend Areas."); + +ALIGNED(4) static const u8 gUnknown_80D8620[] = _( + " Um?{WAIT_PRESS}\n" + "You don{APOSTROPHE}t have any money."); + +ALIGNED(4) static const u8 gUnknown_80D8644[] = _( + " Oops!{WAIT_PRESS}\n" + "You can{APOSTROPHE}t add to your Friend Areas."); + +ALIGNED(4) static const u8 gUnknown_80D8674[] = _( + " Congratulations!{WAIT_PRESS}\n" + "You can go to {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1} now!{EXTRA_MSG}" + " You can recruit\n" + "Pokémon that live in the Friend Area\n" + "{COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}."); + +ALIGNED(4) static const u8 gUnknown_80D86E4[] = _( + " Gotcha! Let{APOSTROPHE}s do it!{WAIT_PRESS}\n" + "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪{WAIT_PRESS}\n" + "Let{APOSTROPHE}s be friends... Yoomtaaaaaaah!"); + +ALIGNED(4) static const u8 gUnknown_80D8738[] = _( + " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n" + "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n" + "Is that OK?"); + +ALIGNED(4) static const u8 gUnknown_80D876C[] = _( + " Would you like to add\n" + "other Friend Areas?"); + +ALIGNED(4) static const u8 gUnknown_80D8798[] = _( + " You{APOSTROPHE}d like to add to your\n" + "Friend Areas?\n" + "Which one would you like?"); + +ALIGNED(4) static const u8 gUnknown_80D87E0[] = _( + " Thank you! Come again!\n" + "We{APOSTROPHE}re all friends{COMMA} friend!"); + +ALIGNED(4) static const u8 gUnknown_80D8818[] = _( + " Anything else I can do for\n" + "you?"); + +ALIGNED(4) static const u8 gUnknown_80D883C[] = _( + " Friends are my treasures!\n" + "Welcome to the {ARG_POKEMON_6} Club--\n" + "a circle of friends! "); \ No newline at end of file diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index 5d9e74749..4b0ea5b83 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -166,45 +166,45 @@ static void UpdateWigglytuffDialogue(void) switch (sWigglytuffShop3Work->state) { case WIGGLYTUFF_INIT: sub_80222C8(); - sub_8014248(gCommonWigglytuff[sWigglytuffShop3Work->mode][0], 0, sWigglytuffShop3Work->menuAction1, sWigglytuffShop3Work->unk1C, sWigglytuffShop3Work->unk5C, 4, 0, sWigglytuffShop3Work->unkCC, 12); + sub_8014248(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_00], 0, sWigglytuffShop3Work->menuAction1, sWigglytuffShop3Work->unk1C, sWigglytuffShop3Work->unk5C, 4, 0, sWigglytuffShop3Work->unkCC, 12); break; case WIGGLYTUFF_MAIN_MENU: sub_80222C8(); - sub_8014248(gCommonWigglytuff[sWigglytuffShop3Work->mode][1], 0, sWigglytuffShop3Work->menuAction1, sWigglytuffShop3Work->unk1C, sWigglytuffShop3Work->unk5C, 4, 0, sWigglytuffShop3Work->unkCC, 12); + sub_8014248(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_01], 0, sWigglytuffShop3Work->menuAction1, sWigglytuffShop3Work->unk1C, sWigglytuffShop3Work->unk5C, 4, 0, sWigglytuffShop3Work->unkCC, 12); break; case FRIEND_AREA_SELECT_BUY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNK9; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][3], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_03], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case FRIEND_AREA_SELECT_BUY_AGAIN: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKA; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][4], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_04], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_INFO: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_MAIN_MENU; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][19], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_19], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_PRE_EXIT: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_EXIT; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][2], 0, sWigglytuffShop3Work->unkCC, 0x30d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_02], 0, sWigglytuffShop3Work->unkCC, 0x30d); break; default: break; case WIGGLYTUFF_CANT_ADD_FRIEND_AREA: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_PRE_EXIT; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][8], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_08], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case NO_MONEY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKA; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][9], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_09], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case NO_FRIEND_AREAS: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_PRE_EXIT; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][10], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_10], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case NOT_ENOUGH_MONEY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKA; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][11], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_11], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_UNK9: sub_80211AC(2, 3); @@ -224,7 +224,7 @@ static void UpdateWigglytuffDialogue(void) CreateWigglytuffConfirmFriendAreaMenu(); sub_8092578(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); gUnknown_202DE30[0] = sWigglytuffShop3Work->friendAreaPrice; - sub_8014248(gCommonWigglytuff[sWigglytuffShop3Work->mode][5], 0, 5, sWigglytuffShop3Work->unk1C, 0, 4, 0, sWigglytuffShop3Work->unkCC, 12); + sub_8014248(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_05], 0, 5, sWigglytuffShop3Work->unk1C, 0, 4, 0, sWigglytuffShop3Work->unkCC, 12); break; case FRIEND_AREA_INFO: sub_8021774(sWigglytuffShop3Work->chosenFriendArea, FALSE, 2); @@ -232,7 +232,7 @@ static void UpdateWigglytuffDialogue(void) case CONFIRM_BUY_FRIEND_AREA: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKD; sub_8092578(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][6], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_06], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_UNKD: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKE; @@ -252,15 +252,15 @@ static void UpdateWigglytuffDialogue(void) sWigglytuffShop3Work->fallbackState = FRIEND_AREA_SELECT_BUY_AGAIN; PlaySound(206); - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][7], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_07], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNK16; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][12], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_12], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_AGAIN: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNK17; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][13], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_13], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_UNK16: sub_8023144(0, 3, 0, 10); @@ -296,23 +296,23 @@ static void UpdateWigglytuffDialogue(void) string = GetMonSpecies(sWigglytuffShop3Work->chosenSpecies); strcpy(gAvailablePokemonNames, string); sub_8092578(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][14], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_14], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_HAS_FRIEND_AREA: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][15], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_15], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_POST_GAME: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][16], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_16], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_WONDER_MAIL: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][17], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_17], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_LEGENDARY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][18], 0, sWigglytuffShop3Work->unkCC, 0x10d); + sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_18], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; } }