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

Matched thanks to @Kermalis

Browse Source
This commit is contained in:
Seth Barberee 2024-01-31 21:37:57 -08:00
parent 914d19a1fa
commit d3a09dc75b
2 changed files with 30 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
asm/code_809A560.s
View File

@ -5,65 +5,6 @@
.text
thumb_func_start sub_809A83C
sub_809A83C:
push {r4-r7,lr}
lsls r0, 16
asrs r0, 16
ldr r2, _0809A8A0
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r3, _0809A8A4
adds r1, r3
ldr r2, [r2]
adds r6, r2, r1
ldr r1, _0809A8A8
strh r1, [r6]
movs r2, 0
movs r7, 0
strh r7, [r6, 0x2]
strb r2, [r6, 0x4]
strb r2, [r6, 0x5]
movs r1, 0xFF
strb r1, [r6, 0x6]
strb r2, [r6, 0x7]
str r7, [r6, 0x8]
str r7, [r6, 0xC]
str r7, [r6, 0x10]
str r7, [r6, 0x14]
strb r2, [r6, 0x1C]
lsls r4, r0, 2
adds r4, r0
lsls r4, 4
ldr r0, _0809A8AC
adds r0, r4, r0
ldr r5, _0809A8B0
adds r1, r5, 0
bl strcpy
ldr r0, _0809A8B4
adds r4, r0
adds r0, r4, 0
adds r1, r5, 0
bl strcpy
ldr r0, [r6, 0x20]
cmp r0, 0
beq _0809A89A
bl CloseFile
str r7, [r6, 0x20]
_0809A89A:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0809A8A0: .4byte gUnknown_3001B64
_0809A8A4: .4byte 0x0000043c
_0809A8A8: .4byte 0x0000ffff
_0809A8AC: .4byte gAvailablePokemonNames
_0809A8B0: .4byte gInvalidityText
_0809A8B4: .4byte gPlayerName
thumb_func_end sub_809A83C
thumb_func_start sub_809A8B8
sub_809A8B8:
push {r4-r7,lr}

57
src/code_809A560.c
View File

@ -15,7 +15,7 @@ struct unkStruct_3001B64_sub
u32 unk8;
u32 unkC;
u32 unk10;
/* 0x14 */ u32 faceData;
/* 0x14 */ u8 *faceData;
u32 fill18;
u8 unk1C;
u8 fill1D[0x20 - 0x1D];
@ -237,29 +237,32 @@ void sub_809A7EC(void)
}
}
// https://decomp.me/scratch/4MpWc (96.23% matching - Seth)
// void sub_809A83C(s16 index)
// {
// struct unkStruct_3001B64_sub *temp;
//
// temp = &gUnknown_3001B64->unk43C[index];
//
// temp->unk0 = -1;
// temp->speciesID = MONSTER_NONE;
// temp->unk4 = 0;
// temp->unk5 = 0;
// temp->unk6 = -1;
// temp->unk7 = 0;
// temp->unk8 = 0;
// temp->unkC = 0;
// temp->unk10 = 0;
// temp->faceData = NULL;
// temp->unk1C = 0;
// strcpy(gAvailablePokemonNames + (index * 0x50), gInvalidityText);
// strcpy(gPlayerName + (index * 0x50), gInvalidityText);
// if(temp->faceFile)
// {
// CloseFile(temp->faceFile);
// temp->faceFile = NULL;
// }
// }
static inline struct unkStruct_3001B64_sub *LOL(s16 p, struct unkStruct_3001B64 **thing) {
return &thing[0]->unk43C[p];
}
void sub_809A83C(s16 param_1)
{
struct unkStruct_3001B64_sub *temp;
temp = LOL(param_1, &gUnknown_3001B64);
temp->unk0 = -1;
temp->speciesID = 0;
temp->unk4 = 0;
temp->unk5 = 0;
temp->unk6 = -1;
temp->unk7 = 0;
temp->unk8 = 0;
temp->unkC = 0;
temp->unk10 = 0;
temp->faceData = NULL;
temp->unk1C = 0;
strcpy(gAvailablePokemonNames + (param_1 * 0x50), gInvalidityText);
strcpy(gPlayerName + (param_1 * 0x50), gInvalidityText);
if(temp->faceFile)
{
CloseFile(temp->faceFile);
temp->faceFile = NULL;
}
}