summaryrefslogtreecommitdiff
path: root/data/maps/PalletTown/scripts.inc
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/PalletTown/scripts.inc
parent31d31d326034fde26dedaf2dadb1c608e00fb92f (diff)
Use map_script constants, name unique map_script labels
Diffstat (limited to 'data/maps/PalletTown/scripts.inc')
-rw-r--r--data/maps/PalletTown/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index 852c6425f..7f268aafe 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -1,9 +1,9 @@
PalletTown_MapScripts:: @ 816545A
- map_script 3, PalletTown_MapScript1_165465
- map_script 2, PalletTown_MapScript2_1654CE
+ map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame
.byte 0
-PalletTown_MapScript1_165465:: @ 8165465
+PalletTown_OnTransition:: @ 8165465
setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
call_if TRUE, EventScript_165488
@@ -38,7 +38,7 @@ EventScript_1654BD:: @ 81654BD
setvar VAR_0x4002, 1
return
-PalletTown_MapScript2_1654CE:: @ 81654CE
+PalletTown_OnFrame:: @ 81654CE
map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8
.2byte 0