diff --git a/data/common_strings.s b/data/common_strings.s index 37d282884..5873ca04f 100644 --- a/data/common_strings.s +++ b/data/common_strings.s @@ -1,160 +1,6 @@ .section .rodata -@ START [some global strings. Probably had many entries per ptr because of languages, but USA release is english-only. Check other roms] .align 2,0 -.string "pksdir0\0" - - .global Yes_80D491C - Yes_80D491C: - .string "Yes\0" - - .global gCommonYes -gCommonYes: @ 80D4920 - .4byte Yes_80D491C - - .global No_80D4924 - No_80D4924: - .string "No\0" - .align 2,0 - - .global gCommonNo -gCommonNo: @ 80D4928 - .4byte No_80D4924 - - .global CancelText - CancelText: - .string "Cancel\0" - .align 2,0 - - .global gCommonCancel -gCommonCancel: @ 80D4934 - .4byte CancelText - - .global TrashText - TrashText: - .string "Trash \0" - .align 2,0 - - .global gCommonTrash -gCommonTrash: @ 80D4940 - .4byte TrashText - - .global DeleteText - DeleteText: - .string "Delete\0" - .align 2,0 - - .global gCommonDelete -gCommonDelete: @ 80D494C - .4byte DeleteText - - .global StoreText - StoreText: - .string "Store\0" - .align 2,0 - - .global gCommonStore -gCommonStore: @ 80D4958 - .4byte StoreText - - .global TakeText - TakeText: - .string "Take\0" - .align 2,0 - - .global gCommonTake -gCommonTake: @ 80D4964 - .4byte TakeText - - .global InfoText - InfoText: - .string "Info\0" - .align 2,0 - - .global gCommonInfo -gCommonInfo: @ 80D4970 - .4byte InfoText - - .global BuyText - BuyText: - .string "Buy\0" - .align 2,0 - - .global gCommonBuy -gCommonBuy: @ 80D4978 - .4byte BuyText - - .global SellText - SellText: - .string "Sell \0" - .align 2,0 - - .global gCommonSell -gCommonSell: @ 80D4984 - .4byte SellText - - .global AcceptText - AcceptText: - .string "Accept\0" - .align 2,0 - - .global gCommonAccept -gCommonAccept: @ 80D4990 - .4byte AcceptText - - .global WigglytuffCheck - WigglytuffCheck: - .string "Check\0" - .align 2,0 - - .global gCommonCheck -gCommonCheck: @ 80D499C - .4byte WigglytuffCheck - - .global FriendText - FriendText: - .string "Friend\0" - .align 2,0 - - .global gCommonFriend -gCommonFriend: @ 80D49A8 - .4byte FriendText - - .global ExitText - ExitText: - .string "Exit\0" - .align 2,0 - - .global gCommonExit -gCommonExit: @ 80D49B4 - .4byte ExitText - - .global QuestionMarkText - QuestionMarkText: - .string "???\0" - .align 2,0 - - .global gCommonTripleQuestionMark -gCommonTripleQuestionMark: @ 80D49BC - .4byte QuestionMarkText - - .global FelicityDeposit - FelicityDeposit: - .string "Deposit?\0" - .align 2,0 - - .global gCommonDepositPrompt -gCommonDepositPrompt: @ 80D49CC - .4byte FelicityDeposit - - .global FelicityWithdraw - FelicityWithdraw: - .string "Withdraw?\0" - .align 2,0 - - .global gCommonWithdrawPrompt -gCommonWithdrawPrompt: @ 80D49DC - .4byte FelicityWithdraw .global gCommonFelicity gCommonFelicity: @ 80D49E0 (Felicity Bank Dialogue) @@ -2618,6 +2464,4 @@ gUnknown_80DAEE0: .global gUnknown_80DAF54 gUnknown_80DAF54: - .string "Controls in Town 1\0" - -@ END [some global strings] \ No newline at end of file + .string "Controls in Town 1\0" \ No newline at end of file diff --git a/include/common_strings.h b/include/common_strings.h index e37a1fddf..55cca48af 100644 --- a/include/common_strings.h +++ b/include/common_strings.h @@ -1,6 +1,18 @@ #ifndef GUARD_COMMON_STRINGS_H #define GUARD_COMMON_STRINGS_H +enum FelicityBankMode +{ + FELICITY_BANK_MODE_AWAKE, + FELICITY_BANK_MODE_ASLEEP, + FELICITY_BANK_MODE_COUNT +}; +enum KangaskhanStorageMode +{ + KANGASKHAN_STORAGE_MODE_AWAKE, + KANGASKHAN_STORAGE_MODE_ASLEEP, + KANGASKHAN_STORAGE_MODE_COUNT +}; enum KecleonBrosMode { KECLEON_BROS_MODE_ITEMS_AWAKE, @@ -9,6 +21,24 @@ enum KecleonBrosMode KECLEON_BROS_MODE_WARES_ASLEEP, KECLEON_BROS_MODE_COUNT }; +enum WigglytuffShopMode +{ + WIGGLYTUFF_SHOP_MODE_AWAKE, + WIGGLYTUFF_SHOP_MODE_ASLEEP, + WIGGLYTUFF_SHOP_MODE_COUNT +}; +enum GulpinShopMode +{ + GULPIN_SHOP_MODE_AWAKE, + GULPIN_SHOP_MODE_ASLEEP, + GULPIN_SHOP_MODE_COUNT +}; +enum MakuhitaDojoMode +{ + MAKUHITA_DOJO_MODE_AWAKE, + MAKUHITA_DOJO_MODE_ASLEEP, + MAKUHITA_DOJO_MODE_COUNT +}; #define MAX_HINTS 5 @@ -19,30 +49,30 @@ typedef struct Hints const u8 *body; } Hints; -extern const u8 *gCommonYes[]; // 80D4920 -extern const u8 *gCommonNo[]; // 80D4928 -extern const u8 *gCommonCancel[]; // 80D4934 -extern const u8 *gCommonTrash[]; // 80D4940 -extern const u8 *gCommonDelete[]; // 80D494C -extern const u8 *gCommonStore[]; // 80D4958 -extern const u8 *gCommonTake[]; // 80D4964 -extern const u8 *gCommonInfo[]; // 80D4970 -extern const u8 *gCommonBuy[]; // 80D4978 -extern const u8 *gCommonSell[]; // 80D4984 -extern const u8 *gCommonAccept[]; // 80D4990 -extern const u8 *gCommonCheck[]; // 80D499C -extern const u8 *gCommonFriend[]; // 80D49A8 -extern const u8 *gCommonExit[]; // 80D49B4 -extern const u8 *gCommonTripleQuestionMark[]; // 80D49BC -extern const u8 *gCommonDepositPrompt[]; // 80D49CC -extern const u8 *gCommonWithdrawPrompt[]; // 80D49DC +extern const u8* const gCommonYes[]; +extern const u8* const gCommonNo[]; +extern const u8* const gCommonCancel[]; +extern const u8* const gCommonTrash[]; +extern const u8* const gCommonDelete[]; +extern const u8* const gCommonStore[]; +extern const u8* const gCommonTake[]; +extern const u8* const gCommonInfo[]; +extern const u8* const gCommonBuy[]; +extern const u8* const gCommonSell[]; +extern const u8* const gCommonAccept[]; +extern const u8* const gCommonCheck[]; +extern const u8* const gCommonFriend[]; +extern const u8* const gCommonExit[]; +extern const u8* const gCommonTripleQuestionMark[]; +extern const u8* const gCommonDepositPrompt[]; +extern const u8* const gCommonWithdrawPrompt[]; -extern const u8 *gCommonFelicity[2][15]; // 80D49E0 -extern const u8 *gCommonKangaskhanStorage[2][20]; // 80D5404 +extern const u8 *gCommonFelicity[FELICITY_BANK_MODE_COUNT][15]; // 80D49E0 +extern const u8 *gCommonKangaskhanStorage[KANGASKHAN_STORAGE_MODE_COUNT][20]; // 80D5404 extern const u8 *gCommonKecleonBros[KECLEON_BROS_MODE_COUNT][23]; // 80D5EC8 -extern const u8 *gCommonWigglytuff[2][20]; // 80D79A4 -extern const u8 *gCommonGulpin[2][25]; // 80D8888 -extern const u8 *gCommonMakuhita[2][10]; // 80D9FC8 +extern const u8 *gCommonWigglytuff[WIGGLYTUFF_SHOP_MODE_COUNT][20]; // 80D79A4 +extern const u8 *gCommonGulpin[GULPIN_SHOP_MODE_COUNT][25]; // 80D8888 +extern const u8 *gCommonMakuhita[MAKUHITA_DOJO_MODE_COUNT][10]; // 80D9FC8 extern const Hints gCommonHints[MAX_HINTS]; // 80DAA98 #endif // GUARD_COMMON_STRINGS_H \ No newline at end of file diff --git a/include/makuhita_dojo1.h b/include/makuhita_dojo1.h index ea9495d1c..a5b1cabb0 100644 --- a/include/makuhita_dojo1.h +++ b/include/makuhita_dojo1.h @@ -5,22 +5,22 @@ #include "menu.h" #include "text.h" -enum MakuhitaDojoMode +enum MakuhitaDojoInitMode { - MAKUHITA_DOJO_MODE_UNK0_AWAKE = 0, - MAKUHITA_DOJO_MODE_UNK1_AWAKE = 1, - MAKUHITA_DOJO_MODE_UNK2_AWAKE = 2, - MAKUHITA_DOJO_MODE_UNK3_AWAKE = 3, - MAKUHITA_DOJO_MODE_UNK4_ASLEEP = 4, - MAKUHITA_DOJO_MODE_UNK5_ASLEEP = 5, - MAKUHITA_DOJO_MODE_UNK6_ASLEEP = 6, - MAKUHITA_DOJO_MODE_UNK7_ASLEEP = 7, + MAKUHITA_DOJO_INIT_MODE_UNK0_AWAKE = 0, + MAKUHITA_DOJO_INIT_MODE_UNK1_AWAKE = 1, + MAKUHITA_DOJO_INIT_MODE_UNK2_AWAKE = 2, + MAKUHITA_DOJO_INIT_MODE_UNK3_AWAKE = 3, + MAKUHITA_DOJO_INIT_MODE_UNK4_ASLEEP = 4, + MAKUHITA_DOJO_INIT_MODE_UNK5_ASLEEP = 5, + MAKUHITA_DOJO_INIT_MODE_UNK6_ASLEEP = 6, + MAKUHITA_DOJO_INIT_MODE_UNK7_ASLEEP = 7, }; // size: 0xCC typedef struct MakuhitaDojoWork1 { - /* 0x0 */ u32 mode; // Corresponds to the enum: MakuhitaDojoMode + /* 0x0 */ u32 mode; // Corresponds to the enum: MakuhitaDojoInitMode /* 0x4 */ bool32 isAsleep; /* 0x8 */ s32 state; /* 0xC */ s32 fallbackState; diff --git a/ld_script.txt b/ld_script.txt index 8af8a0db3..d0ba2d31a 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -401,6 +401,7 @@ SECTIONS { src/quick_save_write.o(.rodata); src/menu_input.o(.rodata); data/data_80D47B8.o(.rodata); + src/common_strings.o(.rodata); data/common_strings.o(.rodata); data/data_80DAF70.o(.rodata); src/felicity_bank.o(.rodata); diff --git a/src/common_strings.c b/src/common_strings.c new file mode 100644 index 000000000..765ab36aa --- /dev/null +++ b/src/common_strings.c @@ -0,0 +1,57 @@ +#include "global.h" +#include "common_strings.h" + +ALIGNED(4) static const u8 sFill[] = _("pksdir0"); + +// Probably had many entries per ptr because of languages, but USA release is english-only. Check other roms + +ALIGNED(4) static const u8 sYes0[] = _("Yes"); +ALIGNED(4) const u8* const gCommonYes[] = { sYes0 }; + +ALIGNED(4) static const u8 sNo0[] = _("No"); +ALIGNED(4) const u8* const gCommonNo[] = { sNo0 }; + +ALIGNED(4) static const u8 sCancel0[] = _("Cancel"); +ALIGNED(4) const u8* const gCommonCancel[] = { sCancel0 }; + +ALIGNED(4) static const u8 sTrash0[] = _("Trash "); +ALIGNED(4) const u8* const gCommonTrash[] = { sTrash0 }; + +ALIGNED(4) static const u8 sDelete0[] = _("Delete"); +ALIGNED(4) const u8* const gCommonDelete[] = { sDelete0 }; + +ALIGNED(4) static const u8 sStore0[] = _("Store"); +ALIGNED(4) const u8* const gCommonStore[] = { sStore0 }; + +ALIGNED(4) static const u8 sTake0[] = _("Take"); +ALIGNED(4) const u8* const gCommonTake[] = { sTake0 }; + +ALIGNED(4) static const u8 sInfo0[] = _("Info"); +ALIGNED(4) const u8* const gCommonInfo[] = { sInfo0 }; + +ALIGNED(4) static const u8 sBuy0[] = _("Buy"); +ALIGNED(4) const u8* const gCommonBuy[] = { sBuy0 }; + +ALIGNED(4) static const u8 sSell0[] = _("Sell "); +ALIGNED(4) const u8* const gCommonSell[] = { sSell0 }; + +ALIGNED(4) static const u8 sAccept0[] = _("Accept"); +ALIGNED(4) const u8* const gCommonAccept[] = { sAccept0 }; + +ALIGNED(4) static const u8 sCheck0[] = _("Check"); +ALIGNED(4) const u8* const gCommonCheck[] = { sCheck0 }; + +ALIGNED(4) static const u8 sFriend0[] = _("Friend"); +ALIGNED(4) const u8* const gCommonFriend[] = { sFriend0 }; + +ALIGNED(4) static const u8 sExit0[] = _("Exit"); +ALIGNED(4) const u8* const gCommonExit[] = { sExit0 }; + +ALIGNED(4) static const u8 sTripleQuestionMark0[] = _("???"); +ALIGNED(4) const u8* const gCommonTripleQuestionMark[] = { sTripleQuestionMark0 }; + +ALIGNED(4) static const u8 sDepositPrompt0[] = _("Deposit?"); +ALIGNED(4) const u8* const gCommonDepositPrompt[] = { sDepositPrompt0 }; + +ALIGNED(4) static const u8 sWithdrawPrompt0[] = _("Withdraw?"); +ALIGNED(4) const u8* const gCommonWithdrawPrompt[] = { sWithdrawPrompt0 }; \ No newline at end of file diff --git a/src/data/other_menus1.h b/src/data/other_menus1.h index 6aca4d165..56b8bb95c 100644 --- a/src/data/other_menus1.h +++ b/src/data/other_menus1.h @@ -1,20 +1,20 @@ ALIGNED(4) static const u8 sFill[] = _("pksdir0"); static const UnkTextStruct2 sUnknown_80E653C = { - 0, 0, 0, 0, - 3, - 0, 0, - 0, 0, - 0, 0, - NULL + 0, 0, 0, 0, + 3, + 0, 0, + 0, 0, + 0, 0, + NULL }; const UnkTextStruct2 sUnknown_80E6554 = { // TODO: MAKE STATIC WHEN other_menus1.s IS DED - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E65C4[]; @@ -25,7 +25,6 @@ const MenuItem sUnknown_80E656C[4] = { // TODO: MAKE STATIC WHEN other_menus1.s {sUnknown_80E65AC, 5}, {sUnknown_80E658C, 5}, {NULL, 3}, - }; ALIGNED(4) static const u8 sUnknown_80E658C[] = _("{CENTER_ALIGN}Don{APOSTROPHE}t turn the power off!"); ALIGNED(4) static const u8 sUnknown_80E65AC[] = _("{CENTER_ALIGN}Item transmitting!"); @@ -37,7 +36,6 @@ const MenuItem sUnknown_80E65D8[4] = { // TODO: MAKE STATIC WHEN other_menus1.s {sUnknown_80E65F8, 5}, {sUnknown_80E658C, 5}, {NULL, 3}, - }; ALIGNED(4) static const u8 sUnknown_80E65F8[] = _("{CENTER_ALIGN}Thank-You Mail in transmission!"); @@ -47,7 +45,6 @@ const MenuItem sUnknown_80E661C[4] = { // TODO: MAKE STATIC WHEN other_menus1.s {sUnknown_80E663C, 5}, {sUnknown_80E658C, 5}, {NULL, 3}, - }; ALIGNED(4) static const u8 sUnknown_80E663C[] = _("{CENTER_ALIGN}A-OK Mail in transmission!"); @@ -64,17 +61,16 @@ const MenuItem sUnknown_80E667C[4] = { // TODO: MAKE STATIC WHEN other_menus1.s {sUnknown_80E669C, 5}, {sUnknown_80E658C, 5}, {NULL, 3}, - }; ALIGNED(4) static const u8 sUnknown_80E669C[] = _("{CENTER_ALIGN}Wonder Mail in transmission!"); static const UnkTextStruct2 sUnknown_80E66BC = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6734[]; @@ -91,12 +87,12 @@ ALIGNED(4) static const u8 sUnknown_80E6710[] = _("{CENTER_ALIGN}Your adventure ALIGNED(4) static const u8 sUnknown_80E6734[] = _("{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE}Success!{END_COLOR_TEXT_1} "); static const UnkTextStruct2 sUnknown_80E6748 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6780[]; @@ -113,12 +109,12 @@ ALIGNED(4) static const u8 sUnknown_80E6794[] = _("{CENTER_ALIGN}Check the Game ALIGNED(4) static const u8 sUnknown_80E67B4[] = _("{CENTER_ALIGN}#C2Communication error!{END_COLOR_TEXT_1} "); static const UnkTextStruct2 sUnknown_80E67D4 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E680C[]; @@ -131,12 +127,12 @@ static const MenuItem sUnknown_80E67EC[4] = { ALIGNED(4) static const u8 sUnknown_80E680C[] = _("{CENTER_ALIGN}Check your communication mode and"); static const UnkTextStruct2 sUnknown_80E6830 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6888[]; @@ -151,12 +147,12 @@ ALIGNED(4) static const u8 sUnknown_80E6868[] = _("{CENTER_ALIGN}Please inform t ALIGNED(4) static const u8 sUnknown_80E6888[] = _("{CENTER_ALIGN}Check sum error."); static const UnkTextStruct2 sUnknown_80E689C = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6928[]; @@ -173,12 +169,12 @@ ALIGNED(4) static const u8 sUnknown_80E68FC[] = _("{CENTER_ALIGN}An item could n ALIGNED(4) static const u8 sUnknown_80E6928[] = _("{CENTER_ALIGN}#C2Error!{END_COLOR_TEXT_1} "); static const UnkTextStruct2 sUnknown_80E6938 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6988[]; @@ -193,12 +189,12 @@ ALIGNED(4) static const u8 sUnknown_80E6970[] = _("{CENTER_ALIGN}Please check ag ALIGNED(4) static const u8 sUnknown_80E6988[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1} can{APOSTROPHE}t be used."); static const UnkTextStruct2 sUnknown_80E69B0 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E69E8[]; @@ -211,12 +207,12 @@ static const MenuItem sUnknown_80E69C8[4] = { ALIGNED(4) static const u8 sUnknown_80E69E8[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1} can{APOSTROPHE}t be used."); static const UnkTextStruct2 sUnknown_80E6A10 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6A48[]; @@ -229,12 +225,12 @@ static const MenuItem sUnknown_80E6A28[4] = { ALIGNED(4) static const u8 sUnknown_80E6A48[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1} can{APOSTROPHE}t be used."); static const UnkTextStruct2 sUnknown_80E6A74 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6AC8[]; @@ -249,12 +245,12 @@ ALIGNED(4) static const u8 sUnknown_80E6AAC[] = _("{CENTER_ALIGN}It can{APOSTROP ALIGNED(4) static const u8 sUnknown_80E6AC8[] = _("{CENTER_ALIGN}There is no space for new mail."); UNUSED static const UnkTextStruct2 sUnknown_80E6AEC = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6B4C[]; @@ -269,12 +265,12 @@ ALIGNED(4) static const u8 sUnknown_80E6B24[] = _("{CENTER_ALIGN}You need to go ALIGNED(4) static const u8 sUnknown_80E6B4C[] = _("{CENTER_ALIGN}You may not go to that {COLOR_1 LIGHT_BLUE}dungeon{END_COLOR_TEXT_1} yet."); static const UnkTextStruct2 sUnknown_80E6B78 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6BC4[]; @@ -289,12 +285,12 @@ ALIGNED(4) static const u8 sUnknown_80E6BB0[] = _("{CENTER_ALIGN}Please try agai ALIGNED(4) static const u8 sUnknown_80E6BC4[] = _("{CENTER_ALIGN}There was a problem on your friend{APOSTROPHE}s end."); static const UnkTextStruct2 sUnknown_80E6BF4 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6C2C[]; @@ -307,12 +303,12 @@ static const MenuItem sUnknown_80E6C0C[4] = { ALIGNED(4) static const u8 sUnknown_80E6C2C[] = _("{CENTER_ALIGN}Your friend is not responding."); static const UnkTextStruct2 sUnknown_80E6C50 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6CA8[]; @@ -327,12 +323,12 @@ ALIGNED(4) static const u8 sUnknown_80E6C88[] = _("{CENTER_ALIGN}went through su ALIGNED(4) static const u8 sUnknown_80E6CA8[] = _("{CENTER_ALIGN}The item exchange with your friend"); static const UnkTextStruct2 sUnknown_80E6CD0 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6D2C[]; @@ -347,12 +343,12 @@ ALIGNED(4) static const u8 sUnknown_80E6D08[] = _("{CENTER_ALIGN}you and your fr ALIGNED(4) static const u8 sUnknown_80E6D2C[] = _("{CENTER_ALIGN}Please communicate only after both"); static const UnkTextStruct2 sUnknown_80E6D54 = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6DB0[]; @@ -367,12 +363,12 @@ ALIGNED(4) static const u8 sUnknown_80E6D8C[] = _("{CENTER_ALIGN}connected. Plea ALIGNED(4) static const u8 sUnknown_80E6DB0[] = _("{CENTER_ALIGN}An incorrect number of GBA systems are"); static const UnkTextStruct2 sUnknown_80E6DDC = { - 0, 0, 0, 0, - 3, - 3, 8, - 24, 5, - 5, 0, - NULL + 0, 0, 0, 0, + 3, + 3, 8, + 24, 5, + 5, 0, + NULL }; static const u8 sUnknown_80E6E30[]; diff --git a/src/debug_menu2.c b/src/debug_menu2.c index 31e5c3806..e4f31436c 100644 --- a/src/debug_menu2.c +++ b/src/debug_menu2.c @@ -9,7 +9,7 @@ #include "text1.h" #include "text2.h" -EWRAM_DATA_2 static struct unkStruct_203B3F0 *sUnknown_203B3F0 = {0}; +static EWRAM_DATA_2 struct unkStruct_203B3F0 *sUnknown_203B3F0 = {0}; static const UnkTextStruct2 sUnknown_80E7E34 = { diff --git a/src/debug_menu3.c b/src/debug_menu3.c index a8e49fc82..2570630de 100644 --- a/src/debug_menu3.c +++ b/src/debug_menu3.c @@ -11,7 +11,7 @@ #include "text1.h" #include "text2.h" -EWRAM_DATA_2 static unkStruct_203B3F4 *sUnknown_203B3F4 = {0}; +static EWRAM_DATA_2 unkStruct_203B3F4 *sUnknown_203B3F4 = {0}; static const UnkTextStruct2 sUnknown_80E7E8C = { diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index 5c58af719..0b920ad34 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -46,35 +46,35 @@ bool8 MakuhitaDojo_New(u32 mode) sMakuhitaDojoWork1->mode = mode; switch (mode) { - case MAKUHITA_DOJO_MODE_UNK0_AWAKE: + case MAKUHITA_DOJO_INIT_MODE_UNK0_AWAKE: initialState = 0; sMakuhitaDojoWork1->isAsleep = FALSE; break; - case MAKUHITA_DOJO_MODE_UNK1_AWAKE: + case MAKUHITA_DOJO_INIT_MODE_UNK1_AWAKE: initialState = 7; sMakuhitaDojoWork1->isAsleep = FALSE; break; - case MAKUHITA_DOJO_MODE_UNK2_AWAKE: + case MAKUHITA_DOJO_INIT_MODE_UNK2_AWAKE: initialState = 6; sMakuhitaDojoWork1->isAsleep = FALSE; break; - case MAKUHITA_DOJO_MODE_UNK3_AWAKE: + case MAKUHITA_DOJO_INIT_MODE_UNK3_AWAKE: initialState = 8; sMakuhitaDojoWork1->isAsleep = FALSE; break; - case MAKUHITA_DOJO_MODE_UNK4_ASLEEP: + case MAKUHITA_DOJO_INIT_MODE_UNK4_ASLEEP: initialState = 0; sMakuhitaDojoWork1->isAsleep = TRUE; break; - case MAKUHITA_DOJO_MODE_UNK5_ASLEEP: + case MAKUHITA_DOJO_INIT_MODE_UNK5_ASLEEP: initialState = 7; sMakuhitaDojoWork1->isAsleep = TRUE; break; - case MAKUHITA_DOJO_MODE_UNK6_ASLEEP: + case MAKUHITA_DOJO_INIT_MODE_UNK6_ASLEEP: initialState = 6; sMakuhitaDojoWork1->isAsleep = TRUE; break; - case MAKUHITA_DOJO_MODE_UNK7_ASLEEP: + case MAKUHITA_DOJO_INIT_MODE_UNK7_ASLEEP: default: initialState = 8; sMakuhitaDojoWork1->isAsleep = TRUE;