diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 3 | ||||
| -rw-r--r-- | include/battle_scripts.h | 2 | ||||
| -rw-r--r-- | include/battle_setup.h | 2 | ||||
| -rw-r--r-- | include/global.h | 7 | ||||
| -rw-r--r-- | include/party_menu.h | 1 |
5 files changed, 14 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index d19c2c851..e0d75fde3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -532,7 +532,7 @@ struct BattleStruct void (*savedCallback)(void); u8 synchronizeMoveEffect; u8 multiplayerId; - u8 field_B6; + u8 overworldWeatherDone; u8 atkCancellerTracker; u16 usedHeldItems[MAX_BATTLERS_COUNT]; u8 chosenItem[4]; // why is this an u8? @@ -932,5 +932,6 @@ extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; extern u8 gBattleTerrain; extern struct UnknownPokemonStruct4 gUnknown_2022B58[3]; extern u16 *gUnknown_2022BC0; +extern u16 gRandomTurnNumber; #endif // GUARD_BATTLE_H diff --git a/include/battle_scripts.h b/include/battle_scripts.h index a13a8c097..870b0524e 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -227,5 +227,7 @@ extern const u8 BattleScript_FlushMessageBox[]; extern const u8 BattleScript_SpikesOnFaintedBattler[]; extern const u8 BattleScript_GhostBallDodge[]; extern const u8 gUnknown_81D9A88[]; +extern const u8 gUnknown_81D91A1[]; // knizz: silph scope unveil +extern const u8 gUnknown_81D88D7[]; #endif // GUARD_BATTLE_SCRIPTS_H diff --git a/include/battle_setup.h b/include/battle_setup.h index 61395811b..dc989d381 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -18,5 +18,7 @@ u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetTrainerPostBattleScript(void); void sub_80803FC(void); u8 sub_8080060(void); +u8 sub_80803CC(void); +u16 sub_80803D8(void); #endif // GUARD_BATTLE_SETUP_H diff --git a/include/global.h b/include/global.h index 5ddf9a0a8..4ca2538b2 100644 --- a/include/global.h +++ b/include/global.h @@ -32,6 +32,13 @@ // GF's lingo #define NELEMS ARRAY_COUNT +#define SWAP(a, b, temp) \ +{ \ + temp = a; \ + a = b; \ + b = temp; \ +} + // useful math macros // Converts a number to Q8.8 fixed-point format diff --git a/include/party_menu.h b/include/party_menu.h index 6d124e14e..53731bee6 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -85,5 +85,6 @@ void sub_8126EDC(void); void PartyMenuInit_FromPlayerPc(void); void CB2_PartyMenuFromStartMenu(void); void sub_8128198(void); +void sub_8127FF4(u8 slot, u8 slot2); #endif // GUARD_PARTY_MENU_H |