diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2022-02-20 09:00:38 -0800 |
---|---|---|
committer | Seth Barberee <seth.barberee@gmail.com> | 2022-02-20 09:00:38 -0800 |
commit | 6c5749a148856780933326f8e83779cf8e8dbd69 (patch) | |
tree | 6c23e621db71c0a2aeeefa4dd69e7f59363a1bed | |
parent | 179d3d1bc3ca324caf8f9195afa7e08caeb1d850 (diff) |
actually nuke src/data/menus and put strings in the structs when possible vs references
-rw-r--r-- | src/data/menus/debug_menu.h | 35 | ||||
-rw-r--r-- | src/data/menus/load_screen.h | 107 | ||||
-rw-r--r-- | src/data/menus/main_menu.h | 332 | ||||
-rw-r--r-- | src/data/menus/post_office_guide.h | 65 | ||||
-rw-r--r-- | src/data/menus/thank_you_wonder_mail.h | 103 | ||||
-rw-r--r-- | src/data/menus/wonder_mail.h | 135 | ||||
-rw-r--r-- | src/data/menus/wonder_mail_main_menu.h | 50 | ||||
-rw-r--r-- | src/debug_menu.c | 20 | ||||
-rw-r--r-- | src/load_screen.c | 81 | ||||
-rw-r--r-- | src/main_menu.c | 308 | ||||
-rw-r--r-- | src/post_office_guide.c | 66 | ||||
-rw-r--r-- | src/thank_you_wonder_mail.c | 79 | ||||
-rw-r--r-- | src/wonder_mail.c | 101 | ||||
-rw-r--r-- | src/wonder_mail_main_menu.c | 36 |
14 files changed, 670 insertions, 848 deletions
diff --git a/src/data/menus/debug_menu.h b/src/data/menus/debug_menu.h deleted file mode 100644 index c240ec0..0000000 --- a/src/data/menus/debug_menu.h +++ /dev/null @@ -1,35 +0,0 @@ -extern const char dungeons_string[]; -extern const char field_string[]; -extern const char field_map_string[]; -extern const char field_script_string[]; -extern const char debug_menu_string[]; -extern const char storage_string[]; -extern const char h_open_string[]; - -const struct MenuItem gDebugMenuItems[8] = -{ - {dungeons_string, MENU_DEBUG_MENU_DUNGEONS}, - {field_string, MENU_DEBUG_MENU_FIELD}, - {field_map_string, MENU_DEBUG_MENU_FIELD_MAP}, - {field_script_string, MENU_DEBUG_MENU_FIELD_SCRIPT}, - {debug_menu_string, MENU_DEBUG_MENU_DEBUG_MENU}, - {storage_string, MENU_DEBUG_MENU_STORAGE}, - {h_open_string, MENU_DEBUG_MENU_H_OPEN}, - {NULL, 10}, -}; - -ALIGNED(4) static const char h_open_string[] = "h-open"; -ALIGNED(4) static const char storage_string[] = "Storage"; -ALIGNED(4) static const char debug_menu_string[] = "Debug Menu"; -ALIGNED(4) static const char field_script_string[] = "Field Script"; -ALIGNED(4) static const char field_map_string[] = "Field Map"; -ALIGNED(4) static const char field_string[] = "Field"; -ALIGNED(4) static const char dungeons_string[] = "Dungeons"; - -ALIGNED(4) static const char debug_menu_fill0[] = "pksdir0"; -ALIGNED(4) static const char debug_menu_fill1[] = "pksdir0"; -ALIGNED(4) static const char debug_menu_fill2[] = "pksdir0"; -ALIGNED(4) static const char debug_menu_fill3[] = "pksdir0"; -ALIGNED(4) static const char debug_menu_fill4[] = "pksdir0"; -ALIGNED(4) static const char debug_menu_fill5[] = "pksdir0"; -ALIGNED(4) static const char debug_menu_fill6[] = "pksdir0"; diff --git a/src/data/menus/load_screen.h b/src/data/menus/load_screen.h deleted file mode 100644 index d4ad889..0000000 --- a/src/data/menus/load_screen.h +++ /dev/null @@ -1,107 +0,0 @@ -extern const u8 Deleted_80E7700[]; -extern const u8 Deleted_80E7718[]; -extern const u8 Deleted_80E7748[]; -extern const u8 Deleted_80E7768[]; -extern const u8 QuitAwaitingRescue_80E76D0[]; -extern const u8 IsThatOK_80E765C[]; -extern const u8 ResumeAdventure_80E769C[]; -extern const u8 ResumeQuicksave_80E7668[]; -extern const char No_80E77B4[]; -extern const char Yes_80E77B8[]; - -const struct UnkTextStruct2 gUnknown_80E75F8 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - NULL -}; - -const struct UnkTextStruct2 gUnknown_80E7610 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x1A, 0x0B, - 0x0B, 0x00, - NULL -}; - -const u8 gUnkData_80E7628[] = {0x20, 0x00, 0x00, 0x00}; - -const struct UnkTextStruct2 gUnknown_80E762C = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x0F, 0x00, - 0x13, 0x03, - 0x03, 0x00, - NULL -}; - -const struct MenuItem gResumeQuicksaveMenuItems[3] = -{ - {ResumeQuicksave_80E7668, 5}, - {IsThatOK_80E765C, 5}, - {NULL, 3}, -}; - -ALIGNED(4) static const u8 IsThatOK_80E765C[] = "Is that OK?"; -ALIGNED(4) static const u8 ResumeQuicksave_80E7668[] = "Resuming from quicksave."; - -const struct MenuItem gResumeAdventureMenuItems[3] = -{ - {ResumeAdventure_80E769C, 5}, - {IsThatOK_80E765C, 5}, - {NULL, 3}, -}; - -ALIGNED(4) static const u8 ResumeAdventure_80E769C[] = "Resuming saved adventure."; - -const struct MenuItem gQuitWaitingRescueMenuItems[3] = -{ - {QuitAwaitingRescue_80E76D0, 5}, - {IsThatOK_80E765C, 5}, - {NULL, 3}, -}; - -ALIGNED(4) static const u8 QuitAwaitingRescue_80E76D0[] = "Quit awaiting rescue?"; - -const struct MenuItem gDeleteSavePromptMenuItems[3] = -{ - {Deleted_80E7718, 5}, - {Deleted_80E7700, 5}, - {NULL, 3}, -}; - -ALIGNED(4) static const u8 Deleted_80E7700[] = "deleted. Is that OK?"; -ALIGNED(4) static const u8 Deleted_80E7718[] = "Your saved data will be"; - -const struct MenuItem gDeleteSaveConfirmMenuItems[3] = -{ - {Deleted_80E7768, 5}, - {Deleted_80E7748, 5}, - {NULL, 3}, -}; - -ALIGNED(4) static const u8 Deleted_80E7748[] = "delete all of your saved data?"; -ALIGNED(4) static const u8 Deleted_80E7768[] = "Are you sure you want to"; - -const struct UnkTextStruct2 gUnknown_80E7784 = -{ - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x17, 0x00, 0x0F, 0x00, - 0x05, 0x03, - 0x03, 0x00, - NULL -}; - -const struct MenuItem gLoadScreenYesNoMenu[3] = -{ - {Yes_80E77B8, 1}, - {No_80E77B4, 2}, - {NULL, 3}, -}; - -ALIGNED(4) static const char No_80E77B4[] = "No"; -ALIGNED(4) static const char Yes_80E77B8[] = "Yes"; diff --git a/src/data/menus/main_menu.h b/src/data/menus/main_menu.h deleted file mode 100644 index c6b81ce..0000000 --- a/src/data/menus/main_menu.h +++ /dev/null @@ -1,332 +0,0 @@ -static const char NewGame_80E5A20[]; -static const char AdventureLog_80E5A10[]; -static const char WonderMail_80E5A54[]; -static const char Continue_80E5AF0[]; -static const char DeleteSaveData_80E5ADC[]; -static const char FriendRescue_80E5ACC[]; -static const char TradeItems_80E5AC0[]; -static const char ReviveTeam_80E5C0C[]; -static const char SendItems_80E5C90[]; -static const char ReceiveItems_80E5C80[]; -static const char AwaitingRescue_80E5B7C[]; -static const u8 sUnknown_80E5CE4[]; -static const u8 sUnknown_80E5CE8[]; -static const u8 sUnknown_80E5D24[]; -static const u8 sUnknown_80E5D60[]; -static const u8 sUnknown_80E5D88[]; -static const u8 sUnknown_80E5DB8[]; -static const u8 sUnknown_80E5DCC[]; -static const u8 sUnknown_80E5E08[]; -static const u8 sUnknown_80E5E34[]; -static const u8 sUnknown_80E5EA0[]; -static const u8 sUnknown_80E5E74[]; -static const u8 sUnknown_80E5EF8[]; -static const u8 sUnknown_80E5ED4[]; -static const u8 sUnknown_80E5F58[]; -static const u8 sUnknown_80E5F34[]; -static const u8 sUnknown_80E5FB0[]; -static const u8 sUnknown_80E5F98[]; -static const u8 sUnknown_80E5FE4[]; -static const u8 sUnknown_80E6008[]; -static const u8 sUnknown_80E6048[]; -static const u8 sUnknown_80E6070[]; - -const struct UnkTextStruct2 gUnknown_80E59A8 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - NULL -}; - -static const char main_menu_fill[] = "pksdir0"; - -const struct UnkTextStruct2 gUnknown_80E59C8 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - NULL -}; - -const struct UnkTextStruct2 gUnknown_80E59E0 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x0A, 0x03, - 0x03, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80E59F8[] = -{ - {NewGame_80E5A20, MENU_NEW_GAME}, - {AdventureLog_80E5A10, MENU_ADVENTURE_LOG}, - {NULL, 0xffdd}, -}; - -static const char AdventureLog_80E5A10[] = "Adventure Log"; -static const char NewGame_80E5A20[] = "New Game"; - -const struct UnkTextStruct2 gUnknown_80E5A29 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x0A, 0x02, - 0x02, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80E5A44[] = -{ - {WonderMail_80E5A54, MENU_WONDER_MAIL}, - {NULL, 0xffdd}, -}; - -static const char WonderMail_80E5A54[] = "Wonder Mail"; - -const struct UnkTextStruct2 gUnknown_80E5A60 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x0A, 0x08, - 0x08, 0x00, - NULL -}; - -const struct UnkTextStruct2 gUnknown_80E5A78 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x0B, 0x09, - 0x09, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80E5A90[] = -{ - {Continue_80E5AF0, MENU_CONTINUE}, - {DeleteSaveData_80E5ADC, MENU_DELETE_SAVE_PROMPT}, - {AdventureLog_80E5A10, MENU_ADVENTURE_LOG}, - {FriendRescue_80E5ACC, MENU_FRIEND_RESCUE}, - {TradeItems_80E5AC0, MENU_TRADE_ITEMS}, - {NULL, 0xffdd}, -}; - -static const char TradeItems_80E5AC0[] = "Trade Items"; -static const char FriendRescue_80E5ACC[] = "Friend Rescue"; -static const char DeleteSaveData_80E5ADC[] = "Delete Save Data"; -static const char Continue_80E5AF0[] = "Continue"; - -const struct MenuItem gUnknown_80E5AFC[] = -{ - {Continue_80E5AF0, MENU_CONTINUE}, - {DeleteSaveData_80E5ADC, MENU_DELETE_SAVE_PROMPT}, - {AdventureLog_80E5A10, MENU_ADVENTURE_LOG}, - {FriendRescue_80E5ACC, MENU_FRIEND_RESCUE}, - {TradeItems_80E5AC0, MENU_TRADE_ITEMS}, - {WonderMail_80E5A54, MENU_WONDER_MAIL}, - {NULL, 0xffdd}, -}; - -const struct UnkTextStruct2 gUnknown_80E5B34 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x0A, 0x08, - 0x08, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80E5B4C[] = -{ - {AwaitingRescue_80E5B7C, MENU_AWAITING_RESCUE}, - {DeleteSaveData_80E5ADC, MENU_DELETE_SAVE_PROMPT}, - {AdventureLog_80E5A10, MENU_ADVENTURE_LOG}, - {FriendRescue_80E5ACC, MENU_FRIEND_RESCUE}, - {TradeItems_80E5AC0, MENU_TRADE_ITEMS}, - {NULL, 0xffdd}, -}; -static const char AwaitingRescue_80E5B7C[] = "Awaiting Rescue"; - -const struct MenuItem gUnknown_80E5B8C[] = -{ - {AwaitingRescue_80E5B7C, MENU_AWAITING_RESCUE}, - {DeleteSaveData_80E5ADC, MENU_DELETE_SAVE_PROMPT}, - {AdventureLog_80E5A10, MENU_ADVENTURE_LOG}, - {FriendRescue_80E5ACC, MENU_FRIEND_RESCUE}, - {TradeItems_80E5AC0, MENU_TRADE_ITEMS}, - {WonderMail_80E5A54, MENU_WONDER_MAIL}, - {NULL, 0xffdd}, -}; - -const struct UnkTextStruct2 gUnknown_80E5BC4 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x0A, 0x08, - 0x08, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80E5BDC[] = -{ - {ReviveTeam_80E5C0C, MENU_CONTINUE}, - {DeleteSaveData_80E5ADC, MENU_DELETE_SAVE_PROMPT}, - {AdventureLog_80E5A10, MENU_ADVENTURE_LOG}, - {FriendRescue_80E5ACC, MENU_FRIEND_RESCUE}, - {TradeItems_80E5AC0, MENU_TRADE_ITEMS}, - {NULL, 0xffdd}, -}; -static const char ReviveTeam_80E5C0C[] = "Revive Team"; - -const struct MenuItem gUnknown_80E5C18[] = -{ - {ReviveTeam_80E5C0C, MENU_CONTINUE}, - {DeleteSaveData_80E5ADC, MENU_DELETE_SAVE_PROMPT}, - {AdventureLog_80E5A10, MENU_ADVENTURE_LOG}, - {FriendRescue_80E5ACC, MENU_FRIEND_RESCUE}, - {TradeItems_80E5AC0, MENU_TRADE_ITEMS}, - {WonderMail_80E5A54, MENU_WONDER_MAIL}, - {NULL, 0xffdd}, -}; - -const struct UnkTextStruct2 gUnknown_80E5C50 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, - 0x0A, 0x03, - 0x03, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80E5C68[] = -{ - {SendItems_80E5C90, MENU_SEND_ITEMS}, - {ReceiveItems_80E5C80, MENU_RECEIVE_ITEMS}, - {NULL, 0xffdd}, -}; - -static const char ReceiveItems_80E5C80[] = "Receive Items"; -static const char SendItems_80E5C90[] = "Send Items"; - -const struct MenuItem gUnknown_80E5C9C[] = -{ - {SendItems_80E5C90, -1}, - {ReceiveItems_80E5C80, MENU_RECEIVE_ITEMS}, - {NULL, 0xffdd}, -}; - -const struct UnkTextStruct2 gUnknown_80E5CB4 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x0F, 0x00, - 0x1A, 0x03, - 0x03, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80E5CCC[] = -{ - {sUnknown_80E5CE8, 0xffde}, - {sUnknown_80E5CE4, 0xffde}, - {NULL, 0xffdd}, -}; - -static const u8 sUnknown_80E5CE4[] = " "; -static const u8 sUnknown_80E5CE8[] = "Start an entirely new adventure."; - -const struct MenuItem gUnknown_80E5D0C[] = -{ - {sUnknown_80E5D24, 0xffde}, - {sUnknown_80E5CE4, 0xffde}, - {NULL, 0xffdd}, -}; - -static const u8 sUnknown_80E5D24[] = "Check your career as an adventurer."; - -const struct MenuItem gUnknown_80E5D48[] = -{ - {sUnknown_80E5D88, 0xffde}, - {sUnknown_80E5D60, 0xffde}, - {NULL, 0xffdd}, -}; - -static const u8 sUnknown_80E5D60[] = _("It won{APOSTROPHE}t be in the release version."); -static const u8 sUnknown_80E5D88[] = "This is the Debug Mode."; - -const struct MenuItem gUnknown_80E5DA0[] = -{ - {sUnknown_80E5DCC, 0xffde}, - {sUnknown_80E5DB8, 0xffde}, - {NULL, 0xffdd}, -}; - -static const u8 sUnknown_80E5DB8[] = "you last saved. "; -static const u8 sUnknown_80E5DCC[] = "Resume your adventure from where"; - -const struct MenuItem gUnknown_80E5DF0[] = { - {sUnknown_80E5E34, 0xFFDE}, - {sUnknown_80E5E08, 0xFFDE}, - {0, 0xFFDD} -}; - -static const u8 sUnknown_80E5E08[] = _("#C2Beware#R! This will delete it forever!"); -static const u8 sUnknown_80E5E34[] = "This will delete your saved game data."; - -const struct MenuItem gUnknown_80E5E5C[] = { - {sUnknown_80E5EA0, 0xFFDE}, - {sUnknown_80E5E74, 0xFFDE}, - {0, 0xFFDD} -}; - -ALIGNED(4) static const u8 sUnknown_80E5E74[] = _("passwords{COMMA} friends may rescue each other."); -static const u8 sUnknown_80E5EA0[] = "Using a Game Link cable or"; - -const struct MenuItem gUnknown_80E5EBC[] = { - {sUnknown_80E5EF8, 0xFFDE}, - {sUnknown_80E5ED4, 0xFFDE}, - {0, 0xFFDD} -}; - -static const u8 sUnknown_80E5ED4[] = "trade stored items with a friend."; -ALIGNED(4) static const u8 sUnknown_80E5EF8[] = _("Using a Game Link cable{COMMA} you can"); - -const struct MenuItem gUnknown_80E5F1C[] = { - {sUnknown_80E5F58, 0xFFDE}, - {sUnknown_80E5F34, 0xFFDE}, - {0, 0xFFDD} -}; - -static const u8 sUnknown_80E5F34[] = "You can give up waiting for rescue."; -static const u8 sUnknown_80E5F58[] = "You are awaiting rescue by a friend."; - -const struct MenuItem gUnknown_80E5F80[] = { - {sUnknown_80E5FB0, 0xFFDE}, - {sUnknown_80E5F98, 0xFFDE}, - {0, 0xFFDD} -}; - -static const u8 sUnknown_80E5F98[] = "receive Wonder Mail."; -ALIGNED(4) static const u8 sUnknown_80E5FB0[] = _("Using passwords{COMMA} you can"); - -const struct MenuItem gUnknown_80E5FCC[] = { - {sUnknown_80E6008, 0xFFDE}, - {sUnknown_80E5FE4, 0xFFDE}, - {NULL, 0xFFDD} -}; - -static const u8 sUnknown_80E5FE4[] = "receive teams from your friends."; -ALIGNED(4) static const u8 sUnknown_80E6008[] = _("Using the Dual Slot function{COMMA} you can"); - -const struct MenuItem gUnknown_80E6030[] = { - {sUnknown_80E6070, 0xFFDE}, - {sUnknown_80E6048, 0xFFDE}, - {NULL, 0xFFDD} -}; - -static const u8 sUnknown_80E6048[] = "go on an adventure to unknown worlds."; -ALIGNED(4) static const u8 sUnknown_80E6070[] = _("Using wireless communication{COMMA} you can"); -static const u8 sMainMenu_fill0[] = "pksdir0"; diff --git a/src/data/menus/post_office_guide.h b/src/data/menus/post_office_guide.h deleted file mode 100644 index badb08e..0000000 --- a/src/data/menus/post_office_guide.h +++ /dev/null @@ -1,65 +0,0 @@ -const struct MenuItem gPostOfficeHelpStartMenu[] = -{ - {PostOffice_Text, POST_OFFICE}, - {BulletinBoard_Text, BULLETIN_BOARD}, - {Delivery_Text, DELIVERY}, - {FriendRescue_80E0A80, FRIEND_RESCUE}, - {Cancel_80E0A78, CANCEL}, - {NULL, EXIT} -}; - -ALIGNED(4) const char Cancel_80E0A78[] = _("Cancel"); -ALIGNED(4) const char FriendRescue_80E0A80[] = _("{COLOR_1 YELLOW}Friend Rescue{END_COLOR_TEXT_1} "); -ALIGNED(4) const char Delivery_Text[] = _("Delivery"); -ALIGNED(4) const char BulletinBoard_Text[] = _("Bulletin Board"); -ALIGNED(4) const char PostOffice_Text[] = _("Post Office"); - -const struct MenuItem gPostOfficeHelpFriendRescueMenu[] = -{ - {FriendRescueInfo_Text, FRIEND_RESCUE_INFO}, - {GoRescue_Text, GO_RESCUE}, - {GetHelp_Text, GET_HELP_MENU}, - {DeletingMailInfo_Text, DELETING_MAIL}, - {Exit_80EA0EC, EXIT}, - {NULL, EXIT} -}; - -ALIGNED(4) const char Exit_80EA0EC[] = _("Exit"); -ALIGNED(4) const char DeletingMailInfo_Text[] = _("Deleting Mail Info"); -ALIGNED(4) const char GetHelp_Text[] = _("{COLOR_1 YELLOW}Get help{END_COLOR_TEXT_1} "); -ALIGNED(4) const char GoRescue_Text[] = _("{COLOR_1 YELLOW}Go rescue{END_COLOR_TEXT_1} "); -ALIGNED(4) const char FriendRescueInfo_Text[] = _("Friend Rescue Info"); - - -const struct MenuItem gPostOfficeHelpGoRescueMenu[] = -{ - {RescueProcedures_Text, RESCUE_PROCEDURES}, - {ReceiveSOSMail_Text, RECEIVE_SOS_MAIL}, - {LeaveForRescue_Text, LEAVE_FOR_RESCUE}, - {SendAOKMail_Text, SEND_AOK_MAIL}, - {GetThankYouMail_Text, GET_THANK_YOU_MAIL}, - {Exit_80EA0EC, EXIT}, - {NULL, EXIT} -}; - -ALIGNED(4) const char GetThankYouMail_Text[] = _("Get Thank-You Mail"); -ALIGNED(4) const char SendAOKMail_Text[] = _("Send A-OK Mail"); -ALIGNED(4) const char LeaveForRescue_Text[] = _("Leave for Rescue"); -ALIGNED(4) const char ReceiveSOSMail_Text[] = _("Receive SOS Mail"); -ALIGNED(4) const char RescueProcedures_Text[] = _("Rescue Procedures"); - - -const struct MenuItem gPostOfficeHelpGetHelpMenu[] = -{ - {GettingHelp_Text, GETTING_HELP}, - {SendSOSMail_Text, SEND_SOS_MAIL}, - {ReceiveAOKMail_Text, RECEIVE_AOK_MAIL}, - {SendThankYouMail_Text, SEND_THANK_YOU_MAIL}, - {Exit_80EA0EC, EXIT}, - {NULL, EXIT} -}; - -ALIGNED(4) const char SendThankYouMail_Text[] = _("Send Thank-You Mail"); -ALIGNED(4) const char ReceiveAOKMail_Text[] = _("Receive A-OK Mail"); -ALIGNED(4) const char SendSOSMail_Text[] = _("Send SOS Mail"); -ALIGNED(4) const char GettingHelp_Text[] = _("Getting Help"); diff --git a/src/data/menus/thank_you_wonder_mail.h b/src/data/menus/thank_you_wonder_mail.h deleted file mode 100644 index 4da290f..0000000 --- a/src/data/menus/thank_you_wonder_mail.h +++ /dev/null @@ -1,103 +0,0 @@ -extern const u8 Confirm_80DED98[]; -extern const u8 Info_80DED90[]; -extern const u8 SendThankYou_Text[]; -extern const u8 GetThankYou_Text[]; -extern const u8 Cancel_80DEDD8[]; -extern const u8 GameLinkCable_Text[]; -extern const u8 Password_Text[]; -extern const u8 Yes_80DEE5C[]; -extern const u8 No_80DEE78[]; -extern const u8 SendItem_Text[]; -extern const u8 DontSendItem_Text[]; -extern const u8 SendWOItem_Text[]; - -const struct MenuItem gUnknown_80DED78[3] = -{ - {Confirm_80DED98, 0xB}, - {Info_80DED90, 0xC}, - {NULL, 0x0}, -}; - -ALIGNED(4) static const u8 Info_80DED90[] = "Info"; -ALIGNED(4) static const u8 Confirm_80DED98[] = "Confirm"; - -// Unused -const struct UnkTextStruct2 gUnknown_80DEDA0 = -{ - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - NULL -}; - - -const struct MenuItem gThankYouMailMainMenuItems[4] = -{ - {SendThankYou_Text, 0x1}, - {GetThankYou_Text, 0x2}, - {Cancel_80DEDD8, 0x0}, - {NULL, 0x0}, -}; - -ALIGNED(4) static const u8 Cancel_80DEDD8[] = "Cancel"; -ALIGNED(4) static const u8 GetThankYou_Text[] = "Get Thank-You Mail"; -ALIGNED(4) static const u8 SendThankYou_Text[] = "Send Thank-You Mail"; - -const struct MenuItem gUnknown_80DEE08[4] = -{ - {GameLinkCable_Text, WONDER_MAIL_GAME_LINK}, - {Password_Text, WONDER_MAIL_PASSWORD}, - {Cancel_80DEDD8, 0x0}, - {NULL, 0x0}, -}; - -ALIGNED(4) static const u8 Password_Text[] = "Password"; -ALIGNED(4) static const u8 GameLinkCable_Text[] = "Game Link cable"; - -const struct MenuItem gUnknown_80DEE44[3] = -{ - {Yes_80DEE5C, 0x7}, - {Cancel_80DEDD8, 0x0}, - {NULL, 0x0}, -}; - -ALIGNED(4) static const u8 Yes_80DEE5C[] = "Yes"; - -const struct MenuItem gUnknown_80DEE60[3] = -{ - {Yes_80DEE5C, 0x7}, - {No_80DEE78, 0x8}, - {NULL, 0x0}, -}; - -ALIGNED(4) static const u8 No_80DEE78[] = "No"; - -const struct MenuItem gUnknown_80DEE7C[4] = -{ - {SendItem_Text, 0x9}, - {DontSendItem_Text, 0xA}, - {Cancel_80DEDD8, 0x0}, - {NULL, 0x0}, -}; - -ALIGNED(4) static const u8 DontSendItem_Text[] = _("Don{APOSTROPHE}t Send Item"); -ALIGNED(4) static const u8 SendItem_Text[] = "Send Item"; - -const struct MenuItem gUnknown_80DEEBC[3] = -{ - {SendWOItem_Text, 0xA}, - {Cancel_80DEDD8, 0x0}, - {NULL, 0x0}, -}; - -ALIGNED(4) static const u8 SendWOItem_Text[] = "Send w/o Item"; - -const struct MenuItem gUnknown_80DEEE4[4] = -{ - {Yes_80DEE5C, 0x7}, - {No_80DEE78, 0x8}, - {Cancel_80DEDD8, 0x0}, - {NULL, 0x0}, -}; diff --git a/src/data/menus/wonder_mail.h b/src/data/menus/wonder_mail.h deleted file mode 100644 index e1d1208..0000000 --- a/src/data/menus/wonder_mail.h +++ /dev/null @@ -1,135 +0,0 @@ -extern const u8 DontSendPokemon_80DDB80[]; -extern const u8 SendPokemon_80DDB98[]; -extern const u8 gWonderMailYes[]; -extern const u8 gWonderMailNo[]; -extern const u8 gWonderMailCancel[]; -extern const u8 Password_80DDB44[]; -extern const u8 GameLinkCable_80DDB50[]; -extern const u8 Confirm_80DDB1C[]; -extern const u8 Info_80DDB14[]; -extern const u8 SendWOPokemon[]; -extern const u8 gWonderMailDeleteAllMail[]; -extern const u8 gWonderMailDeleteAOKMail[]; -extern const u8 gWonderMailDeleteSOSMail[]; -extern const u8 gWonderMailCancel[]; -extern const u8 gWonderMailDeleteMail[]; -extern const u8 gWonderMailSendAOKMail[]; -extern const u8 gWonderMailLeaveForRescue[]; -extern const u8 gWonderMailReceiveSOSMail[]; - -const struct MenuItem gUnknown_80DD970[] = -{ - {gWonderMailReceiveSOSMail, 0x0}, - {gWonderMailLeaveForRescue, 0x1}, - {gWonderMailSendAOKMail, 0x2}, - {gWonderMailDeleteMail, 0x3}, - {gWonderMailCancel, 0xA}, - {NULL, 0xA} -}; - -ALIGNED(4) const u8 gWonderMailCancel[] = "Cancel"; -ALIGNED(4) const u8 gWonderMailDeleteMail[] = "Delete Mail"; -ALIGNED(4) const u8 gWonderMailSendAOKMail[] = "Send A-OK Mail"; -ALIGNED(4) const u8 gWonderMailLeaveForRescue[] = "Leave for Rescue"; -ALIGNED(4) const u8 gWonderMailReceiveSOSMail[] = "Receive SOS Mail"; - -const struct MenuItem gUnknown_80DD9EC[] = -{ - {gWonderMailDeleteSOSMail, 0x5}, - {gWonderMailDeleteAOKMail, 0x6}, - {gWonderMailDeleteAllMail, 0x7}, - {gWonderMailCancel, 0xA}, - {NULL, 0xA} -}; - -ALIGNED(4) const u8 gWonderMailDeleteAllMail[] = "Delete All Mail"; -ALIGNED(4) const u8 gWonderMailDeleteAOKMail[] = "Delete A-OK Mail"; -ALIGNED(4) const u8 gWonderMailDeleteSOSMail[] = "Delete SOS Mail"; - - -const struct MenuItem gUnknown_80DDA48[] = -{ - {gWonderMailYes, 0x8}, - {gWonderMailCancel, 0xA}, - {NULL, 0xA} -}; - -ALIGNED(4) const u8 gWonderMailYes[] = "Yes"; - -const struct MenuItem gUnknown_80DDA64[] = -{ - {gWonderMailYes, 0x8}, - {gWonderMailNo, 0x9}, - {NULL, 0xA} -}; - -ALIGNED(4) const u8 gWonderMailNo[] = "No"; - -const struct MenuItem gUnknown_80DDA80[] = -{ - {gWonderMailYes, 0x8}, - {gWonderMailNo, 0x9}, - {gWonderMailCancel, 0xA}, - {NULL, 0xA} -}; - -const struct MenuItem gUnknown_80DDAA0[] = -{ - {SendWOPokemon, 0x12}, - {gWonderMailCancel, 0xA}, - {NULL, 0xA}, -}; - -ALIGNED(4) const u8 SendWOPokemon[] = _("Send w/o Pokémon"); - -const struct UnkTextStruct2 gUnknown_80DDACC = -{ - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x16, 0x00, 0x07, 0x00, - 0x06, 0x04, - 0x04, 0x00, - NULL -}; - -const struct UnkTextStruct2 gUnknown_80DDAE4 = -{ - 0x00, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, - 0x16, 0x00, 0x06, 0x00, - 0x06, 0x04, - 0x04, 0x00, - NULL -}; - -const struct MenuItem gUnknown_80DDAFC[] = -{ - {Confirm_80DDB1C, 0xB}, - {Info_80DDB14, 0xC}, - {NULL, 0xA}, -}; - -ALIGNED(4) const u8 Info_80DDB14[] = "Info"; -ALIGNED(4) const u8 Confirm_80DDB1C[] = "Confirm"; - -const struct MenuItem gUnknown_80DDB24[] = -{ - {GameLinkCable_80DDB50, 0xD}, - {Password_80DDB44, 0xF}, - {gWonderMailCancel, 0xA}, - {NULL, 0xA}, -}; - -ALIGNED(4) const u8 Password_80DDB44[] = "Password"; -ALIGNED(4) const u8 GameLinkCable_80DDB50[] = "Game Link cable"; - -const struct MenuItem gUnknown_80DDB60[] = -{ - {SendPokemon_80DDB98, 0x11}, - {DontSendPokemon_80DDB80, 0x12}, - {gWonderMailCancel, 0xA}, - {NULL, 0xA}, -}; - -ALIGNED(4) const u8 DontSendPokemon_80DDB80[] = _("Don{APOSTROPHE}t Send Pokémon"); -ALIGNED(4) const u8 SendPokemon_80DDB98[] = _("Send Pokémon"); diff --git a/src/data/menus/wonder_mail_main_menu.h b/src/data/menus/wonder_mail_main_menu.h deleted file mode 100644 index 33f4843..0000000 --- a/src/data/menus/wonder_mail_main_menu.h +++ /dev/null @@ -1,50 +0,0 @@ -extern const char Cancel_80E7D24[]; -extern const char Cancel_80E78B4[]; -extern const char Yes_80E7D2C[]; -extern const char Yes_80E7910[]; -extern const char GameLinkCable_80E78C8[]; -extern const char Password_80E78BC[]; - -extern const char Receive_80E7884[]; -extern const char Send_80E788C[]; - -const struct MenuItem gSelectWonderMailModeMainMenuItems[3] = -{ - {Send_80E788C, WONDER_MAIL_MODE_SEND}, - {Receive_80E7884, WONDER_MAIL_MODE_RECEIVE}, - {NULL, 0} -}; - -ALIGNED(4) const char Receive_80E7884[] = "Receive"; -ALIGNED(4) const char Send_80E788C[] = "Send"; - - -const struct MenuItem gSendWonderMailMainMenuItems[4] = -{ - {GameLinkCable_80E78C8, WONDER_MAIL_GAME_LINK}, - {Password_80E78BC, -1}, - {Cancel_80E78B4, 8}, - {NULL, 0} - -}; - -ALIGNED(4) const char Cancel_80E78B4[] = "Cancel"; -ALIGNED(4) const char Password_80E78BC[] = "Password"; -ALIGNED(4) const char GameLinkCable_80E78C8[] = "Game Link cable"; - -const struct MenuItem gReceiveWonderMailMainMenuItems[4] = -{ - {GameLinkCable_80E78C8, WONDER_MAIL_GAME_LINK}, - {Password_80E78BC, WONDER_MAIL_PASSWORD}, - {Cancel_80E78B4, 8}, - {NULL, 0} -}; - -const struct MenuItem gUnknown_80E78F8[3] = -{ - {Yes_80E7910, 6}, - {Cancel_80E78B4, 0}, - {NULL, 0} -}; - -ALIGNED(4) const char Yes_80E7910[] = "Yes"; diff --git a/src/debug_menu.c b/src/debug_menu.c index 6f7dcd8..376b267 100644 --- a/src/debug_menu.c +++ b/src/debug_menu.c @@ -27,7 +27,25 @@ const struct UnkTextStruct2 gUnknown_80E7D58 = NULL }; -#include "data/menus/debug_menu.h" +const struct MenuItem gDebugMenuItems[8] = +{ + {"Dungeons", MENU_DEBUG_MENU_DUNGEONS}, + {"Field", MENU_DEBUG_MENU_FIELD}, + {"Field Map", MENU_DEBUG_MENU_FIELD_MAP}, + {"Field Script", MENU_DEBUG_MENU_FIELD_SCRIPT}, + {"Debug Menu", MENU_DEBUG_MENU_DEBUG_MENU}, + {"Storage", MENU_DEBUG_MENU_STORAGE}, + {"h-open", MENU_DEBUG_MENU_H_OPEN}, + {NULL, 10}, +}; + +ALIGNED(4) static const char debug_menu_fill0[] = "pksdir0"; +ALIGNED(4) static const char debug_menu_fill1[] = "pksdir0"; +ALIGNED(4) static const char debug_menu_fill2[] = "pksdir0"; +ALIGNED(4) static const char debug_menu_fill3[] = "pksdir0"; +ALIGNED(4) static const char debug_menu_fill4[] = "pksdir0"; +ALIGNED(4) static const char debug_menu_fill5[] = "pksdir0"; +ALIGNED(4) static const char debug_menu_fill6[] = "pksdir0"; diff --git a/src/load_screen.c b/src/load_screen.c index 4b26c86..1721bf5 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -77,7 +77,86 @@ extern void xxx_format_string(u8 *, u8 *, u8 *, u32); extern void SetBGPaletteBufferColorArray(s32, s32); extern void sub_8007E20(s32, s32, s32, u32, u32, s32, u32); -#include "data/menus/load_screen.h" +const struct UnkTextStruct2 gUnknown_80E75F8 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + NULL +}; + +const struct UnkTextStruct2 gUnknown_80E7610 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x1A, 0x0B, + 0x0B, 0x00, + NULL +}; + +const u8 gUnkData_80E7628[] = {0x20, 0x00, 0x00, 0x00}; + +const struct UnkTextStruct2 gUnknown_80E762C = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x0F, 0x00, + 0x13, 0x03, + 0x03, 0x00, + NULL +}; + +const struct MenuItem gResumeQuicksaveMenuItems[3] = +{ + {"Resuming from quicksave.", 5}, + {"Is that OK?", 5}, + {NULL, 3}, +}; + +const struct MenuItem gResumeAdventureMenuItems[3] = +{ + {"Resuming saved adventure.", 5}, + {"Is that OK?", 5}, + {NULL, 3}, +}; + +const struct MenuItem gQuitWaitingRescueMenuItems[3] = +{ + {"Quit awaiting rescue?", 5}, + {"Is that OK?", 5}, + {NULL, 3}, +}; + +const struct MenuItem gDeleteSavePromptMenuItems[3] = +{ + {"Your saved data will be", 5}, + {"deleted. Is that OK?", 5}, + {NULL, 3}, +}; + +const struct MenuItem gDeleteSaveConfirmMenuItems[3] = +{ + {"Are you sure you want to", 5}, + {"delete all of your saved data?", 5}, + {NULL, 3}, +}; + +const struct UnkTextStruct2 gUnknown_80E7784 = +{ + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x17, 0x00, 0x0F, 0x00, + 0x05, 0x03, + 0x03, 0x00, + NULL +}; + +const struct MenuItem gLoadScreenYesNoMenu[3] = +{ + {"Yes", 1}, + {"No", 2}, + {NULL, 3}, +}; ALIGNED(4) const char gTeamHeadingText[] = "Team:"; ALIGNED(4) const char gNameHeadingText[] = "Name:"; diff --git a/src/main_menu.c b/src/main_menu.c index cacae28..30c6642 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -89,7 +89,313 @@ bool8 SetMainMenuText(); void SetMainMenuItems(); void sub_8035DA0(void); -#include "data/menus/main_menu.h" +static const u8 sUnknown_80E5CE4[]; +static const u8 sUnknown_80E5CE8[]; +static const u8 sUnknown_80E5D24[]; +static const u8 sUnknown_80E5D60[]; +static const u8 sUnknown_80E5D88[]; +static const u8 sUnknown_80E5DB8[]; +static const u8 sUnknown_80E5DCC[]; +static const u8 sUnknown_80E5E08[]; +static const u8 sUnknown_80E5E34[]; +static const u8 sUnknown_80E5EA0[]; +static const u8 sUnknown_80E5E74[]; +static const u8 sUnknown_80E5EF8[]; +static const u8 sUnknown_80E5ED4[]; +static const u8 sUnknown_80E5F58[]; +static const u8 sUnknown_80E5F34[]; +static const u8 sUnknown_80E5FB0[]; +static const u8 sUnknown_80E5F98[]; +static const u8 sUnknown_80E5FE4[]; +static const u8 sUnknown_80E6008[]; +static const u8 sUnknown_80E6048[]; +static const u8 sUnknown_80E6070[]; + +const struct UnkTextStruct2 gUnknown_80E59A8 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + NULL +}; + +static const char main_menu_fill[] = "pksdir0"; + +const struct UnkTextStruct2 gUnknown_80E59C8 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + NULL +}; + +const struct UnkTextStruct2 gUnknown_80E59E0 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x0A, 0x03, + 0x03, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80E59F8[] = +{ + {"New Game", MENU_NEW_GAME}, + {"Adventure Log", MENU_ADVENTURE_LOG}, + {NULL, 0xffdd}, +}; + +const struct UnkTextStruct2 gUnknown_80E5A29 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x0A, 0x02, + 0x02, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80E5A44[] = +{ + {"Wonder Mail", MENU_WONDER_MAIL}, + {NULL, 0xffdd}, +}; + +const struct UnkTextStruct2 gUnknown_80E5A60 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x0A, 0x08, + 0x08, 0x00, + NULL +}; + +const struct UnkTextStruct2 gUnknown_80E5A78 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x0B, 0x09, + 0x09, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80E5A90[] = +{ + {"Continue", MENU_CONTINUE}, + {"Delete Save Data", MENU_DELETE_SAVE_PROMPT}, + {"Adventure Log", MENU_ADVENTURE_LOG}, + {"Friend Rescue", MENU_FRIEND_RESCUE}, + {"Trade Items", MENU_TRADE_ITEMS}, + {NULL, 0xffdd}, +}; + +const struct MenuItem gUnknown_80E5AFC[] = +{ + {"Continue", MENU_CONTINUE}, + {"Delete Save Data", MENU_DELETE_SAVE_PROMPT}, + {"Adventure Log", MENU_ADVENTURE_LOG}, + {"Friend Rescue", MENU_FRIEND_RESCUE}, + {"Trade Items", MENU_TRADE_ITEMS}, + {"Wonder Mail", MENU_WONDER_MAIL}, + {NULL, 0xffdd}, +}; + +const struct UnkTextStruct2 gUnknown_80E5B34 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x0A, 0x08, + 0x08, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80E5B4C[] = +{ + {"Awaiting Rescue", MENU_AWAITING_RESCUE}, + {"Delete Save Data", MENU_DELETE_SAVE_PROMPT}, + {"Adventure Log", MENU_ADVENTURE_LOG}, + {"Friend Rescue", MENU_FRIEND_RESCUE}, + {"Trade Items", MENU_TRADE_ITEMS}, + {NULL, 0xffdd}, +}; + +const struct MenuItem gUnknown_80E5B8C[] = +{ + {"Awaiting Rescue", MENU_AWAITING_RESCUE}, + {"Delete Save Data", MENU_DELETE_SAVE_PROMPT}, + {"Adventure Log", MENU_ADVENTURE_LOG}, + {"Friend Rescue", MENU_FRIEND_RESCUE}, + {"Trade Items", MENU_TRADE_ITEMS}, + {"Wonder Mail", MENU_WONDER_MAIL}, + {NULL, 0xffdd}, +}; + +const struct UnkTextStruct2 gUnknown_80E5BC4 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x0A, 0x08, + 0x08, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80E5BDC[] = +{ + {"Revive Team", MENU_CONTINUE}, + {"Delete Save Data", MENU_DELETE_SAVE_PROMPT}, + {"Adventure Log", MENU_ADVENTURE_LOG}, + {"Friend Rescue", MENU_FRIEND_RESCUE}, + {"Trade Items", MENU_TRADE_ITEMS}, + {NULL, 0xffdd}, +}; + +const struct MenuItem gUnknown_80E5C18[] = +{ + {"Revive Team", MENU_CONTINUE}, + {"Delete Save Data", MENU_DELETE_SAVE_PROMPT}, + {"Adventure Log", MENU_ADVENTURE_LOG}, + {"Friend Rescue", MENU_FRIEND_RESCUE}, + {"Trade Items", MENU_TRADE_ITEMS}, + {"Wonder Mail", MENU_WONDER_MAIL}, + {NULL, 0xffdd}, +}; + +const struct UnkTextStruct2 gUnknown_80E5C50 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x0A, 0x03, + 0x03, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80E5C68[] = +{ + {"Send Items", MENU_SEND_ITEMS}, + {"Receive Items", MENU_RECEIVE_ITEMS}, + {NULL, 0xffdd}, +}; + +const struct MenuItem gUnknown_80E5C9C[] = +{ + {"Send Items", -1}, + {"Receive Items", MENU_RECEIVE_ITEMS}, + {NULL, 0xffdd}, +}; + +const struct UnkTextStruct2 gUnknown_80E5CB4 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x0F, 0x00, + 0x1A, 0x03, + 0x03, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80E5CCC[] = +{ + {sUnknown_80E5CE8, 0xffde}, + {sUnknown_80E5CE4, 0xffde}, + {NULL, 0xffdd}, +}; + +static const u8 sUnknown_80E5CE4[] = " "; +static const u8 sUnknown_80E5CE8[] = "Start an entirely new adventure."; + +const struct MenuItem gUnknown_80E5D0C[] = +{ + {sUnknown_80E5D24, 0xffde}, + {sUnknown_80E5CE4, 0xffde}, + {NULL, 0xffdd}, +}; + +static const u8 sUnknown_80E5D24[] = "Check your career as an adventurer."; + +const struct MenuItem gUnknown_80E5D48[] = +{ + {sUnknown_80E5D88, 0xffde}, + {sUnknown_80E5D60, 0xffde}, + {NULL, 0xffdd}, +}; + +static const u8 sUnknown_80E5D60[] = _("It won{APOSTROPHE}t be in the release version."); +static const u8 sUnknown_80E5D88[] = "This is the Debug Mode."; + +const struct MenuItem gUnknown_80E5DA0[] = +{ + {sUnknown_80E5DCC, 0xffde}, + {sUnknown_80E5DB8, 0xffde}, + {NULL, 0xffdd}, +}; + +static const u8 sUnknown_80E5DB8[] = "you last saved. "; +static const u8 sUnknown_80E5DCC[] = "Resume your adventure from where"; + +const struct MenuItem gUnknown_80E5DF0[] = { + {sUnknown_80E5E34, 0xFFDE}, + {sUnknown_80E5E08, 0xFFDE}, + {0, 0xFFDD} +}; + +static const u8 sUnknown_80E5E08[] = _("#C2Beware#R! This will delete it forever!"); +static const u8 sUnknown_80E5E34[] = "This will delete your saved game data."; + +const struct MenuItem gUnknown_80E5E5C[] = { + {sUnknown_80E5EA0, 0xFFDE}, + {sUnknown_80E5E74, 0xFFDE}, + {0, 0xFFDD} +}; + +ALIGNED(4) static const u8 sUnknown_80E5E74[] = _("passwords{COMMA} friends may rescue each other."); +static const u8 sUnknown_80E5EA0[] = "Using a Game Link cable or"; + +const struct MenuItem gUnknown_80E5EBC[] = { + {sUnknown_80E5EF8, 0xFFDE}, + {sUnknown_80E5ED4, 0xFFDE}, + {0, 0xFFDD} +}; + +static const u8 sUnknown_80E5ED4[] = "trade stored items with a friend."; +ALIGNED(4) static const u8 sUnknown_80E5EF8[] = _("Using a Game Link cable{COMMA} you can"); + +const struct MenuItem gUnknown_80E5F1C[] = { + {sUnknown_80E5F58, 0xFFDE}, + {sUnknown_80E5F34, 0xFFDE}, + {0, 0xFFDD} +}; + +static const u8 sUnknown_80E5F34[] = "You can give up waiting for rescue."; +static const u8 sUnknown_80E5F58[] = "You are awaiting rescue by a friend."; + +const struct MenuItem gUnknown_80E5F80[] = { + {sUnknown_80E5FB0, 0xFFDE}, + {sUnknown_80E5F98, 0xFFDE}, + {0, 0xFFDD} +}; + +static const u8 sUnknown_80E5F98[] = "receive Wonder Mail."; +ALIGNED(4) static const u8 sUnknown_80E5FB0[] = _("Using passwords{COMMA} you can"); + +const struct MenuItem gUnknown_80E5FCC[] = { + {sUnknown_80E6008, 0xFFDE}, + {sUnknown_80E5FE4, 0xFFDE}, + {NULL, 0xFFDD} +}; + +static const u8 sUnknown_80E5FE4[] = "receive teams from your friends."; +ALIGNED(4) static const u8 sUnknown_80E6008[] = _("Using the Dual Slot function{COMMA} you can"); + +const struct MenuItem gUnknown_80E6030[] = { + {sUnknown_80E6070, 0xFFDE}, + {sUnknown_80E6048, 0xFFDE}, + {NULL, 0xFFDD} +}; + +static const u8 sUnknown_80E6048[] = "go on an adventure to unknown worlds."; +ALIGNED(4) static const u8 sUnknown_80E6070[] = _("Using wireless communication{COMMA} you can"); +static const u8 sMainMenu_fill0[] = "pksdir0"; + void InitMainMenu(void) { diff --git a/src/post_office_guide.c b/src/post_office_guide.c index 806a2a2..929c2e1 100644 --- a/src/post_office_guide.c +++ b/src/post_office_guide.c @@ -38,24 +38,10 @@ struct unkStruct_203B330 EWRAM_DATA struct unkStruct_203B330 *gUnknown_203B330; -extern const char DeletingMailInfo_Text[]; extern const char GetHelp_Text[]; extern const char GoRescue_Text[]; extern const char FriendRescueInfo_Text[]; -extern const char SendThankYouMail_Text[]; -extern const char ReceiveAOKMail_Text[]; -extern const char SendSOSMail_Text[]; -extern const char GettingHelp_Text[]; -extern const char GetThankYouMail_Text[]; -extern const char SendAOKMail_Text[]; -extern const char LeaveForRescue_Text[]; -extern const char ReceiveSOSMail_Text[]; -extern const char RescueProcedures_Text[]; -extern const char Exit_80EA0EC[]; - - -extern const char Cancel_80E0A78[]; extern const char FriendRescue_80E0A80[]; extern const char Delivery_Text[]; extern const char BulletinBoard_Text[]; @@ -98,7 +84,57 @@ enum PostOfficeMenuActions SEND_THANK_YOU_MAIL }; -#include "data/menus/post_office_guide.h" +const struct MenuItem gPostOfficeHelpStartMenu[] = +{ + {PostOffice_Text, POST_OFFICE}, + {BulletinBoard_Text, BULLETIN_BOARD}, + {Delivery_Text, DELIVERY}, + {FriendRescue_80E0A80, FRIEND_RESCUE}, + {"Cancel", CANCEL}, + {NULL, EXIT} +}; + +ALIGNED(4) const char FriendRescue_80E0A80[] = _("{COLOR_1 YELLOW}Friend Rescue{END_COLOR_TEXT_1} "); +ALIGNED(4) const char Delivery_Text[] = _("Delivery"); +ALIGNED(4) const char BulletinBoard_Text[] = _("Bulletin Board"); +ALIGNED(4) const char PostOffice_Text[] = _("Post Office"); + +const struct MenuItem gPostOfficeHelpFriendRescueMenu[] = +{ + {FriendRescueInfo_Text, FRIEND_RESCUE_INFO}, + {GoRescue_Text, GO_RESCUE}, + {GetHelp_Text, GET_HELP_MENU}, + {"Deleting Mail Info", DELETING_MAIL}, + {"Exit", EXIT}, + {NULL, EXIT} +}; + +ALIGNED(4) const char GetHelp_Text[] = _("{COLOR_1 YELLOW}Get help{END_COLOR_TEXT_1} "); +ALIGNED(4) const char GoRescue_Text[] = _("{COLOR_1 YELLOW}Go rescue{END_COLOR_TEXT_1} "); +ALIGNED(4) const char FriendRescueInfo_Text[] = _("Friend Rescue Info"); + + +const struct MenuItem gPostOfficeHelpGoRescueMenu[] = +{ + {"Rescue Procedures", RESCUE_PROCEDURES}, + {"Receive SOS Mail", RECEIVE_SOS_MAIL}, + {"Leave for Rescue", LEAVE_FOR_RESCUE}, + {"Send A-OK Mail", SEND_AOK_MAIL}, + {"Get Thank-You Mail", GET_THANK_YOU_MAIL}, + {"Exit", EXIT}, + {NULL, EXIT} +}; + +const struct MenuItem gPostOfficeHelpGetHelpMenu[] = +{ + {"Getting Help", GETTING_HELP}, + {"Send SOS Mail", SEND_SOS_MAIL}, + {"Receive A-OK Mail", RECEIVE_AOK_MAIL}, + {"Send Thank-You Mail", SEND_THANK_YOU_MAIL}, + {"Exit", EXIT}, + {NULL, EXIT} +}; + #include "data/pelipper_help_guide_dialogue.h" ALIGNED(4) const u8 wonder_mail_fill[] = _("pksdir0"); diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index ba14515..7e419b2 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -69,7 +69,84 @@ const struct UnkTextStruct2 gUnknown_80DED60 = NULL }; -#include "data/menus/thank_you_wonder_mail.h" +extern const u8 SendItem_Text[]; +extern const u8 DontSendItem_Text[]; + +const struct MenuItem gUnknown_80DED78[3] = +{ + {"Confirm", 0xB}, + {"Info", 0xC}, + {NULL, 0x0}, +}; + +// Unused +const struct UnkTextStruct2 gUnknown_80DEDA0 = +{ + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + NULL +}; + + +const struct MenuItem gThankYouMailMainMenuItems[4] = +{ + {"Send Thank-You Mail", 0x1}, + {"Get Thank-You Mail", 0x2}, + {"Cancel", 0x0}, + {NULL, 0x0}, +}; + +const struct MenuItem gUnknown_80DEE08[4] = +{ + {"Game Link cable", WONDER_MAIL_GAME_LINK}, + {"Password", WONDER_MAIL_PASSWORD}, + {"Cancel", 0x0}, + {NULL, 0x0}, +}; + +const struct MenuItem gUnknown_80DEE44[3] = +{ + {"Yes", 0x7}, + {"Cancel", 0x0}, + {NULL, 0x0}, +}; + +const struct MenuItem gUnknown_80DEE60[3] = +{ + {"Yes", 0x7}, + {"No", 0x8}, + {NULL, 0x0}, +}; + +const struct MenuItem gUnknown_80DEE7C[4] = +{ + {SendItem_Text, 0x9}, + {DontSendItem_Text, 0xA}, + {"Cancel", 0x0}, + {NULL, 0x0}, +}; + +ALIGNED(4) static const u8 DontSendItem_Text[] = _("Don{APOSTROPHE}t Send Item"); +ALIGNED(4) static const u8 SendItem_Text[] = "Send Item"; + +const struct MenuItem gUnknown_80DEEBC[3] = +{ + {"Send w/o Item", 0xA}, + {"Cancel", 0x0}, + {NULL, 0x0}, +}; + +const struct MenuItem gUnknown_80DEEE4[4] = +{ + {"Yes", 0x7}, + {"No", 0x8}, + {"Cancel", 0x0}, + {NULL, 0x0}, +}; + #include "data/thank_you_wonder_mail.h" diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 0aabf2f..0844a96 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -148,7 +148,106 @@ extern void sub_80310B4(void); extern void sub_8030DE4(void); extern void sub_802453C(void); -#include "data/menus/wonder_mail.h" +extern const u8 DontSendPokemon_80DDB80[]; +extern const u8 SendPokemon_80DDB98[]; +extern const u8 SendWOPokemon[]; + +const struct MenuItem gUnknown_80DD970[] = +{ + {"Receive SOS Mail", 0x0}, + {"Leave for Rescue", 0x1}, + {"Send A-OK Mail", 0x2}, + {"Delete Mail", 0x3}, + {"Cancel", 0xA}, + {NULL, 0xA} +}; + +const struct MenuItem gUnknown_80DD9EC[] = +{ + {"Delete SOS Mail", 0x5}, + {"Delete A-OK Mail", 0x6}, + {"Delete All Mail", 0x7}, + {"Cancel", 0xA}, + {NULL, 0xA} +}; + +const struct MenuItem gUnknown_80DDA48[] = +{ + {"Yes", 0x8}, + {"Cancel", 0xA}, + {NULL, 0xA} +}; + +const struct MenuItem gUnknown_80DDA64[] = +{ + {"Yes", 0x8}, + {"No", 0x9}, + {NULL, 0xA} +}; + +const struct MenuItem gUnknown_80DDA80[] = +{ + {"Yes", 0x8}, + {"No", 0x9}, + {"Cancel", 0xA}, + {NULL, 0xA} +}; + +const struct MenuItem gUnknown_80DDAA0[] = +{ + {SendWOPokemon, 0x12}, + {"Cancel", 0xA}, + {NULL, 0xA}, +}; + +ALIGNED(4) const u8 SendWOPokemon[] = _("Send w/o Pokémon"); + +const struct UnkTextStruct2 gUnknown_80DDACC = +{ + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x07, 0x00, + 0x06, 0x04, + 0x04, 0x00, + NULL +}; + +const struct UnkTextStruct2 gUnknown_80DDAE4 = +{ + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x06, 0x00, + 0x06, 0x04, + 0x04, 0x00, + NULL +}; + +const struct MenuItem gUnknown_80DDAFC[] = +{ + {"Confirm", 0xB}, + {"Info", 0xC}, + {NULL, 0xA}, +}; + +const struct MenuItem gUnknown_80DDB24[] = +{ + {"Game Link cable", 0xD}, + {"Password", 0xF}, + {"Cancel", 0xA}, + {NULL, 0xA}, +}; + +const struct MenuItem gUnknown_80DDB60[] = +{ + {SendPokemon_80DDB98, 0x11}, + {DontSendPokemon_80DDB80, 0x12}, + {"Cancel", 0xA}, + {NULL, 0xA}, +}; + +ALIGNED(4) const u8 DontSendPokemon_80DDB80[] = _("Don{APOSTROPHE}t Send Pokémon"); +ALIGNED(4) const u8 SendPokemon_80DDB98[] = _("Send Pokémon"); + #include "data/wonder_mail_1.h" diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index 6a6ad0f..06fdb54 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -24,7 +24,41 @@ #define PASSWORD_INVALID 19 #define PASSWORD_ENTRY_SCREEN 18 -#include "data/menus/wonder_mail_main_menu.h" +extern const char Cancel_80E7D24[]; +extern const char Yes_80E7D2C[]; + +const struct MenuItem gSelectWonderMailModeMainMenuItems[3] = +{ + {"Send", WONDER_MAIL_MODE_SEND}, + {"Receive", WONDER_MAIL_MODE_RECEIVE}, + {NULL, 0} +}; + +const struct MenuItem gSendWonderMailMainMenuItems[4] = +{ + {"Game Link cable", WONDER_MAIL_GAME_LINK}, + {"Password", -1}, + {"Cancel", 8}, + {NULL, 0} + +}; + +const struct MenuItem gReceiveWonderMailMainMenuItems[4] = +{ + {"Game Link cable", WONDER_MAIL_GAME_LINK}, + {"Password", WONDER_MAIL_PASSWORD}, + {"Cancel", 8}, + {NULL, 0} +}; + +const struct MenuItem gUnknown_80E78F8[3] = +{ + {"Yes", 6}, + {"Cancel", 0}, + {NULL, 0} +}; + + #include "data/wonder_mail_main_menu.h" const struct MenuItem WonderMailMainUnused[3] = |