Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-04-25 07:26:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #569 from ellieplayswow/bugfix/pokemon-met-gender
Some checks failed
build / build (push) Has been cancelled
Details

Browse Source 
pokemon: metGender -> otGender
This commit is contained in:
red031000 2025-08-07 14:27:20 +01:00 committed by GitHub
commit 6dba5c722f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arm9/src/pokemon.c
View File

@ -900,8 +900,8 @@ u32 GetBoxMonDataInternal(struct BoxPokemon *boxmon, int attr, void *dest) {
case MON_DATA_MET_LEVEL:
ret = blockD->metLevel;
break;
case MON_DATA_MET_GENDER:
ret = blockD->metGender;
case MON_DATA_OT_GENDER:
ret = blockD->otGender;
break;
case MON_DATA_ENCOUNTER_TYPE:
ret = blockD->encounterType;
@ -1342,8 +1342,8 @@ void SetBoxMonDataInternal(struct BoxPokemon *boxmon, int attr, void *value) {
case MON_DATA_MET_LEVEL:
blockD->metLevel = VALUE(u8);
break;
case MON_DATA_MET_GENDER:
blockD->metGender = VALUE(u8);
case MON_DATA_OT_GENDER:
blockD->otGender = VALUE(u8);
break;
case MON_DATA_ENCOUNTER_TYPE:
blockD->encounterType = VALUE(u8);
@ -1690,7 +1690,7 @@ void AddBoxMonData(struct BoxPokemon *boxmon, int attr, int value) {
case MON_DATA_POKERUS:
case MON_DATA_POKEBALL:
case MON_DATA_MET_LEVEL:
case MON_DATA_MET_GENDER:
case MON_DATA_OT_GENDER:
case MON_DATA_ENCOUNTER_TYPE:
case MON_DATA_RESERVED_158:
case MON_DATA_STATUS:
@ -3462,7 +3462,7 @@ BOOL sub_0206A9AC(struct BoxPokemon *boxmon, PlayerProfile *sb2, HeapID heapId)
u32 myId = PlayerProfile_GetTrainerID(sb2);
u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL);
u32 myGender = PlayerProfile_GetTrainerGender(sb2);
u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL);
u32 otGender = GetBoxMonData(boxmon, MON_DATA_OT_GENDER, NULL);
struct String *r7 = PlayerProfile_GetPlayerName_NewString(sb2, heapId);
struct String *r6 = String_New(PLAYER_NAME_LENGTH + 1, heapId);
BOOL ret = FALSE;

2
include/constants/pokemon.h
View File

@ -269,7 +269,7 @@
#define MON_DATA_POKERUS 153
#define MON_DATA_POKEBALL 154
#define MON_DATA_MET_LEVEL 155
#define MON_DATA_MET_GENDER 156
#define MON_DATA_OT_GENDER 156
#define MON_DATA_ENCOUNTER_TYPE 157
#define MON_DATA_RESERVED_158 158 // HGSS
#define MON_DATA_STATUS 159

2
include/pokemon.h
View File

@ -121,7 +121,7 @@ typedef struct {
/* 0x1A */ u8 pokerus;
/* 0x1B */ u8 pokeball;
/* 0x1C */ u8 metLevel : 7;
u8 metGender : 1;
u8 otGender : 1;
/* 0x1D */ u8 encounterType;
/* 0x1E */ u16 HGSS_Pokeball;
} PokemonDataBlockD;