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

View File

@@ -4,30 +4,28 @@ EventScript_TV:: @ 827EE0B
special ResetTVShowState
specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV
compare VAR_RESULT, 2
goto_eq EventScript_27EE9A
goto_if_eq EventScript_27EE9A
compare VAR_RESULT, 1
goto_eq EventScript_27EEA4
checkflag FLAG_SYS_TV_START
goto_if 0, EventScript_27EE8A
checkflag FLAG_SYS_TV_WATCH
goto_eq EventScript_27EE8A
goto_if_eq EventScript_27EEA4
goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A
goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A
specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
compare VAR_RESULT, 1
goto_eq EventScript_27EEFF
goto_if_eq EventScript_27EEFF
goto EventScript_27EEE9
end
EventScript_27EE54:: @ 827EE54
specialvar VAR_0x8004, special_0x44
compare VAR_0x8004, 255
goto_eq EventScript_27EED8
goto_if_eq EventScript_27EED8
specialvar VAR_RESULT, special_0x4a
compare VAR_RESULT, 255
goto_eq EventScript_27EED8
goto_if_eq EventScript_27EED8
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, special_0x45
compare VAR_RESULT, 0
goto_if 5, EventScript_27EEBA
goto_if_ne EventScript_27EEBA
end
EventScript_27EE8A:: @ 827EE8A
@@ -56,7 +54,7 @@ EventScript_27EEBA:: @ 827EEBA
waitmessage
waitbuttonpress
compare VAR_RESULT, 1
goto_if 5, EventScript_27EEBA
goto_if_ne EventScript_27EEBA
goto EventScript_27EED0
end
@@ -75,7 +73,7 @@ EventScript_27EED8:: @ 827EED8
EventScript_27EEE9:: @ 827EEE9
special DoPokeNews
compare VAR_RESULT, 0
goto_eq EventScript_27EE54
goto_if_eq EventScript_27EE54
waitmessage
waitbuttonpress
goto EventScript_27EED0
@@ -86,6 +84,6 @@ EventScript_27EEFF:: @ 827EEFF
waitmessage
waitbuttonpress
compare VAR_RESULT, 0
goto_eq EventScript_27EEFF
goto_if_eq EventScript_27EEFF
goto EventScript_27EED0
end