diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-06 10:11:54 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-06 16:41:56 -0600 |
| commit | dba94e3971579e6babf77fa72d8c9e5031cf72fe (patch) | |
| tree | af0e33e78e2f6b5b18197b0ae83aadf3487ea209 | |
| parent | 6730df23216881d3ec8c70cc5c097ef0b74d5856 (diff) | |
Update fldeff sparkle macro
| -rw-r--r-- | asm/macros/event.inc | 4 | ||||
| -rw-r--r-- | data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e616ea3ae..40430fe53 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1680,9 +1680,9 @@ callstd STD_REGISTER_MATCH_CALL .endm - .macro dofieldeffectsparkle x:req y:req + .macro dofieldeffectsparkle x:req, y:req, priority:req setfieldeffectargument 0, \x setfieldeffectargument 1, \y - setfieldeffectargument 2, 0 + setfieldeffectargument 2, \priority dofieldeffect FLDEFF_SPARKLE .endm diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 8193c788f..53a7ee2ed 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -46,7 +46,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3 delay 20 - dofieldeffectsparkle 10, 10 + dofieldeffectsparkle 10, 10, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom4Key compare VAR_RESULT, FALSE call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle @@ -73,8 +73,8 @@ AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33 delay 20 - dofieldeffectsparkle 8, 5 - dofieldeffectsparkle 11, 3 + dofieldeffectsparkle 8, 5, 0 + dofieldeffectsparkle 11, 3, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom6Key compare VAR_RESULT, FALSE call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle @@ -84,9 +84,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B delay 20 - dofieldeffectsparkle 16, 3 - dofieldeffectsparkle 25, 2 - dofieldeffectsparkle 24, 6 + dofieldeffectsparkle 16, 3, 0 + dofieldeffectsparkle 25, 2, 0 + dofieldeffectsparkle 24, 6, 0 specialvar VAR_RESULT, FoundAbandonedShipRoom2Key compare VAR_RESULT, FALSE call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle @@ -98,19 +98,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2 end AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3 - dofieldeffectsparkle 42, 10 + dofieldeffectsparkle 42, 10, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3 - dofieldeffectsparkle 20, 5 + dofieldeffectsparkle 20, 5, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3 - dofieldeffectsparkle 1, 12 + dofieldeffectsparkle 1, 12, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3 - dofieldeffectsparkle 1, 2 + dofieldeffectsparkle 1, 2, 0 return AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3 |