diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/rgb.h | 1 | ||||
| -rw-r--r-- | include/field_effect.h | 1 | ||||
| -rw-r--r-- | include/link.h | 4 | ||||
| -rw-r--r-- | include/menu.h | 1 | ||||
| -rw-r--r-- | include/menu_indicators.h | 10 | ||||
| -rw-r--r-- | include/overworld.h | 1 | ||||
| -rw-r--r-- | include/pokemon_3.h | 10 | ||||
| -rw-r--r-- | include/strings.h | 70 |
8 files changed, 97 insertions, 1 deletions
diff --git a/include/constants/rgb.h b/include/constants/rgb.h index 8b323799f..fd9c5c5a7 100644 --- a/include/constants/rgb.h +++ b/include/constants/rgb.h @@ -12,5 +12,6 @@ #define RGB_YELLOW RGB(31, 31, 0) #define RGB_MAGENTA RGB(31, 0, 31) #define RGB_CYAN RGB(0, 31, 31) +#define RGB_WHITEALPHA RGB_WHITE | 0x8000 #endif // GUARD_RGB_H diff --git a/include/field_effect.h b/include/field_effect.h index 7395270f9..f59dfab9b 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -74,6 +74,7 @@ extern u32 gFieldEffectArguments[8]; u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); void sub_80B69DC(void); +u8 AddNewGameBirchObject(s16, s16, u8); void FieldEffectStop(struct Sprite *sprite, u8 id); u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); void sub_80B7FC8(void); diff --git a/include/link.h b/include/link.h index b6f9b86d7..0fa4d39c2 100644 --- a/include/link.h +++ b/include/link.h @@ -198,6 +198,10 @@ extern u32 gUnknown_020223C0; extern bool8 gLinkVSyncDisabled; extern u32 gLinkStatus; + +void c2_mystery_gift(void); +void sub_801867C(void); +bool8 sub_80093CC(void); void Task_DestroySelf(u8 taskId); void OpenLink(void); void CloseLink(void); diff --git a/include/menu.h b/include/menu.h index c85d01e2b..c2f15422a 100644 --- a/include/menu.h +++ b/include/menu.h @@ -34,6 +34,7 @@ void sub_8197930(void); u8 GetPlayerTextSpeed(void); void sub_81978B0(u16 arg0); +void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16)); void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); void sub_8198070(u8 windowId, bool8 copyToVram); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); diff --git a/include/menu_indicators.h b/include/menu_indicators.h index 794ecf777..b82e48725 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -6,9 +6,17 @@ // Exported RAM declarations // Exported ROM declarations + +struct ArrowStruct { + u8 unk0[6]; + u16 unk6[4]; + u8 unkE; +}; + +void Task_ScrollIndicatorArrowPairOnMainMenu(u8); u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *); void RemoveScrollIndicatorArrowPair(u8); -u8 AddScrollIndicatorArrowPair(void*, void*); +u8 AddScrollIndicatorArrowPair(const struct ArrowStruct*, void*); void sub_81AF15C(u8, u8, u8); #endif //GUARD_MENU_INDICATORS_H diff --git a/include/overworld.h b/include/overworld.h index e42c2fed3..db4d96a89 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -54,6 +54,7 @@ void Overworld_ChangeMusicTo(u16); bool32 is_c1_link_related_active(void); extern u16 gUnknown_03005DA8; +void CB2_NewGame(void); void strange_npc_table_clear(void); const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16); void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); diff --git a/include/pokemon_3.h b/include/pokemon_3.h new file mode 100644 index 000000000..263839b19 --- /dev/null +++ b/include/pokemon_3.h @@ -0,0 +1,10 @@ +#ifndef GUARD_POKEMON_3_H +#define GUARD_POKEMON_3_H + +u16 sub_806EFF0(u16); +const u8* GetTrainerClassNameFromId(u16 trainerId); +const u8* GetTrainerNameFromId(u16 trainerId); +void PlayMapChosenOrBattleBGM(u16 song); +u8 GetTrainerEncounterMusicId(u16 trainerOpponentId); + +#endif // GUARD_POKEMON_3_H diff --git a/include/strings.h b/include/strings.h index 69fd1bba3..c9ebc175f 100644 --- a/include/strings.h +++ b/include/strings.h @@ -231,6 +231,76 @@ extern const u8 gText_FemaleSymbol[]; extern const u8 gText_SelectorArrow3[]; extern const u8 gText_YesNo[]; +// main menu/birch speech text +extern const u8 gText_SaveFileErased[]; +extern const u8 gText_SaveFileCorrupted[]; +extern const u8 gJPText_No1MSubCircuit[]; +extern const u8 gText_BatteryRunDry[]; +extern const u8 gText_MainMenuNewGame[]; +extern const u8 gText_MainMenuOption[]; +extern const u8 gText_MainMenuContinue[]; +extern const u8 gText_MainMenuMysteryGift2[]; +extern const u8 gText_MainMenuMysteryEvents[]; +extern const u8 gText_MainMenuMysteryGift[]; +extern const u8 gText_WirelessNotConnected[]; +extern const u8 gText_MysteryGiftCantUse[]; +extern const u8 gText_MysteryEventsCantUse[]; +extern const u8 gText_Birch_Welcome[]; +extern const u8 gText_ThisIsAPokemon[]; +extern const u8 gText_Birch_MainSpeech[]; +extern const u8 gText_Birch_AndYouAre[]; +extern const u8 gText_Birch_BoyOrGirl[]; +extern const u8 gText_Birch_WhatsYourName[]; +extern const u8 gText_Birch_SoItsPlayer[]; +extern const u8 gText_Birch_YourePlayer[]; +extern const u8 gText_Birch_AreYouReady[]; +extern const u8 gText_ContinueMenuPlayer[]; +extern const u8 gText_ContinueMenuTime[]; +extern const u8 gText_ContinueMenuPokedex[]; +extern const u8 gText_ContinueMenuBadges[]; +extern const u8 gText_BirchBoy[]; +extern const u8 gText_BirchGirl[]; +extern const u8 gText_DefaultNameStu[]; +extern const u8 gText_DefaultNameMilton[]; +extern const u8 gText_DefaultNameTom[]; +extern const u8 gText_DefaultNameKenny[]; +extern const u8 gText_DefaultNameReid[]; +extern const u8 gText_DefaultNameJude[]; +extern const u8 gText_DefaultNameJaxson[]; +extern const u8 gText_DefaultNameEaston[]; +extern const u8 gText_DefaultNameWalker[]; +extern const u8 gText_DefaultNameTeru[]; +extern const u8 gText_DefaultNameJohnny[]; +extern const u8 gText_DefaultNameBrett[]; +extern const u8 gText_DefaultNameSeth[]; +extern const u8 gText_DefaultNameTerry[]; +extern const u8 gText_DefaultNameCasey[]; +extern const u8 gText_DefaultNameDarren[]; +extern const u8 gText_DefaultNameLandon[]; +extern const u8 gText_DefaultNameCollin[]; +extern const u8 gText_DefaultNameStanley[]; +extern const u8 gText_DefaultNameQuincy[]; +extern const u8 gText_DefaultNameKimmy[]; +extern const u8 gText_DefaultNameTiara[]; +extern const u8 gText_DefaultNameBella[]; +extern const u8 gText_DefaultNameJayla[]; +extern const u8 gText_DefaultNameAllie[]; +extern const u8 gText_DefaultNameLianna[]; +extern const u8 gText_DefaultNameSara[]; +extern const u8 gText_DefaultNameMonica[]; +extern const u8 gText_DefaultNameCamila[]; +extern const u8 gText_DefaultNameAubree[]; +extern const u8 gText_DefaultNameRuthie[]; +extern const u8 gText_DefaultNameHazel[]; +extern const u8 gText_DefaultNameNadine[]; +extern const u8 gText_DefaultNameTanja[]; +extern const u8 gText_DefaultNameYasmin[]; +extern const u8 gText_DefaultNameNicola[]; +extern const u8 gText_DefaultNameLillie[]; +extern const u8 gText_DefaultNameTerra[]; +extern const u8 gText_DefaultNameLucy[]; +extern const u8 gText_DefaultNameHalie[]; + // mystery event menu text extern const u8 gText_EventSafelyLoaded[]; extern const u8 gText_LoadErrorEndingSession[]; |