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

Merge branch 'master' into movement-action

Browse Source
This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
parent 7233b2ed0a b3c2c7291f
commit 2644dd9c21
286 changed files with 8970 additions and 9432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+2 -3
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,7 +21,7 @@ SixIsland_PokemonCenter_1F_OnFrame::
SixIsland_PokemonCenter_1F_EventScript_RivalScene::
lockall
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0