Move local IDs to map.json

This commit is contained in:
GriffinR
2024-10-14 23:10:37 -04:00
parent 4dc5c47799
commit 50babdb07f
192 changed files with 863 additions and 891 deletions
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_JOYFUL_GAME_CORNER_DADDY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
"x": 5,
@@ -30,6 +31,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_JOYFUL_GAME_CORNER_BIKER",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 5,
@@ -44,6 +46,7 @@
"flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER"
},
{
"local_id": "LOCALID_JOYFUL_GAME_CORNER_LOSTELLE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 6,
@@ -1,7 +1,3 @@
.equ LOCALID_DADDY, 1
.equ LOCALID_BIKER, 2
.equ LOCALID_LOSTELLE, 3
TwoIsland_JoyfulGameCorner_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp
@@ -14,9 +10,9 @@ TwoIsland_JoyfulGameCorner_OnTransition::
end
TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos::
setobjectxyperm LOCALID_DADDY, 6, 2
setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND
setobjectxyperm LOCALID_JOYFUL_GAME_CORNER_DADDY, 6, 2
setobjectmovementtype LOCALID_JOYFUL_GAME_CORNER_DADDY, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_JOYFUL_GAME_CORNER_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
return
@@ -43,7 +39,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
special BufferBigGuyOrBigGirlString
msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
closemessage
applymovement LOCALID_LOSTELLE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_JOYFUL_GAME_CORNER_LOSTELLE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
releaseall
@@ -52,18 +48,18 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyPacing
applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyPacing
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
closemessage
applymovement LOCALID_DADDY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_DADDY, Common_Movement_ExclamationMark
applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DADDY, Common_Movement_Delay48
applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer
applymovement LOCALID_JOYFUL_GAME_CORNER_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
@@ -74,19 +70,19 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
applymovement LOCALID_PLAYER, TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy
waitmovement 0
playbgm MUS_ENCOUNTER_BOY, 0
addobject LOCALID_BIKER
applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround
addobject LOCALID_JOYFUL_GAME_CORNER_BIKER
applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland
applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt
msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing
closemessage
applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_JOYFUL_GAME_CORNER_BIKER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_EXIT
removeobject LOCALID_BIKER
removeobject LOCALID_JOYFUL_GAME_CORNER_BIKER
fadedefaultbgm
delay 60
msgbox TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor