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/SilphCo_11F/scripts.inc
+10 -15
View File
@@ -15,13 +15,10 @@ SilphCo_11F_EventScript_President::
faceplayer
goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, SilphCo_11F_EventScript_AlreadyGotMasterBall
checkplayergender
compare VAR_RESULT, MALE
call_if_eq SilphCo_11F_EventScript_PresidentThanksMale
compare VAR_RESULT, FEMALE
call_if_eq SilphCo_11F_EventScript_PresidentThanksFemale
checkitemspace ITEM_MASTER_BALL, 1
compare VAR_RESULT, FALSE
goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall
call_if_eq VAR_RESULT, MALE, SilphCo_11F_EventScript_PresidentThanksMale
call_if_eq VAR_RESULT, FEMALE, SilphCo_11F_EventScript_PresidentThanksFemale
checkitemspace ITEM_MASTER_BALL
goto_if_eq VAR_RESULT, FALSE, SilphCo_11F_EventScript_NoRoomForMasterBall
giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_OBTAIN_KEY_ITEM
msgbox SilphCo_11F_Text_ThatsOurSecretPrototype
setflag FLAG_GOT_MASTER_BALL_FROM_SILPH
@@ -63,16 +60,14 @@ SilphCo_11F_EventScript_GiovanniTriggerRight::
end
SilphCo_11F_EventScript_BattleGiovanni::
textcolor 0
applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 25
msgbox SilphCo_11F_Text_GiovanniIntro
closemessage
compare VAR_TEMP_1, 0
call_if_eq SilphCo_11F_EventScript_GiovanniApproachLeft
compare VAR_TEMP_1, 1
call_if_eq SilphCo_11F_EventScript_GiovanniApproachRight
call_if_eq VAR_TEMP_1, 0, SilphCo_11F_EventScript_GiovanniApproachLeft
call_if_eq VAR_TEMP_1, 1, SilphCo_11F_EventScript_GiovanniApproachRight
setvar VAR_LAST_TALKED, LOCALID_GIOVANNI
trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat
msgbox SilphCo_11F_Text_GiovanniPostBattle
@@ -104,7 +99,7 @@ SilphCo_11F_Movement_GiovanniApproachLeft::
walk_down
walk_down
walk_down
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
SilphCo_11F_Movement_GiovanniApproachRight::
@@ -119,7 +114,7 @@ SilphCo_11F_Movement_PlayerFaceGiovanni::
delay_16
delay_8
delay_4
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
@ Unused