Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-06-02 22:09:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
Seth Barberee 2023-08-30 19:38:28 -07:00
parent 9e5619529d
commit 5e6a668bbd
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokemon_3.h
View File

@ -10,7 +10,7 @@ struct EvolveStatus
s16 targetEvolveSpecies;
};
bool8 HasRecruitedMon(s16 species_);
bool8 HasRecruitedMon(s16 species);
s16 GetBaseSpecies(s16 index);
s16 GetBaseSpeciesNoUnown(s16 index);
bool8 TacticsTargetLeader(u8 tactic);

2
src/code_801D760.c
View File

@ -676,7 +676,7 @@ void sub_801DBD4(void)
#ifndef NONMATCHING
register s32 x asm("r4");
#else
register s32 x;
s32 x;
#endif
s16 index;
int counter;

2
src/friend_area_action_menu.c
View File

@ -533,7 +533,7 @@ void sub_80278B4(void)
case FRIEND_AREA_ACTION_MENU_ACTION_JOIN_TEAM:
if (sub_808D750(gUnknown_203B2BC->targetPoke)) {
#ifdef NONMATCHING
pokeStruct1 = &gRecruiedPokemonRef->pokemon[gUnknown_203B2BC->targetPoke];
pokeStruct1 = &gRecruitedPokemonRef->pokemon[gUnknown_203B2BC->targetPoke];
#else
register size_t offset asm("r1") = offsetof(struct unkStruct_203B45C, pokemon[gUnknown_203B2BC->targetPoke]);
struct PokemonStruct* p = gRecruitedPokemonRef->pokemon;

12
src/pokemon_3.c
View File

@ -104,14 +104,14 @@ void sub_808E6F4(struct unkStruct_808E6F4* a1)
a1->unk2 = 2;
}
bool8 HasRecruitedMon(s16 species_) {
s32 species = species_;
bool8 HasRecruitedMon(s16 species) {
s32 species_s32 = species;
s32 i = 0;
struct PokemonStruct *pokemon = gRecruitedPokemonRef->pokemon;
for (i = 0; i < NUM_MONSTERS; i++) {
if (((u8)pokemon->unk0 & 1)) {
if(pokemon->speciesNum == species)
if(pokemon->speciesNum == species_s32)
return TRUE;
}
pokemon++;
@ -928,7 +928,7 @@ void sub_808F468(struct PokemonStruct *param_1, struct EvolveStatus *evolveStatu
#endif
evolveStatus->evolutionConditionStatus = 0;
for(index = MONSTER_BULBASAUR; index < 0x1A8; index++)
for(index = MONSTER_BULBASAUR; index <= MONSTER_MAX; index++)
{
if ((s16)index == MONSTER_ALAKAZAM) {
GetPokemonEvolveConditions(MONSTER_ALAKAZAM, &evolveConditions);
@ -939,11 +939,11 @@ void sub_808F468(struct PokemonStruct *param_1, struct EvolveStatus *evolveStatu
if(((evolveConditions.preEvolution.evolveType != EVOLVE_TYPE_NONE) && (param_1->speciesNum == evolveConditions.preEvolution.evolveFrom)))
break;
};
if (index == 0x1a8) {
if (index == MONSTER_MAX + 1) {
evolveStatus->evolutionConditionStatus = EVOLUTION_NO_MORE;
}
else {
for(index = MONSTER_BULBASAUR, defaultReason = EVOLUTION_LACK_ITEM; index < 0x1A8; index++)
for(index = MONSTER_BULBASAUR, defaultReason = EVOLUTION_LACK_ITEM; index <= MONSTER_MAX; index++)
{
evolFlag = FALSE;
index2 = (s16)index;

2
src/rescue_password_menu.c
View File

@ -636,7 +636,7 @@ u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, struct unkStruct_203B480 *para
{
if ( (!sub_803D204(passwordBuffer, param_3)) || (WONDER_MAIL_TYPE_OKD < param_3->mailType) ||
(param_3->unk4.dungeon.floor >= GetDungeonFloorCount(param_3->unk4.dungeon.id)) ||
(param_3->clientSpecies == MONSTER_NONE) || (MONSTER_RAYQUAZA_CUTSCENE < param_3->clientSpecies) ||
(param_3->clientSpecies == MONSTER_NONE) || (MONSTER_MAX < param_3->clientSpecies) ||
(IsInvalidItemReward(param_3->item.id))) {
return PASSWORD_ENTRY_INCORRECT_PASSWORD;
}

4
src/wigglytuff_shop.c
View File

@ -118,10 +118,6 @@ void sub_8021D5C(void);
void UpdateWigglytuffDialogue(void);
extern void sub_8008C54(u32);
//extern void sub_80073B8(u32);
//extern void sub_80073E0(u32);
//void sub_800792C(u32, u32, u32, u32, u32);
//void sub_8007A78(u32, u32, u32, u32, u32);
void sub_8021878(void);
void sub_8021894(void);