Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-28 03:34:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #274 from DizzyEggg/match_subs

Browse Source 
match sub_8086F54 sub_8012D34 sub_8012D08
This commit is contained in:
Seth Barberee
2024-11-28 08:40:24 -08:00
committed by GitHub
parent 33a7303313 35052c77cd
commit 1f8f8d1826
2 changed files with 41 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/dungeon_cutscenes.c
View File

@@ -689,34 +689,28 @@ void sub_8086F00(void)
CopyMonsterNameToBuffer(gFormatBuffer_Monsters[4], MONSTER_CATERPIE);
}
// From @jiangzhengwenjz:
// Matches this way for -O2 but can match w/o this hack on -O1
// https://decomp.me/scratch/BTqWo
void sub_8086F54(u8 param_1, u8 param_2)
{
Entity *entity;
s32 index;
u32 unk1 = 0;
s32 index;
if (param_2 == 4 || param_2 == 5) {
bool8 found = FALSE;
for (index = 0; index < 0x10; index++) {
struct Entity *entity = gDungeon->wildPokemon[index];
if ((EntityExists(entity))) {
struct EntityInfo *entInfo = GetEntInfo(entity);
if (entInfo->monsterBehavior != param_1) {
found = TRUE;
return;
}
}
}
if (param_2 == 4 || param_2 == 5) {
void *labels[2];
labels[0] = labels[1] = &&label;
for(index = 0; index < 0x10; index++)
{
entity = gDungeon->wildPokemon[index];
if ((EntityExists(entity)) && (GetEntInfo(entity)->monsterBehavior != param_1)) {
return;
}
if (!found) {
sub_8097FA8(3);
gDungeon->unk2 = 1;
}
}
if(!unk1)
{
sub_8097FA8(3);
label:
gDungeon->unk2 = 1;
}
}
}
void TeamMeaniesPreFightDialogue(void)

76
src/menu_input.c
View File

@@ -13,6 +13,7 @@
#include "text1.h"
#include "text2.h"
#include "util.h"
#include "structs/struct_sub80095e4.h"
const u32 gDefaultMenuTextColors[3] = { COLOR_WHITE_2, COLOR_RED, COLOR_RED };
@@ -62,9 +63,6 @@ const s32 gUnknown_80D4830[9] = {
100000000
};
// text.s
extern s16 sub_8009614(u32, u32);
static void sub_8013134(MenuInputStruct *, u32, u32);
static void sub_801332C(DungeonPos *a0);
static void sub_8013470(MenuInputStruct *);
@@ -267,59 +265,33 @@ void sub_8012CAC(UnkTextStruct2 *a0, const MenuItem *a1)
sub_8012D08(a0, r7);
}
NAKED // sub_80095E4 memes
void sub_8012D08(UnkTextStruct2 *a0, s32 a1)
void sub_8012D08(UnkTextStruct2 *param_1, s32 param_2)
{
asm_unified(
"\tpush {r4,lr}\n"
"\tadds r4, r0, 0\n"
"\tadds r0, r1, 0\n"
"\tmovs r1, 0xC\n"
"\tbl sub_80095E4\n"
"\tlsls r0, 16\n"
"\tasrs r1, r0, 16\n"
"\tldr r0, [r4, 0x4]\n"
"\tcmp r0, 0x6\n"
"\tbne _08012D24\n"
"\tadds r0, r1, 0x2\n"
"\tlsls r0, 16\n"
"\tasrs r1, r0, 16\n"
"_08012D24:\n"
"\tlsls r0, r1, 16\n"
"\tlsrs r0, 16\n"
"\tstrh r0, [r4, 0xE]\n"
"\tstrh r0, [r4, 0x10]\n"
"\tpop {r4}\n"
"\tpop {r0}\n"
"\tbx r0");
s32 sVar2;
s16 sVar3;
sVar2 = (s16) sub_80095E4(param_2, 12);
if (param_1->unk4 == 6)
sVar2 = (s16)(sVar2 + 2);
sVar3 = sVar2;
param_1->unkE = sVar3;
param_1->unk10 = sVar3;
}
// https://decomp.me/scratch/QadfW (200 - 90% matched) - Seth
NAKED
void sub_8012D34(UnkTextStruct2 *a0, s32 a1)
void sub_8012D34(struct UnkTextStruct2 *param_1, s32 param_2)
{
asm_unified(
"\tpush {r4,lr}\n"
"\tadds r4, r0, 0\n"
"\tadds r0, r1, 0\n"
"\tmovs r1, 0x18\n"
"\tbl sub_8009614\n"
"\tlsls r0, 16\n"
"\tasrs r1, r0, 16\n"
"\tldr r0, [r4, 0x4]\n"
"\tcmp r0, 0x6\n"
"\tbne _08012D50\n"
"\tadds r0, r1, 0x2\n"
"\tlsls r0, 16\n"
"\tasrs r1, r0, 16\n"
"_08012D50:\n"
"\tlsls r0, r1, 16\n"
"\tlsrs r0, 16\n"
"\tstrh r0, [r4, 0xE]\n"
"\tstrh r0, [r4, 0x10]\n"
"\tpop {r4}\n"
"\tpop {r0}\n"
"\tbx r0");
s32 sVar2;
s16 sVar3;
sVar2 = (s16) sub_8009614(param_2, 24);
if (param_1->unk4 == 6)
sVar2 = (s16)(sVar2 + 2);
sVar3 = sVar2;
param_1->unkE = sVar3;
param_1->unk10 = sVar3;
}
void sub_8012D60(MenuStruct *param_1, const MenuItem *menuItems, const u32 *colorArray, u16 *param_4, s32 menuAction, s32 index)