diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 19 | ||||
| -rw-r--r-- | include/battle_bg.h | 3 | ||||
| -rw-r--r-- | include/berry.h | 2 | ||||
| -rw-r--r-- | include/constants/trainers.h | 2 | ||||
| -rw-r--r-- | include/link_rfu.h | 2 | ||||
| -rw-r--r-- | include/party_menu.h | 1 |
6 files changed, 19 insertions, 10 deletions
diff --git a/include/battle.h b/include/battle.h index 3ec32e17f..d19c2c851 100644 --- a/include/battle.h +++ b/include/battle.h @@ -528,14 +528,10 @@ struct BattleStruct u16 hpOnSwitchout[2]; u8 abilityPreventingSwitchout; u8 hpScale; - u8 field_AE; - u8 field_AF; - u8 field_B0; - u8 field_B1; - u8 field_B2; - u8 field_B3; + u16 savedBattleTypeFlags; // ??? + void (*savedCallback)(void); u8 synchronizeMoveEffect; - u8 field_B5; + u8 multiplayerId; u8 field_B6; u8 atkCancellerTracker; u16 usedHeldItems[MAX_BATTLERS_COUNT]; @@ -556,7 +552,12 @@ struct BattleStruct u8 wishPerishSongBattlerId; u8 field_182; u8 field_183; - u8 field_184[124]; // currently unknown + u8 field_184; + u8 field_185; + u8 field_186; + u8 field_187; + struct BattleEnigmaBerry battleEnigmaBerry; + u8 field_1A4[0x5C]; // currently unknown }; // size == 0x200 bytes extern struct BattleStruct *gBattleStruct; @@ -929,5 +930,7 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; extern u8 gBattleTerrain; +extern struct UnknownPokemonStruct4 gUnknown_2022B58[3]; +extern u16 *gUnknown_2022BC0; #endif // GUARD_BATTLE_H diff --git a/include/battle_bg.h b/include/battle_bg.h index 6bf90a104..9449e3f73 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -2,5 +2,8 @@ #define GUARD_BATTLE_BG_H void sub_800F34C(void); +void DrawBattleEntryBackground(void); +void sub_800F6FC(u8 taskId); +void LoadBattleMenuWindowGfx(void); #endif // GUARD_BATTLE_BG_H diff --git a/include/berry.h b/include/berry.h index 0e554a789..d55192301 100644 --- a/include/berry.h +++ b/include/berry.h @@ -63,7 +63,7 @@ void FieldObjectInteractionRemoveBerryTree(void); u8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); void sub_809C794(void); -const struct Berry * sub_809C8A0(u8 berryIdx); +const struct Berry * GetBerryInfo(u8 berryIdx); extern const struct Berry gBerries[]; diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 1aad499a1..73244ba90 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRAINERS_H #define GUARD_TRAINERS_H +#define TRAINER_SECRET_BASE 1024 + #define F_TRAINER_FEMALE (1 << 7) // All trainer parties specify the IV, level, and species for each Pokémon in the diff --git a/include/link_rfu.h b/include/link_rfu.h index 2be9dd3c9..f5aa682e6 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -11,7 +11,7 @@ bool32 MG_PrintTextOnWindow1AndWaitButton(u8 * cmdPtr, const u8 * src); void sub_80FA190(void); void MG_DrawCheckerboardPattern(void); void task_add_05_task_del_08FA224_when_no_RfuFunc(void); -bool8 IsRfuTaskFinished(void); +bool8 IsLinkRfuTaskFinished(void); void DestroyWirelessStatusIndicatorSprite(void); void MEvent_CreateTask_CardOrNewsWithFriend(u8); void MEvent_CreateTask_CardOrNewsOverWireless(u8); diff --git a/include/party_menu.h b/include/party_menu.h index 5b9b6e1c4..6d124e14e 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -84,5 +84,6 @@ bool8 IsMultiBattle(void); void sub_8126EDC(void); void PartyMenuInit_FromPlayerPc(void); void CB2_PartyMenuFromStartMenu(void); +void sub_8128198(void); #endif // GUARD_PARTY_MENU_H |