dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use constants for setfieldeffectargument

Browse Source
This commit is contained in:
GriffinR
2022-08-09 20:12:26 -04:00
parent fbdbc5851c
commit 3add78dbd1
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -72,8 +72,8 @@ BirthIsland_Exterior_EventScript_Deoxys::
addobject LOCALID_DEOXYS addobject LOCALID_DEOXYS
waitse waitse
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
setfieldeffectargument 1, 56 setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR)
setfieldeffectargument 2, 2 setfieldeffectargument 2, MAP_GROUP(BIRTH_ISLAND_EXTERIOR)
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_ENCOUNTER_DEOXYS, 0 playbgm MUS_ENCOUNTER_DEOXYS, 0
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
data/maps/CeladonCity_GameCorner/scripts.inc
+9 -3
View File
@@ -256,9 +256,15 @@ CeladonCity_GameCorner_EventScript_SlotMachine::
msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
setfieldeffectargument 0, 255 setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
setfieldeffectargument 1, 10 .ifdef BUGFIX
setfieldeffectargument 2, 14 setfieldeffectargument 1, MAP_NUM(CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_GROUP(CELADON_CITY_GAME_CORNER)
.else
@ Map num/group were provided in the wrong order
setfieldeffectargument 1, MAP_GROUP(CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_NUM(CELADON_CITY_GAME_CORNER)
.endif
dofieldeffect FLDEFF_SMILEY_FACE_ICON dofieldeffect FLDEFF_SMILEY_FACE_ICON
waitfieldeffect FLDEFF_SMILEY_FACE_ICON waitfieldeffect FLDEFF_SMILEY_FACE_ICON
specialvar VAR_RESULT, GetRandomSlotMachineId specialvar VAR_RESULT, GetRandomSlotMachineId