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
@@ -1,5 +1,3 @@
.equ LOCALID_RIVAL, 2
SixIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -22,25 +20,25 @@ SixIsland_PokemonCenter_1F_OnFrame::
SixIsland_PokemonCenter_1F_EventScript_RivalScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_SIX_ISLAND_RIVAL, Common_Movement_Delay48
waitmovement 0
delay 25
applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach
applymovement LOCALID_SIX_ISLAND_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach
waitmovement 0
msgbox SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere
closemessage
applymovement LOCALID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit
applymovement LOCALID_SIX_ISLAND_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit
waitmovement 0
fadedefaultbgm
playse SE_EXIT
delay 35
removeobject LOCALID_RIVAL
removeobject LOCALID_SIX_ISLAND_RIVAL
setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1
setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
releaseall