thru HandleEndTurn_MonFled
This commit is contained in:
+2
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user