dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2021-07-20 15:18:31 -04:00
parent bea170e8e9
commit 06351bf63c
576 changed files with 17798 additions and 17798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/gabby_and_ty.inc
+55 -55
View File
@@ -1,7 +1,7 @@
@ Gabby and Ty always move to the same spots for the first 5 battles
@ From the 6th battle onwards, they move randomly between locations 6-8
@ Note: The local IDs of Gabby and Ty are hard-coded in GetGabbyAndTyLocalIds
GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
GabbyAndTy_EventScript_UpdateLocation::
cleartrainerflag TRAINER_GABBY_AND_TY_6
specialvar VAR_RESULT, GabbyAndTyGetBattleNum
switch VAR_RESULT
@@ -16,187 +16,187 @@ GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
case 8, GabbyAndTy_EventScript_MoveForBattle9
end
GabbyAndTy_EventScript_MoveForBattle1:: @ 828CD38
GabbyAndTy_EventScript_MoveForBattle1::
call GabbyAndTy_EventScript_ShowAtRoute111_1
return
GabbyAndTy_EventScript_MoveForBattle2:: @ 828CD3E
GabbyAndTy_EventScript_MoveForBattle2::
call GabbyAndTy_EventScript_ShowAtRoute118_1
call GabbyAndTy_EventScript_HideAtRoute111_1
return
GabbyAndTy_EventScript_MoveForBattle3:: @ 828CD49
GabbyAndTy_EventScript_MoveForBattle3::
call GabbyAndTy_EventScript_ShowAtRoute120_1
call GabbyAndTy_EventScript_HideAtRoute118_1
return
GabbyAndTy_EventScript_MoveForBattle4:: @ 828CD54
GabbyAndTy_EventScript_MoveForBattle4::
call GabbyAndTy_EventScript_ShowAtRoute111_3
call GabbyAndTy_EventScript_HideAtRoute120_1
return
GabbyAndTy_EventScript_MoveForBattle5:: @ 828CD5F
GabbyAndTy_EventScript_MoveForBattle5::
call GabbyAndTy_EventScript_ShowAtRoute118_2
call GabbyAndTy_EventScript_HideAtRoute111_3
return
GabbyAndTy_EventScript_MoveForBattle6:: @ 828CD6A
GabbyAndTy_EventScript_MoveForBattle6::
call GabbyAndTy_EventScript_ShowAtRoute120_2
call GabbyAndTy_EventScript_HideAtRoute118_2
return
GabbyAndTy_EventScript_MoveForBattle7:: @ 828CD75
GabbyAndTy_EventScript_MoveForBattle7::
call GabbyAndTy_EventScript_ShowAtRoute111_2
call GabbyAndTy_EventScript_HideAtRoute120_2
return
GabbyAndTy_EventScript_MoveForBattle8:: @ 828CD80
GabbyAndTy_EventScript_MoveForBattle8::
call GabbyAndTy_EventScript_ShowAtRoute118_3
call GabbyAndTy_EventScript_HideAtRoute111_2
return
GabbyAndTy_EventScript_MoveForBattle9:: @ 828CD8B
GabbyAndTy_EventScript_MoveForBattle9::
call GabbyAndTy_EventScript_ShowAtRoute120_2
call GabbyAndTy_EventScript_HideAtRoute118_3
return
GabbyAndTy_EventScript_HideAtRoute111_1:: @ 828CD96
GabbyAndTy_EventScript_HideAtRoute111_1::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_ShowAtRoute111_1:: @ 828CD9A
GabbyAndTy_EventScript_ShowAtRoute111_1::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_HideAtRoute118_1:: @ 828CD9E
GabbyAndTy_EventScript_HideAtRoute118_1::
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_ShowAtRoute118_1:: @ 828CDA2
GabbyAndTy_EventScript_ShowAtRoute118_1::
clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_HideAtRoute120_1:: @ 828CDA6
GabbyAndTy_EventScript_HideAtRoute120_1::
setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_ShowAtRoute120_1:: @ 828CDAA
GabbyAndTy_EventScript_ShowAtRoute120_1::
clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_HideAtRoute111_3:: @ 828CDAE
GabbyAndTy_EventScript_HideAtRoute111_3::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_ShowAtRoute111_3:: @ 828CDB2
GabbyAndTy_EventScript_ShowAtRoute111_3::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_HideAtRoute118_2:: @ 828CDB6
GabbyAndTy_EventScript_HideAtRoute118_2::
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_ShowAtRoute118_2:: @ 828CDBA
GabbyAndTy_EventScript_ShowAtRoute118_2::
clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_HideAtRoute120_2:: @ 828CDBE
GabbyAndTy_EventScript_HideAtRoute120_2::
setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_ShowAtRoute120_2:: @ 828CDC2
GabbyAndTy_EventScript_ShowAtRoute120_2::
clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_HideAtRoute111_2:: @ 828CDC6
GabbyAndTy_EventScript_HideAtRoute111_2::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_ShowAtRoute111_2:: @ 828CDCA
GabbyAndTy_EventScript_ShowAtRoute111_2::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_HideAtRoute118_3:: @ 828CDCE
GabbyAndTy_EventScript_HideAtRoute118_3::
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_ShowAtRoute118_3:: @ 828CDD2
GabbyAndTy_EventScript_ShowAtRoute118_3::
clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_GabbyBattle1:: @ 828CDD6
GabbyAndTy_EventScript_GabbyBattle1::
trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_GabbyPreFirstBattle, GabbyAndTy_Text_GabbyDefeatFirstTime, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6
GabbyAndTy_EventScript_TyBattle1::
trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_TyPreFirstBattle, GabbyAndTy_Text_TyDefeatFirstTime, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16
GabbyAndTy_EventScript_GabbyBattle2::
trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle2:: @ 828CE36
GabbyAndTy_EventScript_TyBattle2::
trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56
GabbyAndTy_EventScript_GabbyBattle3::
trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle3:: @ 828CE76
GabbyAndTy_EventScript_TyBattle3::
trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96
GabbyAndTy_EventScript_GabbyBattle4::
trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
GabbyAndTy_EventScript_TyBattle4::
trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6
GabbyAndTy_EventScript_GabbyBattle5::
trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6
GabbyAndTy_EventScript_TyBattle5::
trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16
GabbyAndTy_EventScript_GabbyBattle6::
trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
GabbyAndTy_EventScript_TyBattle6::
trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
release
end
GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
GabbyAndTy_EventScript_FirstInterview::
special GabbyAndTyBeforeInterview
special GetGabbyAndTyLocalIds
compare VAR_FACING, DIR_NORTH
@@ -210,24 +210,24 @@ GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
goto GabbyAndTy_EventScript_Interview
end
GabbyAndTy_EventScript_FacePlayerNorth:: @ 828CF94
GabbyAndTy_EventScript_FacePlayerNorth::
applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown
waitmovement 0
return
GabbyAndTy_EventScript_FacePlayerSouth:: @ 828CF9F
GabbyAndTy_EventScript_FacePlayerSouth::
applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceUp
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
GabbyAndTy_EventScript_FacePlayerEast::
applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceLeft
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
GabbyAndTy_EventScript_RequestInterview::
special GabbyAndTyBeforeInterview
special GetGabbyAndTyLocalIds
compare VAR_FACING, DIR_NORTH
@@ -250,49 +250,49 @@ GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
case 4, GabbyAndTy_EventScript_RequestInterviewLostAMon
end
GabbyAndTy_Movement_WalkInPlaceDown: @ 828D04D
GabbyAndTy_Movement_WalkInPlaceDown:
walk_in_place_down
step_end
GabbyAndTy_Movement_WalkInPlaceUp: @ 828D04F
GabbyAndTy_Movement_WalkInPlaceUp:
walk_in_place_up
step_end
GabbyAndTy_Movement_WalkInPlaceLeft: @ 828D051
GabbyAndTy_Movement_WalkInPlaceLeft:
walk_in_place_left
step_end
GabbyAndTy_EventScript_DidntInterviewLastTime:: @ 828D053
GabbyAndTy_EventScript_DidntInterviewLastTime::
msgbox GabbyAndTy_Text_GiveUsAnInterviewThisTime, MSGBOX_YESNO
goto GabbyAndTy_EventScript_Interview
end
GabbyAndTy_EventScript_RequestInterviewNoTrivia:: @ 828D061
GabbyAndTy_EventScript_RequestInterviewNoTrivia::
msgbox GabbyAndTy_Text_InterviewAgain, MSGBOX_YESNO
goto GabbyAndTy_EventScript_Interview
end
GabbyAndTy_EventScript_RequestInterviewShortBattle:: @ 828D06F
GabbyAndTy_EventScript_RequestInterviewShortBattle::
msgbox GabbyAndTy_Text_YouStompedUsInterviewAgain, MSGBOX_YESNO
goto GabbyAndTy_EventScript_Interview
end
GabbyAndTy_EventScript_RequestInterviewThrewBall:: @ 828D07D
GabbyAndTy_EventScript_RequestInterviewThrewBall::
msgbox GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain, MSGBOX_YESNO
goto GabbyAndTy_EventScript_Interview
end
GabbyAndTy_EventScript_RequestInterviewUsedItems:: @ 828D08B
GabbyAndTy_EventScript_RequestInterviewUsedItems::
msgbox GabbyAndTy_Text_CleverItemSkillsInterviewAgain, MSGBOX_YESNO
goto GabbyAndTy_EventScript_Interview
end
GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099
GabbyAndTy_EventScript_RequestInterviewLostAMon::
msgbox GabbyAndTy_Text_WeLookedRespectableInterviewAgain, MSGBOX_YESNO
goto GabbyAndTy_EventScript_Interview
end
GabbyAndTy_EventScript_Interview:: @ 828D0A7
GabbyAndTy_EventScript_Interview::
compare VAR_RESULT, NO
goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut
msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT
@@ -308,13 +308,13 @@ GabbyAndTy_EventScript_Interview:: @ 828D0A7
release
end
GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut:: @ 828D0E1
GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut::
msgbox GabbyAndTy_Text_DontGiveUpKeepingEyeOut, MSGBOX_DEFAULT
setflag FLAG_TEMP_1
release
end
GabbyAndTy_EventScript_KeepingAnEyeOutForYou:: @ 828D0EE
GabbyAndTy_EventScript_KeepingAnEyeOutForYou::
msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
release
end