Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-03-21 17:54:57 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge f0cfc049da into 25ffb2c12c

Browse Source
This commit is contained in:
Raymond Dodge 2026-03-16 20:26:23 +00:00 committed by GitHub
commit 334c49bfc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/give_gift_ribbon_to_party.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GUARD_GIVE_GIFT_RIBBON_TO_PARTY_H
#define GUARD_GIVE_GIFT_RIBBON_TO_PARTY_H
void GiveGiftRibbonToParty(u8 index, u8 ribbonId);
#endif // GUARD_GIVE_GIFT_RIBBON_TO_PARTY_H

2
include/pokemon_size_record.h
View File

@ -9,6 +9,4 @@ void InitLotadSizeRecord(void);
void GetLotadSizeRecordInfo(void);
void CompareLotadSize(void);
void GiveGiftRibbonToParty(u8 index, u8 ribbonId);
#endif // GUARD_POKEMON_SIZE_RECORD_H

2
ld_script.ld
View File

@ -180,6 +180,7 @@ SECTIONS {
src/script_pokemon_util.o(.text);
src/field_poison.o(.text);
src/pokemon_size_record.o(.text);
src/give_gift_ribbon_to_party.o(.text);
src/fldeff_misc.o(.text);
src/field_special_scene.o(.text);
src/rotating_gate.o(.text);
@ -557,6 +558,7 @@ SECTIONS {
src/contest_util.o(.rodata);
src/script_pokemon_util.o(.rodata);
src/pokemon_size_record.o(.rodata)
src/give_gift_ribbon_to_party.o(.rodata);
src/fldeff_misc.o(.rodata);
src/field_special_scene.o(.rodata);
src/rotating_gate.o(.rodata);

38
src/give_gift_ribbon_to_party.c Normal file
View File

@ -0,0 +1,38 @@
#include "global.h"
#include "event_data.h"
#include "give_gift_ribbon_to_party.h"
#include "pokemon.h"
// - 4 for unused gift ribbon bits in MON_DATA_UNUSED_RIBBONS
static const u8 sGiftRibbonsMonDataIds[GIFT_RIBBONS_COUNT - 4] =
{
MON_DATA_MARINE_RIBBON, MON_DATA_LAND_RIBBON, MON_DATA_SKY_RIBBON,
MON_DATA_COUNTRY_RIBBON, MON_DATA_NATIONAL_RIBBON, MON_DATA_EARTH_RIBBON,
MON_DATA_WORLD_RIBBON
};
void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
{
s32 i;
bool32 gotRibbon = FALSE;
u8 data = 1;
u8 array[ARRAY_COUNT(sGiftRibbonsMonDataIds)];
memcpy(array, sGiftRibbonsMonDataIds, sizeof(sGiftRibbonsMonDataIds));
if (index < GIFT_RIBBONS_COUNT && ribbonId <= MAX_GIFT_RIBBON)
{
gSaveBlock1Ptr->giftRibbons[index] = ribbonId;
for (i = 0; i < PARTY_SIZE; i++)
{
struct Pokemon *mon = &gPlayerParty[i];
if (GetMonData(mon, MON_DATA_SPECIES) != 0 && GetMonData(mon, MON_DATA_SANITY_IS_EGG) == 0)
{
SetMonData(mon, array[index], &data);
gotRibbon = TRUE;
}
}
if (gotRibbon)
FlagSet(FLAG_SYS_RIBBON_GET);
}
}

2
src/mystery_event_script.c
View File

@ -7,7 +7,7 @@
#include "mystery_event_script.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_size_record.h"
#include "give_gift_ribbon_to_party.h"
#include "script.h"
#include "strings.h"
#include "string_util.h"

34
src/pokemon_size_record.c
View File

@ -36,14 +36,6 @@ static const struct UnknownStruct sBigMonSizeTable[] =
{ 1700, 1, -26 },
};
// - 4 for unused gift ribbon bits in MON_DATA_UNUSED_RIBBONS
static const u8 sGiftRibbonsMonDataIds[GIFT_RIBBONS_COUNT - 4] =
{
MON_DATA_MARINE_RIBBON, MON_DATA_LAND_RIBBON, MON_DATA_SKY_RIBBON,
MON_DATA_COUNTRY_RIBBON, MON_DATA_NATIONAL_RIBBON, MON_DATA_EARTH_RIBBON,
MON_DATA_WORLD_RIBBON
};
extern const u8 gText_DecimalPoint[];
extern const u8 gText_Marco[];
@ -192,29 +184,3 @@ void CompareLotadSize(void)
gSpecialVar_Result = CompareMonSize(SPECIES_LOTAD, sizeRecord);
}
void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
{
s32 i;
bool32 gotRibbon = FALSE;
u8 data = 1;
u8 array[ARRAY_COUNT(sGiftRibbonsMonDataIds)];
memcpy(array, sGiftRibbonsMonDataIds, sizeof(sGiftRibbonsMonDataIds));
if (index < GIFT_RIBBONS_COUNT && ribbonId <= MAX_GIFT_RIBBON)
{
gSaveBlock1Ptr->giftRibbons[index] = ribbonId;
for (i = 0; i < PARTY_SIZE; i++)
{
struct Pokemon *mon = &gPlayerParty[i];
if (GetMonData(mon, MON_DATA_SPECIES) != 0 && GetMonData(mon, MON_DATA_SANITY_IS_EGG) == 0)
{
SetMonData(mon, array[index], &data);
gotRibbon = TRUE;
}
}
if (gotRibbon)
FlagSet(FLAG_SYS_RIBBON_GET);
}
}