Document a bunch of battle pyramid

This commit is contained in:
Marcus Huderle
2019-02-06 20:01:29 -06:00
committed by huderlem
parent 1253cbf5f6
commit a1ad1bad3a
15 changed files with 1094 additions and 1051 deletions

View File

@@ -15,10 +15,10 @@ void CopyPyramidTrainerSpeechBefore(u16 trainerId);
void CopyPyramidTrainerWinSpeech(u16 trainerId);
void CopyPyramidTrainerLoseSpeech(u16 trainerId);
u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId);
void sub_81AA078(u16 *mapArg, u8 arg1);
void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition);
void sub_81AA1D8(void);
void sub_81AA2F8(void);
u8 sub_81AAA40(void);
u8 GetNumBattlePyramidEventObjects(void);
u16 GetBattlePyramidPickupItemId(void);
#endif // GUARD_BATTLE_PYRAMID_H

View File

@@ -34,7 +34,7 @@ struct PyramidBagCursorData
extern struct PyramidBagResources *gPyramidBagResources;
extern struct PyramidBagCursorData gPyramidBagCursorData;
void sub_81C4EEC(void);
void InitBattlePyramidBagCursorPosition(void);
void CB2_PyramidBagMenuFromStartMenu(void);
void sub_81C4F84(void);
void sub_81C5924(void);

View File

@@ -34,7 +34,7 @@ void sub_80AF948(void);
void sub_80AF9F8(void);
void sub_80AFC60(void);
void sub_80B009C(u8 flashLevel);
void door_upload_tiles(void);
void WriteBattlePyramidViewScanlineEffectBuffer(void);
void sub_80B0244(void);
void sub_80B0268(void);
void sub_80B0534(void);

View File

@@ -32,7 +32,7 @@ void sub_8088B3C(u16 x, u16 y);
void InitMap(void);
void InitMapFromSavedGame(void);
void InitTrainerHillMap(void);
void InitBattlePyramidMap(u8 a0);
void InitBattlePyramidMap(bool8 setPlayerPosition);
void SpriteCB_PokeballGlow(struct Sprite *);
void SpriteCB_PokecenterMonitor(struct Sprite *);

View File

@@ -360,13 +360,13 @@ struct BattleFrontier
/*0xE10*/ u8 field_E10_2:4;
/*0xE10*/ u8 field_E10_3:1;
/*0xE12*/ u16 field_E12[3];
/*0xE18*/ u16 field_E18;
/*0xE18*/ u16 pyramidRewardItem;
/*0xE1A*/ u16 pyramidWinStreaks[2];
/*0xE1E*/ u16 pyramidRecordStreaks[2];
/*0xE22*/ u16 field_E22[4];
/*0xE2A*/ u8 field_E2A;
/*0xE22*/ u16 pyramidRandoms[4];
/*0xE2A*/ u8 pyramidTrainerFlags;
/*0xE2C*/ struct PyramidBag pyramidBag;
/*0xE68*/ u8 field_E68;
/*0xE68*/ u8 pyramidLightRadius;
/*0xE6A*/ u16 field_E6A;
/*0xE6C*/ u16 field_E6C;
/*0xE6E*/ u16 field_E6E;

View File

@@ -6,6 +6,6 @@
#define GUARD_ROM_818CFC8_H
bool8 InBattlePyramid(void);
u8 sub_81AAA40(void);
u8 GetNumBattlePyramidEventObjects(void);
#endif //GUARD_ROM_818CFC8_H

View File

