diff options
| author | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-15 11:40:16 -0500 |
|---|---|---|
| committer | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-15 11:40:16 -0500 |
| commit | b89c3e901e1de2f3513d74fa548373d82d3f26d0 (patch) | |
| tree | 8e6fa5b51b3f71c1cf7928af02d22bc745b5fb77 /data/script_cmd_table.inc | |
| parent | 5f58ea02c66a7e1a7d0164ba497bfa2d7527328b (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/script_cmd_table.inc')
| -rw-r--r-- | data/script_cmd_table.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index f89e0a72a..371219e39 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -205,8 +205,8 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_nop1 @ 0xca .4byte ScrCmd_nop1 @ 0xcb .4byte ScrCmd_nop1 @ 0xcc - .4byte ScrCmd_setmonobedient @ 0xcd - .4byte ScrCmd_checkmonobedience @ 0xce + .4byte ScrCmd_setmonfatefulencounter @ 0xcd + .4byte ScrCmd_checkmonfatefulencounter @ 0xce .4byte ScrCmd_gotoram @ 0xcf .4byte ScrCmd_nop1 @ 0xd0 .4byte ScrCmd_warpspinenter @ 0xd1 |