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 authored and GitHub committed 2022-09-03 14:31:04 -04:00
2 parents ab56ac41a1 ccd527b782
commit 0400ee2124
353 files changed
+20156 -19152
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/maps/PokemonTower_2F/scripts.inc
+6 -6
View File
@@ -24,9 +24,9 @@ PokemonTower_2F_EventScript_Rival::
playbgm MUS_ENCOUNTER_RIVAL, 0
call_if_eq VAR_TEMP_1, 0, PokemonTower_2F_EventScript_RivalFacePlayerRight
call_if_eq VAR_TEMP_1, 1, PokemonTower_2F_EventScript_RivalFacePlayerDown
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
msgbox PokemonTower_2F_Text_RivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
@@ -47,14 +47,14 @@ PokemonTower_2F_EventScript_Rival::
end
PokemonTower_2F_EventScript_RivalFacePlayerRight::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PokemonTower_2F_EventScript_RivalFacePlayerDown::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return