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

match sub_80717A4 and sub_803A3BC

Browse Source
This commit is contained in:
DizzyEggg 2024-11-29 12:22:40 +01:00
parent 2d4127bd57
commit 350a6efa62
2 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/debug_menu1.c
View File

@ -129,42 +129,31 @@ static void sub_803A3A0(void)
static void sub_803A3BC(void)
{
s32 speciesIndex;
PokemonStruct1 pokemon;
u16 moves [MAX_MON_MOVES]; // r7
u8 buffer[20]; // r6
u32 loc;
s32 item;
s32 sp_0x80;
s32 i;
#ifndef NONMATCHING
register s32 index asm("r5");
register u32 r9 asm("r9");
#else
s32 index;
u32 r9;
#endif
for (i = 1; i < NUM_FRIEND_AREAS; i++) {
UnlockFriendArea(i);
}
index = 1;
do {
UnlockFriendArea(index);
index++;
} while (index < NUM_FRIEND_AREAS);
item = ITEM_CHERI_BERRY;
for (i = 0; i < 300; i++) {
PokemonStruct1 pokemon;
u16 moves[MAX_MON_MOVES];
u8 buffer[20];
DungeonLocation dungeonLoc = {.id = DUNGEON_MT_THUNDER_PEAK, .floor = 16};
s32 speciesIndex = (s16) (i + 1);
index = 0;
do {
r9 = 0;
loc = 0x1006;
index++;
speciesIndex = index * 0x10000 >> 0x10; // TODO: dumb way to force s16. Temp var may fix the regswap
memset(moves, 0, sizeof(moves));
moves[0] = MOVE_DOUBLESLAP;
CopyMonsterNameToBuffer(buffer, speciesIndex);
CopyStringtoBuffer(buffer, buffer);
buffer[0] = 0x40;
sub_808CFD0(&pokemon, speciesIndex, buffer, ITEM_CHERI_BERRY, (DungeonLocation *)&loc, moves);
buffer[0] = '@';
sub_808CFD0(&pokemon, speciesIndex, buffer, item, &dungeonLoc, moves);
sub_808D1DC(&pokemon);
} while (index < 300);
}
sp_0x80 = r9;
sp_0x80 = 0;
WriteSavetoPak(&sp_0x80, 1);
}

43
src/dungeon_pokemon_attributes.c
View File

@ -59,33 +59,28 @@ bool8 sub_8071728(Entity * pokemon, Entity * target, bool8 displayMessage)
bool8 sub_80717A4(Entity *pokemon, u16 moveID)
{
EntityInfo * entityInfo;
s32 index;
EntityInfo * entityInfo;
s32 i;
entityInfo = GetEntInfo(pokemon);
if ((entityInfo->sleepClassStatus.status != STATUS_SLEEP) && (entityInfo->sleepClassStatus.status != STATUS_NAPPING) && (entityInfo->sleepClassStatus.status != STATUS_NIGHTMARE)) {
return FALSE;
}
else
{
// Pin this register to match
#ifndef NONMATCHING
register Move *pokeMove asm("r4");
#else
Move *pokeMove;
#endif
Move *pokeMove2; // some reason uses another pointer to same struct
for(index = 0, pokeMove = entityInfo->moves.moves, pokeMove2 = pokeMove; index < MAX_MON_MOVES; pokeMove++, pokeMove2++, index++)
{
if (((pokeMove->moveFlags & MOVE_FLAG_EXISTS)) && (entityInfo->isTeamLeader || ((pokeMove->moveFlags & MOVE_FLAG_ENABLED_FOR_AI))))
if((sub_805744C(pokemon, pokeMove2, TRUE) != 0) && (pokeMove->PP != 0))
if(pokeMove->id == moveID)
return TRUE;
entityInfo = GetEntInfo(pokemon);
if ((entityInfo->sleepClassStatus.status != STATUS_SLEEP) && (entityInfo->sleepClassStatus.status != STATUS_NAPPING) && (entityInfo->sleepClassStatus.status != STATUS_NIGHTMARE)) {
return FALSE;
}
else {
for (i = 0; i < MAX_MON_MOVES; i++) {
Move *move = &entityInfo->moves.moves[i];
if (MoveFlagExists(move)
&& (entityInfo->isTeamLeader || (move->moveFlags & MOVE_FLAG_ENABLED_FOR_AI))
&& sub_805744C(pokemon, move, TRUE)
&& move->PP != 0
&& move->id == moveID)
{
return TRUE;
}
}
}
return FALSE;
}
}
bool8 AbilityIsActive(Entity *pokemon, u8 ability)