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

improve goto_if macros

Browse Source
This commit is contained in:
Melody
2018-12-21 20:28:24 -05:00
parent 87fd6b8dc2
commit ac2e4adf2d
273 changed files with 2555 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@@ -21,9 +21,9 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
checkplayergender
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4
@@ -50,9 +50,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
closemessage
showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
compare VAR_TEMP_F, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
compare VAR_TEMP_E, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E
applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775
@@ -66,9 +66,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
waitmovement 0
compare VAR_TEMP_F, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
compare VAR_TEMP_E, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
setvar VAR_0x8004, 4
@@ -107,7 +107,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B
waitmovement 0
compare VAR_TEMP_2, 2
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
setvar VAR_0x8004, 19
special CallBattleDomeFunction
switch VAR_RESULT
@@ -229,17 +229,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
setvar VAR_0x8005, 6
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
return
@@ -303,7 +303,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2
BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9
compare VAR_TEMP_F, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
switch VAR_TEMP_E
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
@@ -430,7 +430,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -450,7 +450,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage
applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
waitmovement 0
@@ -469,7 +469,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -489,7 +489,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage
applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
waitmovement 0
@@ -556,12 +556,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
copyvar VAR_TEMP_E, VAR_RESULT
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
call BattleFrontier_BattleDomeBattleRoom_EventScript_242170
setobjectxyperm 15, 13, 9
removeobject 15
@@ -952,7 +952,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
waitstate
end
@@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
random 2
copyvar VAR_TEMP_D, VAR_RESULT
compare VAR_TEMP_D, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
setobjectxyperm 6, 2, 0
setobjectmovementtype 6, 10
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
compare VAR_TEMP_D, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
return