dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Update fldeff sparkle macro

Browse Source
This commit is contained in:
GriffinR
2019-11-06 10:11:54 -05:00
committed by huderlem
parent 6730df2321
commit dba94e3971
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+2 -2
View File
@@ -1680,9 +1680,9 @@
callstd STD_REGISTER_MATCH_CALL callstd STD_REGISTER_MATCH_CALL
.endm .endm
.macro dofieldeffectsparkle x:req y:req .macro dofieldeffectsparkle x:req, y:req, priority:req
setfieldeffectargument 0, \x setfieldeffectargument 0, \x
setfieldeffectargument 1, \y setfieldeffectargument 1, \y
setfieldeffectargument 2, 0 setfieldeffectargument 2, \priority
dofieldeffect FLDEFF_SPARKLE dofieldeffect FLDEFF_SPARKLE
.endm .endm
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+10 -10
View File
@@ -46,7 +46,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3
delay 20 delay 20
dofieldeffectsparkle 10, 10 dofieldeffectsparkle 10, 10, 0
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle
@@ -73,8 +73,8 @@ AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33 AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
delay 20 delay 20
dofieldeffectsparkle 8, 5 dofieldeffectsparkle 8, 5, 0
dofieldeffectsparkle 11, 3 dofieldeffectsparkle 11, 3, 0
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle
@@ -84,9 +84,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B
delay 20 delay 20
dofieldeffectsparkle 16, 3 dofieldeffectsparkle 16, 3, 0
dofieldeffectsparkle 25, 2 dofieldeffectsparkle 25, 2, 0
dofieldeffectsparkle 24, 6 dofieldeffectsparkle 24, 6, 0
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle
@@ -98,19 +98,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2
end end
AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3 AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3
dofieldeffectsparkle 42, 10 dofieldeffectsparkle 42, 10, 0
return return
AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3 AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3
dofieldeffectsparkle 20, 5 dofieldeffectsparkle 20, 5, 0
return return
AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3 AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3
dofieldeffectsparkle 1, 12 dofieldeffectsparkle 1, 12, 0
return return
AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3 AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3
dofieldeffectsparkle 1, 2 dofieldeffectsparkle 1, 2, 0
return return
AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3 AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3