From 601a942db45bd5697d15ae2fd8ab10c8259410b4 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sun, 11 Feb 2018 17:19:36 -0500 Subject: decompile main_menu --- include/field_effect.h | 1 + include/link.h | 4 ++++ include/menu.h | 1 + include/menu_indicators.h | 1 + include/overworld.h | 1 + include/pokemon_3.h | 1 + include/strings.h | 28 ++++++++++++++++++++++++++++ 7 files changed, 37 insertions(+) (limited to 'include') 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 1c9795d29..202e2a4d7 100644 --- a/include/link.h +++ b/include/link.h @@ -145,6 +145,10 @@ extern bool8 gReceivedRemoteLinkPlayers; 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 2046f7d2b..18d391317 100644 --- a/include/menu.h +++ b/include/menu.h @@ -32,6 +32,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 d0baac810..694c01fd9 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -6,6 +6,7 @@ // Exported RAM declarations // Exported ROM declarations +void Task_ScrollIndicatorArrowPairOnMainMenu(u8); u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *); void RemoveScrollIndicatorArrowPair(u8); diff --git a/include/overworld.h b/include/overworld.h index 974f8f091..36198e124 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -55,6 +55,7 @@ void Overworld_ChangeMusicTo(u16); bool32 is_c1_link_related_active(void); +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 index 82dfacf48..263839b19 100644 --- a/include/pokemon_3.h +++ b/include/pokemon_3.h @@ -1,6 +1,7 @@ #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); diff --git a/include/strings.h b/include/strings.h index 6d569e57a..a3d2a2fb7 100644 --- a/include/strings.h +++ b/include/strings.h @@ -218,6 +218,34 @@ 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[]; + // mystery event menu text extern const u8 gText_EventSafelyLoaded[]; extern const u8 gText_LoadErrorEndingSession[]; -- cgit v1.2.3 From 42cfbcb197bb271e675a4b2b9e70a2647bd65532 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sun, 11 Feb 2018 18:00:45 -0500 Subject: some fixes --- include/graphics.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 39662c8c1..4eac25856 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2713,6 +2713,15 @@ extern const u8 gRaySceneHushBg_Pal[]; extern const u8 gRaySceneHushBg_Gfx[]; extern const u8 gRaySceneHushRing_Gfx[]; +//main menu/birch graphics +extern const u16 gMainMenuBgPal[]; +extern const u16 gMainMenuTextPal[]; +extern const u16 gUnknown_082FECFC[]; +extern const u16 gUnknown_082FF028[]; +extern const u16 gUnknown_082FF018[]; +extern const u8 gBirchIntroShadowGfx[]; +extern const u8 gUnknown_082FEEF0[]; + //menu graphics extern const u16 gFireRedMenuElements1_Pal[16]; extern const u16 gFireRedMenuElements2_Pal[16]; -- cgit v1.2.3 From e375606810395d3941f2866505c6516949393d2b Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Tue, 13 Feb 2018 21:52:33 +0530 Subject: [Do not Merge] fldeff_strength.s --- include/rom6.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/rom6.h b/include/rom6.h index f91b34b4a..058504fe2 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -11,6 +11,8 @@ void UpdateBirchState(u16 days); void UpdateFrontierManiac(u16 days); void UpdateFrontierGambler(u16 days); void SetShoalItemFlag(u16 days); + +bool8 npc_before_player_of_type(u8); u8 oei_task_add(void); #endif //GUARD_ROM6_H -- cgit v1.2.3 From c959dc11748f3548d5356526f29bc64e355deca9 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Tue, 13 Feb 2018 23:08:54 +0530 Subject: Finish fldeff_strength.s --- include/event_scripts.h | 2 ++ include/field_effect.h | 2 ++ 2 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index a54e0e463..103879101 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -380,4 +380,6 @@ extern const u8 SecretBase_RedCave1_Text_274E75[]; extern const u8 SecretBase_RedCave1_Text_2751E1[]; extern const u8 SecretBase_RedCave1_Text_2754F6[]; extern const u8 SecretBase_RedCave1_Text_2758CC[]; + +extern const u8 FieryPath_EventScript_2908FD[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_effect.h b/include/field_effect.h index 7395270f9..6f5a9886f 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -79,5 +79,7 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf void sub_80B7FC8(void); void FieldEffectActiveListRemove(u8 id); void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8); +extern void (*gUnknown_0203CEEC)(void); +extern bool8 (*gUnknown_03005DB0)(void); #endif //GUARD_FIELD_EFFECTS_H -- cgit v1.2.3 From deeaac2bf17479b671d989cd50e236dd39f6e52c Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Wed, 14 Feb 2018 17:24:31 +0530 Subject: Decompile fldeff_sweetsecent.c --- include/event_scripts.h | 1 + include/field_player_avatar.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index 103879101..a835782ed 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -382,4 +382,5 @@ extern const u8 SecretBase_RedCave1_Text_2754F6[]; extern const u8 SecretBase_RedCave1_Text_2758CC[]; extern const u8 FieryPath_EventScript_2908FD[]; +extern const u8 EventScript_290CAE[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 5b9a632fa..7517fb3b8 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -5,6 +5,7 @@ void ClearPlayerAvatarInfo(void); void SetPlayerAvatarExtraStateTransition(u8, u8); u8 GetPlayerAvatarGenderByGraphicsId(u8); bool8 TestPlayerAvatarFlags(u8); +u8 GetPlayerAvatarObjectId(void); void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); u8 player_get_direction_upper_nybble(void); -- cgit v1.2.3 From c3c30417efdeb26a9b5f16b65aff8557e94ff438 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 14 Feb 2018 20:45:27 -0500 Subject: fixes --- include/constants/rgb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') 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 -- cgit v1.2.3 From 2fb78b5ca8e24e895b66170806871d60164df554 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Thu, 15 Feb 2018 09:47:42 +0530 Subject: Fix reviewed points. --- include/field_screen.h | 2 ++ include/fldeff_groundshake.h | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 include/fldeff_groundshake.h (limited to 'include') diff --git a/include/field_screen.h b/include/field_screen.h index cfc0d081f..02e0a0a91 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -10,5 +10,7 @@ void pal_fill_black(void); bool8 sub_80ABDFC(void); void sub_80AF168(void); void UpdateWeatherPerDay(u16 days); +void sub_80AC3D0(void); +void sub_80AC3E4(void); #endif //GUARD_FIELD_SCREEN_H diff --git a/include/fldeff_groundshake.h b/include/fldeff_groundshake.h new file mode 100644 index 000000000..685a6d27c --- /dev/null +++ b/include/fldeff_groundshake.h @@ -0,0 +1,7 @@ +#ifndef GUARD_FLDEFF_GROUNDSHAKE_H +#define GUARD_FLDEFF_GROUNDSHAKE_H + +void sub_81BE6B8(void); +void sub_81BE72C(void); + +#endif // GUARD_FLDEFF_GROUNDSHAKE_H -- cgit v1.2.3