summaryrefslogtreecommitdiff
path: root/data/maps/PowerPlant
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-08 19:16:45 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-08 19:16:57 -0500
commit2e5bf6c9ef4f4406b1dd725e91a88cbdd10ad5c2 (patch)
treeefaa59d9de2fa1df7621d859b6c0f2ebc91ebd8b /data/maps/PowerPlant
parent31d31d326034fde26dedaf2dadb1c608e00fb92f (diff)
Use map_script constants, name unique map_script labels
Diffstat (limited to 'data/maps/PowerPlant')
-rw-r--r--data/maps/PowerPlant/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
index 9255df5e0..cb9867905 100644
--- a/data/maps/PowerPlant/scripts.inc
+++ b/data/maps/PowerPlant/scripts.inc
@@ -1,9 +1,9 @@
PowerPlant_MapScripts:: @ 8163764
- map_script 5, PowerPlant_MapScript1_16376F
- map_script 3, PowerPlant_MapScript2_16378D
+ map_script MAP_SCRIPT_ON_RESUME, PowerPlant_OnResume
+ map_script MAP_SCRIPT_ON_TRANSITION, PowerPlant_OnTransition
.byte 0
-PowerPlant_MapScript1_16376F:: @ 816376F
+PowerPlant_OnResume:: @ 816376F
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_163779
end
@@ -15,7 +15,7 @@ EventScript_163779:: @ 8163779
removeobject VAR_LAST_TALKED
return
-PowerPlant_MapScript2_16378D:: @ 816378D
+PowerPlant_OnTransition:: @ 816378D
setworldmapflag FLAG_WORLD_MAP_POWER_PLANT
checkflag FLAG_FOUGHT_ZAPDOS
call_if FALSE, EventScript_1637AC