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

Sync map macro change with pokeemerald

Browse Source
This commit is contained in:
GriffinR
2024-08-27 13:57:07 -04:00
parent f155bf5419
commit 5e464c2091
32 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -71,8 +71,8 @@ BirthIsland_Exterior_EventScript_Deoxys::
addobject LOCALID_DEOXYS
waitse
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR)
setfieldeffectargument 2, MAP_GROUP(BIRTH_ISLAND_EXTERIOR)
setfieldeffectargument 1, MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR)
setfieldeffectargument 2, MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR)
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_ENCOUNTER_DEOXYS, 0
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
data/maps/CeladonCity_GameCorner/scripts.inc
+4 -4
View File
@@ -248,12 +248,12 @@ CeladonCity_GameCorner_EventScript_SlotMachine::
goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
.ifdef BUGFIX
setfieldeffectargument 1, MAP_NUM(CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_GROUP(CELADON_CITY_GAME_CORNER)
setfieldeffectargument 1, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_GROUP(MAP_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)
setfieldeffectargument 1, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
.endif
dofieldeffect FLDEFF_SMILEY_FACE_ICON
waitfieldeffect FLDEFF_SMILEY_FACE_ICON