through sub_815E1F0

This commit is contained in:
PikalaxALT
2019-01-05 17:08:30 -05:00
parent 3a4f44ef36
commit 4b459cd460
11 changed files with 225 additions and 355 deletions
+1
View File
@@ -43,6 +43,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
void RunBattleScriptCommands_PopCallbacksStack(void);
void RunBattleScriptCommands(void);
bool8 TryRunFromBattle(u8 bank);
void sub_800FD9C(void);
extern const u8 gStatusConditionString_PoisonJpn[8];
extern const u8 gStatusConditionString_SleepJpn[8];
+1
View File
@@ -17,5 +17,6 @@ void BattleSetup_StartTrainerBattle(void);
u8 *BattleSetup_GetScriptAddrAfterBattle(void);
u8 *BattleSetup_GetTrainerPostBattleScript(void);
void sub_80803FC(void);
u8 sub_8080060(void);
#endif // GUARD_BATTLE_SETUP_H
+3 -1
View File
@@ -3,6 +3,8 @@
#include "global.h"
void sub_8149DFC(u8 a1);
void sub_8149DFC(u8 a0);
bool8 sub_80D08F8(void);
void sub_80D08B8(u8 a0);
#endif // GUARD_BATTLE_TRANSITION_H
+3
View File
@@ -59,4 +59,7 @@ extern u16 gSpecialVar_0x8014;
extern u16 gSpecialVar_Result;
extern u16 gSpecialVar_0x8004;
extern u16 gUnknown_20370DA;
extern u16 gUnknown_20370DC;
#endif // GUARD_EVENT_DATA_H
+8 -1
View File
@@ -709,6 +709,13 @@ struct MEventBuffers
/*0x344 0x3464*/ u32 unk_344[2][5];
}; // 0x36C 0x348C
struct TrainerTowerLog
{
u32 unk0;
u32 unk4;
u8 unk8;
};
struct SaveBlock1
{
/*0x0000*/ struct Coords16 pos;
@@ -766,7 +773,7 @@ struct SaveBlock1
/*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
/*0x3A94*/ u8 filler3A94[0x2A0];
/*0x3D34*/ u32 unkArrayIdx;
/*0x3D38*/ u32 unkArray[4][3];
/*0x3D38*/ struct TrainerTowerLog unkArray[4];
};
extern struct SaveBlock1* gSaveBlock1Ptr;
+1
View File
@@ -82,6 +82,7 @@ void sub_8055DC4(void);
u8 sav1_map_get_name(void);
void sub_8055D40(u16 mapDataId);
void sub_80563F0(void);
extern u8 gUnknown_2031DD8;
extern u8 gUnknown_2036E28;
+2
View File
@@ -670,4 +670,6 @@ void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry,
void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
void PlayMapChosenOrBattleBGM(u16 songId);
#endif // GUARD_POKEMON_H