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

51
data/maps/DewfordTown_Gym/scripts.inc
View File

@@ -10,18 +10,12 @@ DewfordTown_Gym_EventScript_SetFlashLevel::
goto_if_defeated TRAINER_BRAWLY_1, DewfordTown_Gym_EventScript_SetLightsOn
call DewfordTown_Gym_EventScript_CountTrainersDefeated
copyvar VAR_0x8001, VAR_0x8000
compare VAR_0x8000, 0
goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel7
compare VAR_0x8000, 1
goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel6
compare VAR_0x8000, 2
goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel5
compare VAR_0x8000, 3
goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel4
compare VAR_0x8000, 4
goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel3
compare VAR_0x8000, 5
goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel2
goto_if_eq VAR_0x8000, 0, DewfordTown_Gym_EventScript_SetFlashLevel7
goto_if_eq VAR_0x8000, 1, DewfordTown_Gym_EventScript_SetFlashLevel6
goto_if_eq VAR_0x8000, 2, DewfordTown_Gym_EventScript_SetFlashLevel5
goto_if_eq VAR_0x8000, 3, DewfordTown_Gym_EventScript_SetFlashLevel4
goto_if_eq VAR_0x8000, 4, DewfordTown_Gym_EventScript_SetFlashLevel3
goto_if_eq VAR_0x8000, 5, DewfordTown_Gym_EventScript_SetFlashLevel2
goto DewfordTown_Gym_EventScript_SetFlashLevel1
DewfordTown_Gym_EventScript_SetLightsOn::
@@ -61,21 +55,14 @@ DewfordTown_Gym_EventScript_SetFlashLevel7::
DewfordTown_Gym_EventScript_BrightenRoom::
call DewfordTown_Gym_EventScript_CountTrainersDefeated
nop1
compare VAR_0x8000, VAR_0x8001
goto_if_eq DewfordTown_Gym_EventScript_NoLightChange
goto_if_eq VAR_0x8000, VAR_0x8001, DewfordTown_Gym_EventScript_NoLightChange
copyvar VAR_0x8001, VAR_0x8000
compare VAR_0x8000, 1
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash1Trainer
compare VAR_0x8000, 2
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash2Trainers
compare VAR_0x8000, 3
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash3Trainers
compare VAR_0x8000, 4
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash4Trainers
compare VAR_0x8000, 5
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash5Trainers
compare VAR_0x8000, 6
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash6Trainers
goto_if_eq VAR_0x8000, 1, DewfordTown_Gym_EventScript_AnimateFlash1Trainer
goto_if_eq VAR_0x8000, 2, DewfordTown_Gym_EventScript_AnimateFlash2Trainers
goto_if_eq VAR_0x8000, 3, DewfordTown_Gym_EventScript_AnimateFlash3Trainers
goto_if_eq VAR_0x8000, 4, DewfordTown_Gym_EventScript_AnimateFlash4Trainers
goto_if_eq VAR_0x8000, 5, DewfordTown_Gym_EventScript_AnimateFlash5Trainers
goto_if_eq VAR_0x8000, 6, DewfordTown_Gym_EventScript_AnimateFlash6Trainers
DewfordTown_Gym_EventScript_NoLightChange::
return
@@ -148,8 +135,7 @@ DewfordTown_Gym_EventScript_StopCountingTrainers::
DewfordTown_Gym_EventScript_Brawly::
trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyIntro, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE
goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch
goto_if_eq VAR_RESULT, TRUE, DewfordTown_Gym_EventScript_BrawlyRematch
goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_GiveBulkUp2
msgbox DewfordTown_Gym_Text_BrawlyPostBattle, MSGBOX_DEFAULT
release
@@ -164,8 +150,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated::
setflag FLAG_DEFEATED_DEWFORD_GYM
setflag FLAG_BADGE02_GET
addvar VAR_PETALBURG_GYM_STATE, 1
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
call_if_eq VAR_PETALBURG_GYM_STATE, 6, Common_EventScript_ReadyPetalburgGymForBattle
setvar VAR_0x8008, 2
call Common_EventScript_SetGymTrainers
call DewfordTown_Gym_EventScript_GiveBulkUp
@@ -184,16 +169,14 @@ DewfordTown_Gym_EventScript_BrawlyDefeated::
DewfordTown_Gym_EventScript_GiveBulkUp::
giveitem ITEM_TM08
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
goto_if_eq VAR_RESULT, 0, Common_EventScript_BagIsFull
msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM08
return
DewfordTown_Gym_EventScript_GiveBulkUp2:
giveitem ITEM_TM08
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, 0, Common_EventScript_ShowBagIsFull
msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM08
release