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

Reformat compare + goto_if/call_if to single statements

Browse Source
This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
data/scripts/apprentice.inc
View File

@@ -4,24 +4,17 @@ BattleFrontier_BattleTowerLobby_EventScript_Apprentice::
lock
faceplayer
apprentice_gavelvlmode
compare VAR_RESULT, FALSE
goto_if_eq Apprentice_EventScript_FirstMeeting
goto_if_eq VAR_RESULT, FALSE, Apprentice_EventScript_FirstMeeting
apprentice_shouldcheckgone
compare VAR_0x8004, FALSE @ Always TRUE here
goto_if_eq Apprentice_EventScript_AskQuestion
goto_if_eq VAR_0x8004, FALSE, Apprentice_EventScript_AskQuestion @ VAR_0x8004 always TRUE here
goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Apprentice_EventScript_Gone
Apprentice_EventScript_AskQuestion:
apprentice_getquestion
compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MON
goto_if_eq Apprentice_EventScript_UseWhichMon
compare VAR_RESULT, APPRENTICE_QUESTION_WHAT_ITEM
goto_if_eq Apprentice_EventScript_UseWhatHeldItem
compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MOVE
goto_if_eq Apprentice_EventScript_UseWhichMove
compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_FIRST
goto_if_eq Apprentice_EventScript_PutWhichMonFirst
compare VAR_RESULT, APPRENTICE_QUESTION_WIN_SPEECH
goto_if_eq Apprentice_EventScript_PickWinSpeech
goto_if_eq VAR_RESULT, APPRENTICE_QUESTION_WHICH_MON, Apprentice_EventScript_UseWhichMon
goto_if_eq VAR_RESULT, APPRENTICE_QUESTION_WHAT_ITEM, Apprentice_EventScript_UseWhatHeldItem
goto_if_eq VAR_RESULT, APPRENTICE_QUESTION_WHICH_MOVE, Apprentice_EventScript_UseWhichMove
goto_if_eq VAR_RESULT, APPRENTICE_QUESTION_WHICH_FIRST, Apprentice_EventScript_PutWhichMonFirst
goto_if_eq VAR_RESULT, APPRENTICE_QUESTION_WIN_SPEECH, Apprentice_EventScript_PickWinSpeech
release
releaseall
end
@@ -31,8 +24,7 @@ Apprentice_EventScript_FirstMeeting:
apprentice_msg FALSE, APPRENTICE_MSG_PLEASE_TEACH
Apprentice_EventScript_WhichLvlMode:
apprentice_menu APPRENTICE_ASK_YES_NO
compare VAR_RESULT, 1
goto_if_eq Apprentice_EventScript_RejectTeach
goto_if_eq VAR_RESULT, 1, Apprentice_EventScript_RejectTeach
apprentice_msg FALSE, APPRENTICE_MSG_WHICH_LVL_MODE
apprentice_menu APPRENTICE_ASK_WHICH_LEVEL
apprentice_setlvlmode VAR_RESULT
@@ -59,16 +51,13 @@ Apprentice_EventScript_UseWhichMon:
apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON
apprentice_menu APPRENTICE_ASK_2SPECIES
copyvar VAR_0x8005, VAR_RESULT
compare VAR_0x8005, 0
call_if_eq Apprentice_EventScript_ChoseFirstMon
compare VAR_0x8005, 1
call_if_eq Apprentice_EventScript_ChoseSecondMon
call_if_eq VAR_0x8005, 0, Apprentice_EventScript_ChoseFirstMon
call_if_eq VAR_0x8005, 1, Apprentice_EventScript_ChoseSecondMon
apprentice_getnumpartymons
apprentice_setpartymon VAR_RESULT
apprentice_answeredquestion
apprentice_getnumpartymons
compare VAR_RESULT, MULTI_PARTY_SIZE
call_if_eq Apprentice_EventScript_LastMonSelected
call_if_eq VAR_RESULT, MULTI_PARTY_SIZE, Apprentice_EventScript_LastMonSelected
apprentice_buff 0, VAR_0x8007
apprentice_freequestion
apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON
@@ -101,11 +90,9 @@ Apprentice_EventScript_ChooseHoldItem:
fadescreen FADE_TO_BLACK
setvar VAR_RESULT, 0
apprentice_openbag
compare VAR_RESULT, FALSE
goto_if_eq Apprentice_EventScript_ConfirmHoldNothing
goto_if_eq VAR_RESULT, FALSE, Apprentice_EventScript_ConfirmHoldNothing
apprentice_trysetitem
compare VAR_RESULT, FALSE
goto_if_eq Apprentice_EventScript_AlreadySuggestedItem
goto_if_eq VAR_RESULT, FALSE, Apprentice_EventScript_AlreadySuggestedItem
apprentice_buff 0, APPRENTICE_BUFF_ITEM
apprentice_msg TRUE, APPRENTICE_MSG_THANKS_HELD_ITEM
apprentice_answeredquestion
@@ -123,8 +110,7 @@ Apprentice_EventScript_ConfirmHoldNothing:
apprentice_msg FALSE, APPRENTICE_MSG_HOLD_NOTHING
apprentice_menu APPRENTICE_ASK_GIVE
apprentice_freequestion
compare VAR_RESULT, 0
goto_if_eq Apprentice_EventScript_ChooseHoldItem
goto_if_eq VAR_RESULT, 0, Apprentice_EventScript_ChooseHoldItem
Apprentice_EventScript_HoldNothing:
apprentice_msg TRUE, APPRENTICE_MSG_THANKS_NO_HELD_ITEM
apprentice_answeredquestion
@@ -145,8 +131,7 @@ Apprentice_EventScript_AlreadySuggestedItem:
apprentice_msg FALSE, APPRENTICE_MSG_ITEM_ALREADY_SUGGESTED
apprentice_menu APPRENTICE_ASK_GIVE
apprentice_freequestion
compare VAR_RESULT, 0
goto_if_eq Apprentice_EventScript_ChooseHoldItem
goto_if_eq VAR_RESULT, 0, Apprentice_EventScript_ChooseHoldItem
goto Apprentice_EventScript_HoldNothing
end
@@ -158,10 +143,8 @@ Apprentice_EventScript_UseWhichMove:
apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MOVE
apprentice_menu APPRENTICE_ASK_MOVES
copyvar VAR_0x8005, VAR_RESULT
compare VAR_0x8005, 0
call_if_eq Apprentice_EventScript_ChoseMove1
compare VAR_0x8005, 1
call_if_eq Apprentice_EventScript_ChoseMove2
call_if_eq VAR_0x8005, 0, Apprentice_EventScript_ChoseMove1
call_if_eq VAR_0x8005, 1, Apprentice_EventScript_ChoseMove2
apprentice_setmove
apprentice_answeredquestion
apprentice_buff 0, VAR_0x8007
@@ -225,16 +208,14 @@ Apprentice_EventScript_SetHideFlags:
Apprentice_EventScript_LeaveNorth:
apprentice_shouldleave
compare VAR_0x8004, FALSE @ Always TRUE here
goto_if_eq Apprentice_EventScript_DontMove
goto_if_eq VAR_0x8004, FALSE, Apprentice_EventScript_DontMove @ VAR_0x8004 always TRUE here
applymovement LOCALID_APPRENTICE, Apprentice_Movement_LeaveNorth
waitmovement 0
end
Apprentice_EventScript_Leave:
apprentice_shouldleave
compare VAR_0x8004, FALSE @ Always TRUE here
goto_if_eq Apprentice_EventScript_DontMove
goto_if_eq VAR_0x8004, FALSE, Apprentice_EventScript_DontMove @ VAR_0x8004 always TRUE here
applymovement LOCALID_APPRENTICE, Apprentice_Movement_Leave
waitmovement 0
end