improve call_if macros

This commit is contained in:
Melody
2018-12-21 21:32:45 -05:00
parent ac2e4adf2d
commit 55005f1588
175 changed files with 1245 additions and 1400 deletions
+5 -10
View File
@@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 8238E2A
.byte 0
IslandCave_MapScript1_238E3A: @ 8238E3A
checkflag FLAG_SYS_CTRL_OBJ_DELETE
call_if 1, IslandCave_EventScript_238E44
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_238E44
end
IslandCave_EventScript_238E44:: @ 8238E44
@@ -17,8 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44
return
IslandCave_MapScript1_238E58: @ 8238E58
checkflag FLAG_SYS_BRAILLE_WAIT
call_if 0, IslandCave_EventScript_238E62
call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62
end
IslandCave_EventScript_238E62:: @ 8238E62
@@ -33,8 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
IslandCave_MapScript1_238E99: @ 8238E99
setflag FLAG_LANDMARK_ISLAND_CAVE
call IslandCave_EventScript_238F45
checkflag FLAG_0x1BC
call_if 0, IslandCave_EventScript_238EAB
call_if_unset FLAG_0x1BC, IslandCave_EventScript_238EAB
end
IslandCave_EventScript_238EAB:: @ 8238EAB
@@ -55,8 +52,7 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
IslandCave_EventScript_238EEF:: @ 8238EEF
lockall
checkflag FLAG_TEMP_3
call_if 1, IslandCave_EventScript_238F45
call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13
braillemessage IslandCave_Braille_2A6CD4
setflag FLAG_TEMP_2
@@ -71,8 +67,7 @@ IslandCave_EventScript_238F13:: @ 8238F13
IslandCave_EventScript_238F1D:: @ 8238F1D
lockall
checkflag FLAG_TEMP_3
call_if 1, IslandCave_EventScript_238F45
call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
braillemessage IslandCave_Braille_2A6CD4
goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41
setflag FLAG_TEMP_2