Move local IDs to map.json
This commit is contained in:
@@ -1,6 +1,3 @@
|
||||
.equ LOCALID_SAPPHIRE, 1
|
||||
.equ LOCALID_THIEF, 2
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_MapScripts::
|
||||
.byte 0
|
||||
|
||||
@@ -13,10 +10,10 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire::
|
||||
waitmessage
|
||||
waitfanfare
|
||||
closemessage
|
||||
setobjectxyperm LOCALID_THIEF, 5, 0
|
||||
addobject LOCALID_THIEF
|
||||
setobjectxyperm LOCALID_DOTTED_HOLE_THIEF, 5, 0
|
||||
addobject LOCALID_DOTTED_HOLE_THIEF
|
||||
playse SE_FALL
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn
|
||||
waitmovement 0
|
||||
playse SE_M_STRENGTH
|
||||
call_if_eq VAR_FACING, DIR_NORTH, SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft
|
||||
@@ -53,7 +50,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire::
|
||||
call_if_eq VAR_FACING, DIR_WEST, SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest
|
||||
playse SE_EXIT
|
||||
delay 35
|
||||
removeobject LOCALID_THIEF
|
||||
removeobject LOCALID_DOTTED_HOLE_THIEF
|
||||
setflag FLAG_LEARNED_YES_NAH_CHANSEY
|
||||
release
|
||||
end
|
||||
@@ -80,48 +77,48 @@ SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown::
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
|
||||
waitmovement 0
|
||||
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
|
||||
waitmovement 0
|
||||
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
|
||||
waitmovement 0
|
||||
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest::
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
|
||||
waitmovement 0
|
||||
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
|
||||
waitmovement 0
|
||||
@@ -129,25 +126,25 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest::
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth::
|
||||
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth::
|
||||
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast::
|
||||
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest::
|
||||
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
|
||||
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
|
||||
applymovement LOCALID_DOTTED_HOLE_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user