diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_pyramid.h | 10 | ||||
| -rw-r--r-- | include/event_scripts.h | 4 | ||||
| -rw-r--r-- | include/global.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 6936cfd42..d77172d0b 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -4,20 +4,20 @@ void CallBattlePyramidFunction(void); u16 LocalIdToPyramidTrainerId(u8 localId); bool8 GetBattlePyramidTrainerFlag(u8 eventId); -void sub_81A9B04(void); +void MarkApproachingPyramidTrainersAsBattled(void); void GenerateBattlePyramidWildMon(void); u8 GetPyramidRunMultiplier(void); u8 InBattlePyramid(void); bool8 InBattlePyramid_(void); void sub_81A9E90(void); -void sub_81A9EC8(void); +void SoftResetInBattlePyramid(void); void CopyPyramidTrainerSpeechBefore(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); -u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId); +u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); -void sub_81AA1D8(void); -void sub_81AA2F8(void); +void LoadBattlePyramidEventObjectTemplates(void); +void LoadBattlePyramidFloorEventObjectScripts(void); u8 GetNumBattlePyramidEventObjects(void); u16 GetBattlePyramidPickupItemId(void); diff --git a/include/event_scripts.h b/include/event_scripts.h index afeac6628..65e2c74b7 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -576,8 +576,8 @@ extern const u8 gUnknown_082A8350[]; // Battle Pyramid. extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[]; +extern const u8 BattlePyramid_TrainerBattle[]; +extern const u8 BattlePyramid_FindItemBall[]; // fldeff misc extern const u8 EventScript_275A86[]; diff --git a/include/global.h b/include/global.h index 903dbe63a..6c1b7c5bb 100644 --- a/include/global.h +++ b/include/global.h @@ -316,7 +316,7 @@ struct BattleFrontier /*0xCAA*/ u16 selectedPartyMons[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 field_CB4[20]; + /*0xCB4*/ u16 trainerIds[20]; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 towerWinStreaks[4][2]; /*0xCF0*/ u16 towerRecordWinStreaks[4][2]; |