Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-09-03 14:31:04 -04:00
committed by GitHub
353 changed files with 20156 additions and 19152 deletions
@@ -22,12 +22,12 @@ SixIsland_PokemonCenter_1F_OnFrame::
SixIsland_PokemonCenter_1F_EventScript_RivalScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Movement_Delay48
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
delay 25
applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach