dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+4 -5
View File
@@ -8,8 +8,7 @@ SixIsland_PokemonCenter_1F_MapScripts::
SixIsland_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_SIX_ISLAND
compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0
call_if_eq SixIsland_PokemonCenter_1F_EventScript_ShowRival
call_if_eq VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, SixIsland_PokemonCenter_1F_EventScript_ShowRival
end
SixIsland_PokemonCenter_1F_EventScript_ShowRival::
@@ -22,8 +21,8 @@ SixIsland_PokemonCenter_1F_OnFrame::
SixIsland_PokemonCenter_1F_EventScript_RivalScene::
lockall
textcolor 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
@@ -62,7 +61,7 @@ SixIsland_PokemonCenter_1F_Movement_RivalExit::
SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
SixIsland_PokemonCenter_1F_EventScript_Nurse::