Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-24 06:57:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

slight updates

Browse Source
This commit is contained in:
Seth Barberee 2024-09-19 19:03:55 -07:00
parent 0ceb445c25
commit 3311aa476e
3 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/code_8069D4C.h
View File

@ -6,8 +6,9 @@ struct unkStruct_8069D4C
s16 id;
Position pos;
s16 HP;
/* 0x0 */ u8 att[2]; // Atk, SpAtk
/* 0x2 */ u8 def[2]; // Def, SpDef
// NOTE: cannot re-use offense struct as it pads.
u8 att[2]; // Atk, SpAtk
u8 def[2]; // Def, SpDef
u16 level;
u32 exp;
FixedPoint belly;

27
include/structs/struct_8069D4C.h
View File

@ -1,27 +0,0 @@
#ifndef GUARD_STRUCT_8069D4C_H
#define GUARD_STRUCT_8069D4C_H
#include "structs/dungeon_entity.h"
#include "structs/str_items.h"
#include "structs/str_pokemon.h"
#include "structs/str_position.h"
struct unkStruct_8069D4C
{
s16 id;
Position pos;
s16 HP;
// NOTE: cannot re-use offense struct as it pads.
u8 att[2]; // Atk, SpAtk
u8 def[2]; // Def, SpDef
u16 level;
u32 exp;
u32 belly;
u32 maxBelly;
Item heldItem;
unkStruct_8094184 moves;
HiddenPower hiddenPower;
};
#endif // GUARD_STRUCT_8069D4C_H

6
src/code_806FDF4.c
View File

@ -32,7 +32,6 @@ extern u8 gUnknown_202E088[];
extern u8 *gUnknown_80FA120[];
extern u8 *gUnknown_80FA090[];
void sub_8069D4C(struct unkStruct_8069D4C *r0, Entity *target);
void sub_8068FE0(Entity *, u32, Entity *);
u8 sub_806B8CC();
bool8 sub_805FBE8(u8 *a0);
@ -41,7 +40,6 @@ extern void PrintFieldMessage(u32, const u8 *, u32);
void sub_8083D88();
u8 sub_808529C(s32);
extern u8 GetBodySize(s16 index);
void sub_806F910();
void nullsub_96(Entity *pokemon,Entity *target)
{}
@ -171,7 +169,7 @@ bool8 sub_806FA5C(Entity *entity1, Entity *entity2, struct unkStruct_8069D4C *pa
pokeStruct2->isTeamLeader = FALSE;
pokeStruct2->level = param_3->level;
pokeStruct2->IQ = 1;
SetDefaultIQSkills((u8 *)&(pokeStruct2->IQSkills),0);
SetDefaultIQSkills((u8 *)&(pokeStruct2->IQSkills),FALSE);
pokeStruct2->hiddenPower = param_3->hiddenPower;
pokeStruct2->tacticIndex = 0;
pokeStruct2->unkA = -1;
@ -211,7 +209,7 @@ bool8 sub_806FA5C(Entity *entity1, Entity *entity2, struct unkStruct_8069D4C *pa
}
sub_808D9DC(gAvailablePokemonNames,pokeStruct2,0);
SendMessage(entity1,*gUnknown_80FA0F0);
if (flag != '\0') {
if (flag) {
leader = xxx_call_GetLeader();
SetMessageArgument(gAvailablePokemonNames,leader,0);
sub_8092558(gUnknown_202E628,friendArea);