improve goto_if macros

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
@@ -74,7 +74,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198
compare VAR_0x40B6, 1
goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
clearflag FLAG_0x0C2
clearflag FLAG_0x0C3
clearflag FLAG_0x0C4
@@ -101,7 +101,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
lockall
compare VAR_0x40B1, 0
goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
goto Route110_TrickHousePuzzle7_EventScript_26A3DB
end
@@ -127,10 +127,8 @@ Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE
call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139
special DrawWholeMapView
playse SE_TK_KASYA
checkflag FLAG_0x0C2
goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9
checkflag FLAG_0x0C2
goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE
goto_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2E9
goto_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2EE
end
Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D
@@ -142,10 +140,8 @@ Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D
call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C
special DrawWholeMapView
playse SE_TK_KASYA
checkflag FLAG_0x0C3
goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3
checkflag FLAG_0x0C3
goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8
goto_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F3
goto_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F8
end
Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C
@@ -157,10 +153,8 @@ Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C
call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F
special DrawWholeMapView
playse SE_TK_KASYA
checkflag FLAG_0x0C4
goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD
checkflag FLAG_0x0C4
goto_eq Route110_TrickHousePuzzle7_EventScript_26E302
goto_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E2FD
goto_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E302
end
Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B
@@ -172,10 +166,8 @@ Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B
call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172
special DrawWholeMapView
playse SE_TK_KASYA
checkflag FLAG_0x0C5
goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307
checkflag FLAG_0x0C5
goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C
goto_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E307
goto_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E30C
end
Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA
@@ -187,10 +179,8 @@ Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA
call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185
special DrawWholeMapView
playse SE_TK_KASYA
checkflag FLAG_0x0C6
goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311
checkflag FLAG_0x0C6
goto_eq Route110_TrickHousePuzzle7_EventScript_26E316
goto_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E311
goto_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E316
end
Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9