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
@@ -60,11 +60,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
lockall
checkflag FLAG_0x0F0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_1_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_1_KEY, 1
@@ -76,11 +75,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
lockall
checkflag FLAG_0x0F1
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_2_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_2_KEY, 1
@@ -92,11 +90,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
lockall
checkflag FLAG_0x0F2
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_4_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_4_KEY, 1
@@ -108,11 +105,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
lockall
checkflag FLAG_0x0F3
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_6_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_6_KEY, 1