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/SSAnne_2F_Corridor/scripts.inc
+14 -23
View File
@@ -22,39 +22,30 @@ SSAnne_2F_Corridor_EventScript_RivalTriggerRight::
end
SSAnne_2F_Corridor_EventScript_RivalTrigger::
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
playse SE_EXIT
delay 5
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
delay 10
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
compare VAR_TEMP_1, 0
call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachLeft
compare VAR_TEMP_1, 1
call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachMid
compare VAR_TEMP_1, 2
call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachRight
call_if_eq VAR_TEMP_1, 0, SSAnne_2F_Corridor_EventScript_RivalApproachLeft
call_if_eq VAR_TEMP_1, 1, SSAnne_2F_Corridor_EventScript_RivalApproachMid
call_if_eq VAR_TEMP_1, 2, SSAnne_2F_Corridor_EventScript_RivalApproachRight
msgbox SSAnne_2F_Corridor_Text_RivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
compare VAR_STARTER_MON, 2
call_if_eq SSAnne_2F_Corridor_EventScript_RivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq SSAnne_2F_Corridor_EventScript_RivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq SSAnne_2F_Corridor_EventScript_RivalCharmander
call_if_eq VAR_STARTER_MON, 2, SSAnne_2F_Corridor_EventScript_RivalSquirtle
call_if_eq VAR_STARTER_MON, 1, SSAnne_2F_Corridor_EventScript_RivalBulbasaur
call_if_eq VAR_STARTER_MON, 0, SSAnne_2F_Corridor_EventScript_RivalCharmander
msgbox SSAnne_2F_Corridor_Text_RivalPostBattle
closemessage
delay 10
playbgm MUS_RIVAL_EXIT, 0
compare VAR_TEMP_1, 0
call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft
compare VAR_TEMP_1, 1
call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitMid
compare VAR_TEMP_1, 2
call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitRight
call_if_eq VAR_TEMP_1, 0, SSAnne_2F_Corridor_EventScript_RivalExitLeft
call_if_eq VAR_TEMP_1, 1, SSAnne_2F_Corridor_EventScript_RivalExitMid
call_if_eq VAR_TEMP_1, 2, SSAnne_2F_Corridor_EventScript_RivalExitRight
fadedefaultbgm
removeobject LOCALID_RIVAL
setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1
@@ -110,7 +101,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight::
delay_16
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid::
@@ -118,7 +109,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid::
delay_16
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
SSAnne_2F_Corridor_Movement_RivalApproachLeft::
@@ -132,7 +123,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachMid::
walk_down
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
SSAnne_2F_Corridor_Movement_RivalApproachRight::