summaryrefslogtreecommitdiff
path: root/data/maps/SouthernIsland_Interior
diff options
context:
space:
mode:
authorDeokishisu <6993375+Deokishisu@users.noreply.github.com>2021-02-15 11:40:16 -0500
committerDeokishisu <6993375+Deokishisu@users.noreply.github.com>2021-02-15 11:40:16 -0500
commitb89c3e901e1de2f3513d74fa548373d82d3f26d0 (patch)
tree8e6fa5b51b3f71c1cf7928af02d22bc745b5fb77 /data/maps/SouthernIsland_Interior
parent5f58ea02c66a7e1a7d0164ba497bfa2d7527328b (diff)
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi. The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
Diffstat (limited to 'data/maps/SouthernIsland_Interior')
-rw-r--r--data/maps/SouthernIsland_Interior/scripts.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 0dd8cc303..2793c90f7 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -118,14 +118,14 @@ SouthernIsland_Interior_EventScript_SetLatiosBattleVars:: @ 8242BA4
setvar VAR_0x8004, SPECIES_LATIOS
setvar VAR_0x8005, 50 @ level
setvar VAR_0x8006, ITEM_SOUL_DEW
- special CreateObedientEnemyMon
+ special CreateFatefulEncounterEnemyMon
return
SouthernIsland_Interior_EventScript_SetLatiasBattleVars:: @ 8242BB7
setvar VAR_0x8004, SPECIES_LATIAS
setvar VAR_0x8005, 50 @ level
setvar VAR_0x8006, ITEM_SOUL_DEW
- special CreateObedientEnemyMon
+ special CreateFatefulEncounterEnemyMon
return
SouthernIsland_Interior_Movement_CameraPanUp: @ 8242BCA