summaryrefslogtreecommitdiff
path: root/include/event_scripts.h
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-15 02:00:00 -0500
committerGriffinR <griffin.richards@comcast.net>2019-12-15 02:00:00 -0500
commit82f55f238125ff42845881189eb9237692c48ba4 (patch)
tree7b496125c6e0b644ce535548ec09755fd4f489bb /include/event_scripts.h
parent6556b556dd624964f53d76ff546589e6688412eb (diff)
parent6967caefb246f9709032049b0ae2baee71f71eb6 (diff)
Merge master into ObjEvent rename
Diffstat (limited to 'include/event_scripts.h')
-rw-r--r--include/event_scripts.h6
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[];