diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-23 22:16:06 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-23 22:16:06 -0400 |
| commit | 9b650159461c2538fc366364465f54c938ff79cc (patch) | |
| tree | e046c4b4f39afc4c52abb4da8fef8c092d0e261e /src | |
| parent | e43d716b3edc723d882af3e18f8e50b0b5a3f61c (diff) | |
| parent | 4ed28757fdc51de0da47809fab9f5be40cfe3423 (diff) | |
Merge branch 'master' into pokedex_area_screen
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon_size_record.c | 12 | ||||
| -rw-r--r-- | src/trade.c | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index f92a95bfb..43ad39e6f 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -196,11 +196,19 @@ void GiveGiftRibbonToParty(u8 index, u8 ribbonId) s32 i; bool32 gotRibbon = FALSE; u8 data = 1; - u8 arr[] = { 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E }; + u8 arr[] = { + MON_DATA_GIFT_RIBBON_1, + MON_DATA_GIFT_RIBBON_2, + MON_DATA_GIFT_RIBBON_3, + MON_DATA_GIFT_RIBBON_4, + MON_DATA_GIFT_RIBBON_5, + MON_DATA_GIFT_RIBBON_6, + MON_DATA_GIFT_RIBBON_7, + }; if (index < 11 && ribbonId < 65) { - gSaveBlock1.giftRibbons[index] = ribbonId; + gSaveBlock1.externalReservedData.giftRibbons[index] = ribbonId; for (i = 0; i < 6; i++) { struct Pokemon *pkmn = &gPlayerParty[i]; diff --git a/src/trade.c b/src/trade.c index 3245ec5b0..796a01b5b 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1797,7 +1797,7 @@ static bool8 sub_8048D44(void) } break; case 13: - Trade_Memcpy(gBlockSendBuffer, gSaveBlock1.giftRibbons, 11); + Trade_Memcpy(gBlockSendBuffer, gSaveBlock1.externalReservedData.giftRibbons, 11); gUnknown_03004824->unk_0075 ++; break; case 14: @@ -3777,8 +3777,8 @@ static void sub_804AF84(void) { int i; for (i = 0; i < 11; i ++) - if (gSaveBlock1.giftRibbons[i] == 0 && gUnknown_03004824->unk_00b5[i] != 0) - gSaveBlock1.giftRibbons[i] = gUnknown_03004824->unk_00b5[i]; + if (gSaveBlock1.externalReservedData.giftRibbons[i] == 0 && gUnknown_03004824->unk_00b5[i] != 0) + gSaveBlock1.externalReservedData.giftRibbons[i] = gUnknown_03004824->unk_00b5[i]; } static void sub_804AFB8(const struct WindowTemplate *windowConfig, u8 *dest, const u8 *src, u8 size) |