summaryrefslogtreecommitdiff
path: root/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc')
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc16
1 files changed, 9 insertions, 7 deletions
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index 81b4c2008..8af4af40c 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -1,3 +1,5 @@
+.set LOCALID_FAMILIAR_GRUNT, 13
+
SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95
.byte 0
@@ -33,7 +35,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1
SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8
checkmoney 50, 0
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney
playse SE_REGI
removemoney 50, 0
@@ -146,9 +148,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8
faceplayer
delay 8
playse SE_PIN
- applymovement 13, Common_Movement_ExclamationMark
+ applymovement LOCALID_FAMILIAR_GRUNT, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 13, Common_Movement_Delay48
+ applymovement LOCALID_FAMILIAR_GRUNT, Common_Movement_Delay48
waitmovement 0
msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT
giveitem ITEM_TM46
@@ -169,20 +171,20 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8
SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 820AF6C
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth
- applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth
+ applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth
waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
end
SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 820AF83
- applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
+ applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
end
SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast
- applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
+ applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
end
@@ -190,7 +192,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93
SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT
playse SE_KAIDAN
- removeobject 13
+ removeobject LOCALID_FAMILIAR_GRUNT
release
end