diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/global.h | 2 | ||||
| -rw-r--r-- | include/constants/songs.h | 2 | ||||
| -rw-r--r-- | include/event_data.h | 2 | ||||
| -rw-r--r-- | include/help_system.h | 6 | ||||
| -rw-r--r-- | include/link.h | 1 | ||||
| -rw-r--r-- | include/main_menu.h | 2 | ||||
| -rw-r--r-- | include/mystery_gift_menu.h | 1 | ||||
| -rw-r--r-- | include/quest_log.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 90 | ||||
| -rw-r--r-- | include/text_window_graphics.h | 2 |
11 files changed, 102 insertions, 9 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index a992bc365..a4b891aca 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1377,7 +1377,7 @@ #define TRAINERS_FLAG_NO 0x356 #define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860 -// TODO: Find what these are +// TODO: These three are badge flags #define FLAG_UNK820 0x820 #define FLAG_UNK824 0x824 #define FLAG_UNK826 0x826 diff --git a/include/constants/global.h b/include/constants/global.h index 3cac8d473..d7508c940 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -45,7 +45,7 @@ enum enum { - OPTIONS_BUTTON_MODE_NORMAL, + OPTIONS_BUTTON_MODE_HELP, OPTIONS_BUTTON_MODE_LR, OPTIONS_BUTTON_MODE_L_EQUALS_A }; diff --git a/include/constants/songs.h b/include/constants/songs.h index 193a57756..3c0e72757 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -254,7 +254,7 @@ #define SE_SHIP_HORN 249 #define SE_HELP_OPEN 250 #define SE_HELP_CLOSE 251 -#define SE_HELP_PAGE 252 +#define SE_HELP_ERR 252 #define MUS_ME_ASA 256 #define MUS_FANFA1 257 diff --git a/include/event_data.h b/include/event_data.h index 036b0a325..7c62ac92b 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -32,7 +32,7 @@ u8 FlagSet(u16 id); u8 FlagClear(u16 id); bool8 FlagGet(u16 id); u16 * GetVarPointer(u16 id); -bool32 sub_806E2BC(void); +bool32 Flag_0x839_IsSet(void); void sub_806E6FC(void); void sub_806E2D0(void); void sub_806E370(void); diff --git a/include/help_system.h b/include/help_system.h index 3ba0cf475..f28c168f7 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -25,7 +25,7 @@ struct HelpSystemListMenu extern struct HelpSystemListMenu gHelpSystemListMenu; extern struct ListMenuItem gHelpSystemListMenuItems[]; -extern bool8 gUnknown_3005ECC; +extern bool8 gHelpSystemEnabled; extern u8 gUnknown_203F175; // help_system_812B1E0 @@ -33,8 +33,8 @@ void sub_812B1E0(u8); void HelpSystem_SetSomeVariable2(u8); bool8 sub_812B40C(void); bool8 sub_812B45C(void); -void sub_812B478(void); -void sub_812B484(void); +void HelpSystem_Disable(void); +void HelpSystem_Enable(void); void sub_812B4B8(void); bool8 sub_812BB9C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); bool8 sub_812BC54(struct HelpSystemListMenu * a0, struct ListMenuItem * a1); diff --git a/include/link.h b/include/link.h index 51f103745..7c4b871de 100644 --- a/include/link.h +++ b/include/link.h @@ -256,5 +256,6 @@ void sub_8009FE8(void); void ClearLinkCallback_2(void); void sub_80FA42C(void); void sub_800B284(struct LinkPlayer * linkPlayer); +bool8 IsWirelessAdapterConnected(void); #endif // GUARD_LINK_H diff --git a/include/main_menu.h b/include/main_menu.h index 2a0cd81d5..d8c2a5ab1 100644 --- a/include/main_menu.h +++ b/include/main_menu.h @@ -1,6 +1,6 @@ #ifndef GUARD_MAIN_MENU_H #define GUARD_MAIN_MENU_H -void sub_800C300(void); +void CB2_InitMainMenu(void); #endif //GUARD_MAIN_MENU_H diff --git a/include/mystery_gift_menu.h b/include/mystery_gift_menu.h index c7b047f56..6fed52119 100644 --- a/include/mystery_gift_menu.h +++ b/include/mystery_gift_menu.h @@ -5,5 +5,6 @@ extern bool8 gGiftIsFromEReader; void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void); void PrintMysteryGiftOrEReaderTopMenu(bool8, bool32); +void c2_mystery_gift(void); #endif //GUARD_MYSTERY_GIFT_MENU_H diff --git a/include/quest_log.h b/include/quest_log.h index 7e86e7c2f..8a2816c74 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -35,6 +35,7 @@ void MapNamePopupWindowIdSetDummy(void); void sub_8111CF0(void); void sub_811089C(void); void sub_8113044(void); +void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId); extern u8 gUnknown_203ADFA; diff --git a/include/strings.h b/include/strings.h index 1bafbacbe..e7d40281d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -336,4 +336,94 @@ extern const u8 gText_CommErrorCheckConnections[]; extern const u8 gText_ABtnTitleScreen[]; extern const u8 gText_ABtnRegistrationCounter[]; +// main_menu +extern const u8 gText_SaveFileCorruptedPrevWillBeLoaded[]; +extern const u8 gText_SaveFileHasBeenDeleted[]; +extern const u8 gText_1MSubCircuitBoardNotInstalled[]; +extern const u8 gText_NewGame[]; +extern const u8 gText_Continue[]; +extern const u8 gText_MysteryGift[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_WirelessAdapterIsNotConnected[]; +extern const u8 gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached[]; +extern const u8 gText_Player[]; +extern const u8 gText_Time[]; +extern const u8 gText_Colon[]; +extern const u8 gText_Pokedex[]; +extern const u8 gTextJPDummy_Hiki[]; +extern const u8 gText_Badges[]; +extern const u8 gTextJPDummy_Ko[]; +extern const u8 gUnknown_841B6F4[]; + +// mystery_gift_menu +extern const u8 gText_PickOKExit[]; +extern const u8 gText_PickOKCancel[]; +extern const u8 gText_MysteryGift2[]; +extern const u8 gJPText_MysteryGift[]; +extern const u8 gJPText_DecideStop[]; +extern const u8 gText_WhatToDoWithCards[]; +extern const u8 gText_WhatToDoWithNews[]; +extern const u8 gText_OkayToDiscardNews[]; +extern const u8 gText_IfThrowAwayCardEventWontHappen[]; +extern const u8 gText_WonderCardThrownAway[]; +extern const u8 gText_WonderNewsThrownAway[]; +extern const u8 gText_DataWillBeSaved[]; +extern const u8 gText_SaveCompletedPressA[]; +extern const u8 gText_WonderCards[]; +extern const u8 gText_WonderNews[]; +extern const u8 gText_Exit3[]; +extern const u8 gText_WirelessCommunication[]; +extern const u8 gText_Friend2[]; +extern const u8 gFameCheckerText_Cancel[]; +extern const u8 gText_Receive[]; +extern const u8 gText_Send[]; +extern const u8 gText_Toss[]; +extern const u8 gText_VarietyOfEventsImportedWireless[]; +extern const u8 gText_WonderCardsInPossession[]; +extern const u8 gText_ReadNewsThatArrived[]; +extern const u8 gText_ReturnToTitle[]; +extern const u8 gText_NothingSentOver[]; +extern const u8 gText_RecordUploadedViaWireless[]; +extern const u8 gText_WonderCardReceived[]; +extern const u8 gText_WonderCardReceivedFrom[]; +extern const u8 gText_WonderNewsReceived[]; +extern const u8 gText_WonderNewsReceivedFrom[]; +extern const u8 gText_NewStampReceived[]; +extern const u8 gText_AlreadyHadCard[]; +extern const u8 gText_AlreadyHadStamp[]; +extern const u8 gText_AlreadyHadNews[]; +extern const u8 gText_NoMoreRoomForStamps[]; +extern const u8 gText_CommunicationCanceled[]; +extern const u8 gText_CantAcceptCardFromTrainer[]; +extern const u8 gText_CantAcceptNewsFromTrainer[]; +extern const u8 gText_CommunicationError[]; +extern const u8 gText_NewTrainerReceived[]; +extern const u8 gText_WonderCardSentTo[]; +extern const u8 gText_WonderNewsSentTo[]; +extern const u8 gText_StampSentTo[]; +extern const u8 gText_OtherTrainerHasCard[]; +extern const u8 gText_OtherTrainerHasStamp[]; +extern const u8 gText_OtherTrainerHasNews[]; +extern const u8 gText_OtherTrainerCanceled[]; +extern const u8 gText_GiftSentTo[]; +extern const u8 gText_CantSendGiftToTrainer[]; +extern const u8 gText_DontHaveCardNewOneInput[]; +extern const u8 gText_DontHaveNewsNewOneInput[]; +extern const u8 gText_WhereShouldCardBeAccessed[]; +extern const u8 gText_WhereShouldNewsBeAccessed[]; +extern const u8 gText_Communicating[]; +extern const u8 gText_ThrowAwayWonderCard[]; +extern const u8 gText_HaventReceivedCardsGift[]; +extern const u8 gText_CommunicationCompleted[]; +extern const u8 gText_HaventReceivedGiftOkayToDiscard[]; +extern const u8 gText_SendingWonderCard[]; +extern const u8 gText_SendingWonderNews[]; + #endif //GUARD_STRINGS_H diff --git a/include/text_window_graphics.h b/include/text_window_graphics.h index 17e919705..e2b351de9 100644 --- a/include/text_window_graphics.h +++ b/include/text_window_graphics.h @@ -14,6 +14,6 @@ extern const u16 gUnknown_8471DEC[][16]; extern const struct TextWindowGraphics gUserFrames[]; -const struct TextWindowGraphics * sub_8069788(u8 idx); +const struct TextWindowGraphics * GetUserFrameGraphicsInfo(u8 idx); #endif //GUARD_TEXT_WINDOW_GRAPHICS_H |