diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_pyramid.h | 24 | ||||
| -rw-r--r-- | include/battle_pyramid_bag.h | 1 | ||||
| -rw-r--r-- | include/global.h | 11 |
3 files changed, 32 insertions, 4 deletions
diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h new file mode 100644 index 000000000..5d38e9f35 --- /dev/null +++ b/include/battle_pyramid.h @@ -0,0 +1,24 @@ +#ifndef GUARD_BATTLE_PYRAMID_H +#define GUARD_BATTLE_PYRAMID_H + +void CallBattlePyramidFunction(void); +u16 LocalIdToPyramidTrainerId(u8 localId); +bool8 GetBattlePyramidTrainerFlag(u8 eventId); +void sub_81A9B04(void); +void GenerateBattlePyramidWildMon(void); +u8 GetPyramidRunMultiplier(void); +u8 InBattlePyramid(void); +bool8 InBattlePyramid_(void); +void sub_81A9E90(void); +void sub_81A9EC8(void); +void CopyPyramidTrainerSpeechBefore(u16 trainerId); +void CopyPyramidTrainerWinSpeech(u16 trainerId); +void CopyPyramidTrainerLoseSpeech(u16 trainerId); +u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId); +void sub_81AA078(u16 *mapArg, u8 arg1); +void sub_81AA1D8(void); +void sub_81AA2F8(void); +u8 sub_81AAA40(void); +u16 GetBattlePyramidPickupItemId(void); + +#endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h index 2301b0aa0..48f8de3c0 100644 --- a/include/battle_pyramid_bag.h +++ b/include/battle_pyramid_bag.h @@ -34,6 +34,7 @@ struct PyramidBagCursorData extern struct PyramidBagResources *gPyramidBagResources; extern struct PyramidBagCursorData gPyramidBagCursorData; +void sub_81C4EEC(void); void CB2_PyramidBagMenuFromStartMenu(void); void sub_81C4F84(void); void sub_81C5924(void); diff --git a/include/global.h b/include/global.h index 5a86d5daa..3da68185f 100644 --- a/include/global.h +++ b/include/global.h @@ -135,6 +135,7 @@ enum LanguageId #define BAG_POKEBALLS_COUNT 16 #define BAG_TMHM_COUNT 64 #define BAG_BERRIES_COUNT 46 +#define EVENT_OBJECT_TEMPLATES_COUNT 64 #define PYRAMID_BAG_ITEMS_COUNT 10 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. @@ -442,12 +443,14 @@ struct BattleFrontier /*0xE10*/ u8 field_E10_1:3; /*0xE10*/ u8 field_E10_2:4; /*0xE10*/ u8 field_E10_3:1; - /*0xE12*/ u16 field_E12[4]; + /*0xE12*/ u16 field_E12[3]; + /*0xE18*/ u16 field_E18; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; - /*0xE1E*/ u16 field_E1F[5]; + /*0xE22*/ u16 field_E22[4]; + /*0xE2A*/ u8 field_E2A; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0xE58*/ u16 field_E58; + /*0xE68*/ u8 field_E68; /*0xE6A*/ u16 field_E6A; /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; @@ -905,7 +908,7 @@ struct SaveBlock1 /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64]; + /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; |