Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-08 04:46:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

address most review comments

Browse Source
This commit is contained in:
Seth Barberee 2023-01-29 20:21:57 -08:00
parent cfcdd467d2
commit 61545f247f
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asm/code_80521D0.s
View File

@ -3889,7 +3889,7 @@ _0805461A:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805A2E8
bl SurfMoveAction
bl _080554BA
_0805462A:
adds r0, r7, 0
@ -4084,7 +4084,7 @@ _080547D8:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805A0A8
bl TriAttackMoveAction
bl _080554BA
_080547E8:
adds r0, r7, 0
@ -4224,7 +4224,7 @@ _08054918:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805A588
bl TickleMoveAction
bl _080554BA
_08054928:
adds r0, r7, 0
@ -4287,7 +4287,7 @@ _080549A8:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805ACD8
bl BulkUpMoveAction
bl _080554BA
_080549B8:
adds r0, r7, 0
@ -4518,7 +4518,7 @@ _08054BB8:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805AF30
bl PresentMoveAction
bl _080554BA
_08054BC8:
adds r0, r7, 0
@ -5243,7 +5243,7 @@ _08055182:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805A508
bl SwallowMoveAction
b _080554BA
_08055190:
adds r0, r7, 0
@ -5348,7 +5348,7 @@ _08055254:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805AAE0
bl BellyDrumMoveAction
b _080554BA
_08055262:
adds r0, r7, 0
@ -5481,7 +5481,7 @@ _0805535E:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805AB54
bl SecretPowerMoveAction
b _080554BA
_0805536C:
adds r0, r7, 0
@ -5516,7 +5516,7 @@ _080553A4:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_805A31C
bl RolePlayMoveAction
b _080554BA
_080553B2:
adds r0, r7, 0
@ -5530,7 +5530,7 @@ _080553C0:
adds r1, r5, 0
mov r2, r8
mov r3, r9
bl sub_8059BAC
bl ConversionMoveAction
b _080554BA
_080553CE:
adds r0, r7, 0

30
src/code_805A120.c
View File

@ -254,7 +254,7 @@ bool8 sub_80595EC(struct Entity * pokemon,struct Entity * target,struct Move * m
bool8 SolarBeamMoveAction(struct Entity * pokemon,struct Entity * target,struct Move * move,u32 param_4)
{
u8 weather; // weather and flag are resued in same variable
u8 weather; // weather and flag are reused in same variable
s32 movePower;
weather = GetApparentWeather(pokemon);
@ -451,7 +451,7 @@ bool8 sub_8059B94(struct Entity *pokemon, struct Entity *target, struct Move *mo
return TRUE;
}
bool8 sub_8059BAC(struct Entity * pokemon,struct Entity * target,struct Move * move,u32 param_4)
bool8 ConversionMoveAction(struct Entity * pokemon,struct Entity * target,struct Move * move,u32 param_4)
{
u8 moveType;
struct Move *movePtr;
@ -692,7 +692,7 @@ bool8 sub_8059FC8(struct Entity * pokemon,struct Entity * target,struct Move * m
return flag;
}
bool8 sub_805A0A8(struct Entity * pokemon, struct Entity * target, struct Move *move, u32 param_4)
bool8 TriAttackMoveAction(struct Entity * pokemon, struct Entity * target, struct Move *move, u32 param_4)
{
bool8 flag;
@ -833,7 +833,7 @@ bool8 sub_805A2C8(struct Entity *pokemon, struct Entity *target, struct Move *mo
return TRUE;
}
bool8 sub_805A2E8(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
bool8 SurfMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
{
bool8 flag;
u32 uVar2;
@ -851,7 +851,7 @@ bool8 sub_805A2E8(struct Entity *pokemon, struct Entity *target, struct Move *mo
return flag;
}
bool8 sub_805A31C(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
bool8 RolePlayMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
{
struct EntityInfo * iVar3;
struct EntityInfo * iVar4;
@ -957,7 +957,7 @@ bool8 sub_805A4FC(struct Entity *pokemon, struct Entity *target, struct Move *mo
return TRUE;
}
bool8 sub_805A508(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
bool8 SwallowMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
{
u8 *stockpileStage;
@ -986,7 +986,7 @@ bool8 sub_805A568(struct Entity * pokemon, struct Entity * target, struct Move *
return flag;
}
bool8 sub_805A588(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
bool8 TickleMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
{
u32 stat;
bool32 flag;
@ -1210,7 +1210,11 @@ _0805A9FE:
sub_80694C0(target,sp_0x18.x,sp_0x18.y,0);
_0805AA5E:
if (EntityExists(target)) {
#ifndef NOMATCHING
register struct Position *pos asm("r1");
#else
struct Position *pos;
#endif
sub_804535C(target, 0);
pos = r9;
if (sub_80706A4(target, pos)) {
@ -1233,7 +1237,7 @@ bool8 sub_805AAD0(struct Entity * pokemon, struct Entity * target, struct Move *
return TRUE;
}
bool8 sub_805AAE0(struct Entity * pokemon,struct Entity * target, struct Move *move, u32 param_4)
bool8 BellyDrumMoveAction(struct Entity * pokemon,struct Entity * target, struct Move *move, u32 param_4)
{
u32 *belly;
u32 newBelly;
@ -1262,7 +1266,7 @@ bool8 sub_805AB48(struct Entity * pokemon, struct Entity * target, struct Move *
return TRUE;
}
bool8 sub_805AB54(struct Entity * pokemon, struct Entity * target, struct Move *move, u32 param_4)
bool8 SecretPowerMoveAction(struct Entity * pokemon, struct Entity * target, struct Move *move, u32 param_4)
{
bool8 flag;
@ -1319,7 +1323,7 @@ bool8 sub_805AC90(struct Entity * pokemon, struct Entity * target, struct Move *
return flag;
}
bool8 sub_805ACD8(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
bool8 BulkUpMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
{
s32 stat = gUnknown_8106A4C;
RaiseAttackStageTarget(pokemon, target, stat, 1);
@ -1339,7 +1343,7 @@ bool8 sub_805AD34(struct Entity *pokemon, struct Entity *target, struct Move *mo
return TRUE;
}
static inline bool8 sub_805AAE0_sub(struct Entity *entity)
static inline bool8 sub_805AD54_sub(struct Entity *entity)
{
if ((entity->info->joinedAt == 0x4A) || (entity->info->joinedAt == 0x47)) {
return TRUE;
@ -1377,7 +1381,7 @@ bool8 sub_805AD54(struct Entity * pokemon, struct Entity * target, struct Move *
if ((((EntityExists(targetEntity)) && (pokemon != targetEntity)) &&
(CanTarget(pokemon,targetEntity,FALSE,FALSE) == TARGET_CAPABILITY_CANNOT_ATTACK)) &&
(targetEntity->info->clientType != ENTITY_MONSTER)) {
if (!sub_805AAE0_sub(targetEntity)) {
if (!sub_805AD54_sub(targetEntity)) {
sub_807D148(pokemon,targetEntity,2,&target->pos);
flag = TRUE;
if (info->unkFB == 0) {
@ -1430,7 +1434,7 @@ bool8 sub_805AECC(struct Entity * pokemon, struct Entity * target, struct Move *
return flag;
}
bool8 sub_805AF30(struct Entity * pokemon, struct Entity * target, struct Move *move, u32 param_4)
bool8 PresentMoveAction(struct Entity * pokemon, struct Entity * target, struct Move *move, u32 param_4)
{
s32 rand1;
s32 rand2;