diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
| commit | 23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch) | |
| tree | 9e276d9e08c46e9fe4f92af636d53f1dda33190a /include/event_scripts.h | |
| parent | ddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge master into doc-tower
Diffstat (limited to 'include/event_scripts.h')
| -rw-r--r-- | include/event_scripts.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h index aa76155c2..9e47223bf 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -371,8 +371,6 @@ extern const u8 SecretBase_Text_Trainer7Defeated[]; extern const u8 SecretBase_Text_Trainer8Defeated[]; extern const u8 SecretBase_Text_Trainer9Defeated[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; - //field effects extern const u8 EventScript_FldEffStrength[]; extern const u8 EventScript_FailSweetScent[]; @@ -543,7 +541,6 @@ extern const u8 EventScript_CannotUseWaterfall[]; extern const u8 EventScript_UseDive[]; extern const u8 EventScript_UseDiveUnderwater[]; extern const u8 EventScript_FallDownHole[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[]; extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; extern const u8 AbnormalWeather_EventScript_EndEventAndCleanup_1[]; @@ -572,7 +569,8 @@ extern const u8 SecretBase_EventScript_PutAwayDecoration[]; extern const u8 SecretBase_EventScript_SetDecoration[]; // Battle Pyramid. -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; +extern const u8 BattlePyramid_Retire[]; +extern const u8 BattlePyramid_WarpToNextFloor[]; extern const u8 BattlePyramid_TrainerBattle[]; extern const u8 BattlePyramid_FindItemBall[]; |