@@ -1688,132 +1688,132 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[];
extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[];
// Battle Pyramid.
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D81[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DAB[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25330B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2532CC[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25328B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253248[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253206[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2531C4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253183[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253140[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530FD[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544A6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25445A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25440B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2543BA[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25436A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25431A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2542CB[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25427A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DD5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E03[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E31[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E5F[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25362E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2535D4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253578[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25351A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2534BD[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253460[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253404[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2533A6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25334D[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25471E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2546CC[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25467C[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25462A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2545D9[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254588[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254538[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544E6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E8D[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EAA[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EC7[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EE4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2539EC[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253980[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253915[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2538A8[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25383C[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2537D0[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253765[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2536F8[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25368B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A0B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2549AE[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25494D[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2548EB[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25488A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254829[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2547C9[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254767[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F01[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F3A[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F73[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FAC[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D3E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253CE0[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C87[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C2C[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253BD2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B78[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B1F[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253AC4[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253A69[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C3E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BF1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BAE[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B69[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B25[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254AE1[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A9E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A59[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FE5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253000[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25301B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253036[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F6C[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F34[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EFA[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EBE[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E83[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E48[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E0E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253DD2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D96[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E6E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E27[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254DE0[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D97[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D4F[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D07[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254CC0[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C77[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253051[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25307C[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530A7[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530D2[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25422B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2541DD[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25418D[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25413B[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2540EA[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254099[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254049[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FF7[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FA5[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_255068[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25502F[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FF6[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FBB[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F81[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[];
extern const u8 BattlePyramid_ExitHintUp_Text1[];
extern const u8 BattlePyramid_ExitHintLeft_Text1[];
extern const u8 BattlePyramid_ExitHintRight_Text1[];
extern const u8 BattlePyramid_ExitHintDown_Text1[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text1[];
extern const u8 BattlePyramid_OneItemRemaining_Text1[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text1[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text1[];
extern const u8 BattlePyramid_FourItemsRemaining_Text1[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text1[];
extern const u8 BattlePyramid_SixItemsRemaining_Text1[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text1[];
extern const u8 BattlePyramid_EightItemsRemaining_Text1[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text1[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text1[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text1[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text1[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text1[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text1[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text1[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text1[];
extern const u8 BattlePyramid_ExitHintUp_Text2[];
extern const u8 BattlePyramid_ExitHintLeft_Text2[];
extern const u8 BattlePyramid_ExitHintRight_Text2[];
extern const u8 BattlePyramid_ExitHintDown_Text2[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text2[];
extern const u8 BattlePyramid_OneItemRemaining_Text2[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text2[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text2[];
extern const u8 BattlePyramid_FourItemsRemaining_Text2[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text2[];
extern const u8 BattlePyramid_SixItemsRemaining_Text2[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text2[];
extern const u8 BattlePyramid_EightItemsRemaining_Text2[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text2[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text2[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text2[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text2[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text2[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text2[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text2[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text2[];
extern const u8 BattlePyramid_ExitHintUp_Text3[];
extern const u8 BattlePyramid_ExitHintLeft_Text3[];
extern const u8 BattlePyramid_ExitHintRight_Text3[];
extern const u8 BattlePyramid_ExitHintDown_Text3[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text3[];
extern const u8 BattlePyramid_OneItemRemaining_Text3[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text3[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text3[];
extern const u8 BattlePyramid_FourItemsRemaining_Text3[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text3[];
extern const u8 BattlePyramid_SixItemsRemaining_Text3[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text3[];
extern const u8 BattlePyramid_EightItemsRemaining_Text3[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text3[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text3[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text3[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text3[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text3[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text3[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text3[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text3[];
extern const u8 BattlePyramid_ExitHintUp_Text4[];
extern const u8 BattlePyramid_ExitHintLeft_Text4[];
extern const u8 BattlePyramid_ExitHintRight_Text4[];
extern const u8 BattlePyramid_ExitHintDown_Text4[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text4[];
extern const u8 BattlePyramid_OneItemRemaining_Text4[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text4[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text4[];
extern const u8 BattlePyramid_FourItemsRemaining_Text4[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text4[];
extern const u8 BattlePyramid_SixItemsRemaining_Text4[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text4[];
extern const u8 BattlePyramid_EightItemsRemaining_Text4[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text4[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text4[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text4[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text4[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text4[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text4[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text4[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text4[];
extern const u8 BattlePyramid_ExitHintUp_Text5[];
extern const u8 BattlePyramid_ExitHintLeft_Text5[];
extern const u8 BattlePyramid_ExitHintRight_Text5[];
extern const u8 BattlePyramid_ExitHintDown_Text5[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text5[];
extern const u8 BattlePyramid_OneItemRemaining_Text5[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text5[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text5[];
extern const u8 BattlePyramid_FourItemsRemaining_Text5[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text5[];
extern const u8 BattlePyramid_SixItemsRemaining_Text5[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text5[];
extern const u8 BattlePyramid_EightItemsRemaining_Text5[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text5[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text5[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text5[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text5[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text5[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text5[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text5[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text5[];
extern const u8 BattlePyramid_ExitHintUp_Text6[];
extern const u8 BattlePyramid_ExitHintLeft_Text6[];
extern const u8 BattlePyramid_ExitHintRight_Text6[];
extern const u8 BattlePyramid_ExitHintDown_Text6[];
extern const u8 BattlePyramid_ZeroItemsRemaining_Text6[];
extern const u8 BattlePyramid_OneItemRemaining_Text6[];
extern const u8 BattlePyramid_TwoItemsRemaining_Text6[];
extern const u8 BattlePyramid_ThreeItemsRemaining_Text6[];
extern const u8 BattlePyramid_FourItemsRemaining_Text6[];
extern const u8 BattlePyramid_FiveItemsRemaining_Text6[];
extern const u8 BattlePyramid_SixItemsRemaining_Text6[];
extern const u8 BattlePyramid_SevenItemsRemaining_Text6[];
extern const u8 BattlePyramid_EightItemsRemaining_Text6[];
extern const u8 BattlePyramid_ZeroTrainersRemaining_Text6[];
extern const u8 BattlePyramid_OneTrainersRemaining_Text6[];
extern const u8 BattlePyramid_TwoTrainersRemaining_Text6[];
extern const u8 BattlePyramid_ThreeTrainersRemaining_Text6[];
extern const u8 BattlePyramid_FourTrainersRemaining_Text6[];
extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[];
extern const u8 BattlePyramid_SixTrainersRemaining_Text6[];
extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[];
// PC strings
extern const u8 gText_ExitFromBox[];