Match sub_325E0

This commit is contained in:
WhenGryphonsFly 2023-06-07 17:36:06 -05:00
parent b5e4dd9d51
commit c9b7b034fb
3 changed files with 237 additions and 334 deletions

View File

@ -4,323 +4,6 @@
.text
thumb_func_start sub_32484
sub_32484: @ 0x08032484
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r0, _080324D4 @ =gUnknown_020314E0
ldr r1, [r0]
movs r3, #0x97
lsls r3, r3, #1
adds r2, r1, r3
movs r1, #0
strh r1, [r2]
movs r2, #0
ldr r4, _080324D8 @ =gMain
mov sb, r4
mov ip, sb
ldr r5, _080324DC @ =gUnknown_086AE5E0
mov sl, r5
_080324A8:
lsls r2, r2, #0x10
asrs r1, r2, #0xf
mov r0, ip
ldrb r3, [r0, #4]
movs r0, #0x34
muls r0, r3, r0
adds r1, r1, r0
ldr r4, _080324E0 @ =gUnknown_086A4A38
adds r1, r1, r4
ldrh r5, [r1]
movs r4, #0
ldrsh r0, [r1, r4]
mov r8, r2
cmp r0, #0x57
bne _080324F4
cmp r3, #0
bne _080324E4
mov r0, ip
adds r0, #0xcd
ldrb r0, [r0]
b _080324E8
.align 2, 0
_080324D4: .4byte gUnknown_020314E0
_080324D8: .4byte gMain
_080324DC: .4byte gUnknown_086AE5E0
_080324E0: .4byte gUnknown_086A4A38
_080324E4:
ldr r1, _080324F0 @ =gUnknown_0200B18E
ldrb r0, [r1]
_080324E8:
lsls r0, r0, #1
add r0, sl
ldrh r3, [r0]
b _0803257C
.align 2, 0
_080324F0: .4byte gUnknown_0200B18E
_080324F4:
mov r1, sb
adds r1, #0x74
adds r0, r0, r1
ldrb r0, [r0]
lsls r0, r0, #1
add r0, sl
ldrh r3, [r0]
movs r2, #0
ldr r7, _080325CC @ =gUnknown_086A3700
ldr r6, _080325D0 @ =gUnknown_086AE5E0
adds r4, r1, #0
_0803250A:
lsls r1, r5, #0x10
asrs r1, r1, #0x10
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #3
adds r0, r0, r7
ldrb r5, [r0, #0x15]
adds r0, r5, #0
cmp r0, #0xcc
bgt _08032542
adds r0, r0, r4
ldrb r0, [r0]
lsls r0, r0, #1
adds r0, r0, r6
ldrh r0, [r0]
lsls r1, r3, #0x10
lsls r0, r0, #0x10
cmp r1, r0
bge _08032532
lsrs r3, r0, #0x10
_08032532:
lsls r0, r2, #0x10
movs r1, #0x80
lsls r1, r1, #9
adds r0, r0, r1
lsrs r2, r0, #0x10
asrs r0, r0, #0x10
cmp r0, #1
ble _0803250A
_08032542:
mov r4, r8
asrs r1, r4, #0xf
mov r5, ip
ldrb r2, [r5, #4]
movs r0, #0x34
muls r0, r2, r0
adds r1, r1, r0
ldr r0, _080325D4 @ =gUnknown_086A4A38
adds r1, r1, r0
ldrh r5, [r1]
ldr r1, _080325D8 @ =gUnknown_020314E0
ldr r0, [r1]
movs r4, #0xbe
lsls r4, r4, #3
adds r0, r0, r4
ldrh r0, [r0]
cmp r0, #0
bne _0803257C
lsls r0, r5, #0x10
asrs r0, r0, #0x10
lsls r1, r0, #1
adds r1, r1, r0
lsls r1, r1, #3
ldr r0, _080325CC @ =gUnknown_086A3700
adds r1, r1, r0
ldrb r0, [r1, #0x15]
cmp r0, #0xcc
bls _0803257C
movs r3, #0
_0803257C:
ldr r1, _080325D8 @ =gUnknown_020314E0
ldr r4, [r1]
ldr r1, _080325DC @ =0x0000059E
adds r0, r4, r1
ldrh r1, [r0]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
cmp r1, r0
bne _08032590
movs r3, #0
_08032590:
movs r5, #0x97
lsls r5, r5, #1
adds r0, r4, r5
lsls r2, r3, #0x10
asrs r2, r2, #0x10
ldrh r1, [r0]
adds r2, r2, r1
strh r2, [r0]
mov r3, r8
asrs r1, r3, #0x10
lsls r3, r1, #1
adds r5, #2
adds r0, r4, r5
adds r0, r0, r3
strh r2, [r0]
adds r1, #1
lsls r1, r1, #0x10
lsrs r2, r1, #0x10
asrs r1, r1, #0x10
cmp r1, #0x18
bgt _080325BC
b _080324A8
_080325BC:
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.align 2, 0
_080325CC: .4byte gUnknown_086A3700
_080325D0: .4byte gUnknown_086AE5E0
_080325D4: .4byte gUnknown_086A4A38
_080325D8: .4byte gUnknown_020314E0
_080325DC: .4byte 0x0000059E
thumb_func_start sub_325E0
sub_325E0: @ 0x080325E0
push {r4, r5, r6, lr}
bl Random
ldr r3, _08032600 @ =gMain
ldr r1, [r3, #0x4c]
ldr r2, [r3, #0x50]
adds r1, r1, r2
adds r2, r0, r1
movs r0, #8
ldrsb r0, [r3, r0]
cmp r0, #0
beq _08032604
adds r0, r2, #0
movs r1, #0x64
b _08032608
.align 2, 0
_08032600: .4byte gMain
_08032604:
adds r0, r2, #0
movs r1, #0x32
_08032608:
bl __umodsi3
adds r2, r0, #0
ldr r0, _08032650 @ =gUnknown_020314E0
ldr r3, [r0]
ldr r4, _08032654 @ =0x0000059E
adds r1, r3, r4
ldrh r1, [r1]
adds r5, r0, #0
cmp r1, #0x9a
bne _08032620
movs r2, #1
_08032620:
cmp r2, #0
bne _08032630
movs r1, #0xbe
lsls r1, r1, #3
adds r0, r3, r1
ldrh r0, [r0]
cmp r0, #4
bhi _08032640
_08032630:
movs r2, #0x96
lsls r2, r2, #1
adds r0, r3, r2
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
beq _08032658
_08032640:
ldr r0, [r5]
movs r3, #0xb3
lsls r3, r3, #3
adds r0, r0, r3
movs r1, #0x9a
strh r1, [r0]
b _080326CC
.align 2, 0
_08032650: .4byte gUnknown_020314E0
_08032654: .4byte 0x0000059E
_08032658:
bl Random
ldr r2, _080326E4 @ =gMain
ldr r1, [r2, #0x4c]
ldr r2, [r2, #0x50]
adds r1, r1, r2
adds r2, r0, r1
ldr r4, [r5]
movs r1, #0x97
lsls r1, r1, #1
adds r0, r4, r1
movs r3, #0
ldrsh r1, [r0, r3]
adds r0, r2, #0
bl __umodsi3
adds r2, r0, #0
movs r6, #0
movs r1, #0x98
lsls r1, r1, #1
adds r0, r4, r1
movs r3, #0
ldrsh r0, [r0, r3]
cmp r0, r2
bhi _080326AC
adds r3, r1, #0
_0803268C:
lsls r0, r6, #0x10
movs r4, #0x80
lsls r4, r4, #9
adds r0, r0, r4
lsrs r6, r0, #0x10
asrs r1, r0, #0x10
cmp r1, #0x18
bgt _080326AC
ldr r0, [r5]
lsls r1, r1, #1
adds r0, r0, r3
adds r0, r0, r1
movs r1, #0
ldrsh r0, [r0, r1]
cmp r0, r2
bls _0803268C
_080326AC:
ldr r5, _080326E8 @ =gUnknown_020314E0
ldr r3, [r5]
ldr r4, _080326EC @ =gUnknown_086A4A38
lsls r0, r6, #0x10
asrs r0, r0, #0xf
ldr r1, _080326E4 @ =gMain
ldrb r2, [r1, #4]
movs r1, #0x34
muls r1, r2, r1
adds r0, r0, r1
adds r0, r0, r4
ldrh r0, [r0]
movs r2, #0xb3
lsls r2, r2, #3
adds r3, r3, r2
strh r0, [r3]
_080326CC:
ldr r0, [r5]
movs r3, #0xb3
lsls r3, r3, #3
adds r1, r0, r3
ldrh r1, [r1]
ldr r4, _080326F0 @ =0x0000059E
adds r0, r0, r4
strh r1, [r0]
pop {r4, r5, r6}
pop {r0}
bx r0
.align 2, 0
_080326E4: .4byte gMain
_080326E8: .4byte gUnknown_020314E0
_080326EC: .4byte gUnknown_086A4A38
_080326F0: .4byte 0x0000059E
thumb_func_start sub_326F4
sub_326F4: @ 0x080326F4
push {r4, lr}

View File

@ -85,14 +85,16 @@ struct PinballGame
/*0x035*/ s8 area;
/*0x036*/ u8 filler36[0xF5];
/*0x12B*/ s8 unk12B;
/*0x12C*/ u8 filler12C[0x2];
/*0x12C*/ s8 unk12C;
/*0x12D*/ u8 filler12D;
/*0x12E*/ s16 unk12E;
/*0x130*/ s16 unk130[8];
/*0x140*/ u8 filler140[0x458];
/*0x598*/ u16 catchModeSpecies;
/*0x598*/ u16 unk598; // Current catch/hatch mode species?
/*0x59A*/ u8 filler59A[0x2];
/*0x59C*/ u16 unk59C;
/*0x59E*/ u8 filler59E[0x52];
/*0x59C*/ u16 unk59C; // Previous catch mode species?
/*0x59E*/ u16 unk59E; // Previous hatch mode species?
/*0x5A0*/ u8 filler5A0[0x50];
/*0x5F0*/ u16 unk5F0;
/*0x5F2*/ u8 filler5F2[0x14B];
/*0x73D*/ s8 unk73D;

View File

@ -3,6 +3,7 @@
#include "constants/species.h"
extern const u16 gWildMonLocations[][2][8];
extern const u16 gUnknown_086A4A38[2][26];
static inline u32 GetTimeAdjustedRandom()
{
@ -28,7 +29,7 @@ void sub_3219C(void)
continue;
}
gUnknown_020314E0->catchModeSpecies = BONUS_SPECIES_START + ((i + rand) % 4);
gUnknown_020314E0->unk598 = BONUS_SPECIES_START + ((i + rand) % 4);
}
else
{
@ -41,56 +42,56 @@ void sub_3219C(void)
if (gUnknown_02031520.unk8 < 100)
rand = 1;
if ((rand == 0 && gUnknown_020314E0->unk5F0 > 4) || gUnknown_020314E0->unk12B)
if ((rand == 0 && gUnknown_020314E0->unk5F0 >= 5) || gUnknown_020314E0->unk12B)
{
s16 numSpecialMons = 0;
gUnknown_020314E0->catchModeSpecies = 0;
gUnknown_020314E0->unk598 = 0;
if (gMain_saveData.pokedexFlags[SPECIES_AERODACTYL])
{
specialMons[numSpecialMons++] = SPECIES_AERODACTYL;
if (gMain_saveData.pokedexFlags[SPECIES_AERODACTYL] < 4)
gUnknown_020314E0->catchModeSpecies = SPECIES_AERODACTYL;
gUnknown_020314E0->unk598 = SPECIES_AERODACTYL;
}
if (gMain_saveData.pokedexFlags[SPECIES_CHIKORITA])
{
specialMons[numSpecialMons++] = SPECIES_CHIKORITA;
if (gMain_saveData.pokedexFlags[SPECIES_CHIKORITA] < 4)
gUnknown_020314E0->catchModeSpecies = SPECIES_CHIKORITA;
gUnknown_020314E0->unk598 = SPECIES_CHIKORITA;
}
if (gMain_saveData.pokedexFlags[SPECIES_TOTODILE])
{
specialMons[numSpecialMons++] = SPECIES_TOTODILE;
if (gMain_saveData.pokedexFlags[SPECIES_TOTODILE] < 4)
gUnknown_020314E0->catchModeSpecies = SPECIES_TOTODILE;
gUnknown_020314E0->unk598 = SPECIES_TOTODILE;
}
if (gMain_saveData.pokedexFlags[SPECIES_CYNDAQUIL])
{
specialMons[numSpecialMons++] = SPECIES_CYNDAQUIL;
if (gMain_saveData.pokedexFlags[SPECIES_CYNDAQUIL] < 4)
gUnknown_020314E0->catchModeSpecies = SPECIES_CYNDAQUIL;
gUnknown_020314E0->unk598 = SPECIES_CYNDAQUIL;
}
if (gMain.unk4 == 0)
{
specialMons[numSpecialMons++] = SPECIES_LATIOS;
if (gMain_saveData.pokedexFlags[SPECIES_LATIOS] < 4)
gUnknown_020314E0->catchModeSpecies = SPECIES_LATIOS;
gUnknown_020314E0->unk598 = SPECIES_LATIOS;
}
else
{
specialMons[numSpecialMons++] = SPECIES_LATIAS;
if (gMain_saveData.pokedexFlags[SPECIES_LATIAS] < 4)
gUnknown_020314E0->catchModeSpecies = SPECIES_LATIAS;
gUnknown_020314E0->unk598 = SPECIES_LATIAS;
}
if (!gUnknown_020314E0->catchModeSpecies)
if (!gUnknown_020314E0->unk598)
{
rand = GetTimeAdjustedRandom();
rand %= numSpecialMons;
gUnknown_020314E0->catchModeSpecies = specialMons[rand];
gUnknown_020314E0->unk598 = specialMons[rand];
}
}
else
@ -105,9 +106,226 @@ void sub_3219C(void)
rand %= gUnknown_020314E0->unk12E;
for (i = 0; i < 8 && gUnknown_020314E0->unk130[i] <= rand; i++) {}
gUnknown_020314E0->catchModeSpecies = gWildMonLocations[gUnknown_020314E0->area][rareMons][i];
gUnknown_020314E0->unk598 = gWildMonLocations[gUnknown_020314E0->area][rareMons][i];
}
}
gUnknown_020314E0->unk59C = gUnknown_020314E0->catchModeSpecies;
gUnknown_020314E0->unk59C = gUnknown_020314E0->unk598;
}
#ifdef NONMATCHING
____ sub_32484(____)
{
}
#else
NAKED
void sub_32484(void)
{
asm_unified("\n\
push {r4, r5, r6, r7, lr}\n\
mov r7, sl\n\
mov r6, sb\n\
mov r5, r8\n\
push {r5, r6, r7}\n\
ldr r0, _080324D4 @ =gUnknown_020314E0\n\
ldr r1, [r0]\n\
movs r3, #0x97\n\
lsls r3, r3, #1\n\
adds r2, r1, r3\n\
movs r1, #0\n\
strh r1, [r2]\n\
movs r2, #0\n\
ldr r4, _080324D8 @ =gMain\n\
mov sb, r4\n\
mov ip, sb\n\
ldr r5, _080324DC @ =gUnknown_086AE5E0\n\
mov sl, r5\n\
_080324A8:\n\
lsls r2, r2, #0x10\n\
asrs r1, r2, #0xf\n\
mov r0, ip\n\
ldrb r3, [r0, #4]\n\
movs r0, #0x34\n\
muls r0, r3, r0\n\
adds r1, r1, r0\n\
ldr r4, _080324E0 @ =gUnknown_086A4A38\n\
adds r1, r1, r4\n\
ldrh r5, [r1]\n\
movs r4, #0\n\
ldrsh r0, [r1, r4]\n\
mov r8, r2\n\
cmp r0, #0x57\n\
bne _080324F4\n\
cmp r3, #0\n\
bne _080324E4\n\
mov r0, ip\n\
adds r0, #0xcd\n\
ldrb r0, [r0]\n\
b _080324E8\n\
.align 2, 0\n\
_080324D4: .4byte gUnknown_020314E0\n\
_080324D8: .4byte gMain\n\
_080324DC: .4byte gUnknown_086AE5E0\n\
_080324E0: .4byte gUnknown_086A4A38\n\
_080324E4:\n\
ldr r1, _080324F0 @ =gUnknown_0200B18E\n\
ldrb r0, [r1]\n\
_080324E8:\n\
lsls r0, r0, #1\n\
add r0, sl\n\
ldrh r3, [r0]\n\
b _0803257C\n\
.align 2, 0\n\
_080324F0: .4byte gUnknown_0200B18E\n\
_080324F4:\n\
mov r1, sb\n\
adds r1, #0x74\n\
adds r0, r0, r1\n\
ldrb r0, [r0]\n\
lsls r0, r0, #1\n\
add r0, sl\n\
ldrh r3, [r0]\n\
movs r2, #0\n\
ldr r7, _080325CC @ =gUnknown_086A3700\n\
ldr r6, _080325D0 @ =gUnknown_086AE5E0\n\
adds r4, r1, #0\n\
_0803250A:\n\
lsls r1, r5, #0x10\n\
asrs r1, r1, #0x10\n\
lsls r0, r1, #1\n\
adds r0, r0, r1\n\
lsls r0, r0, #3\n\
adds r0, r0, r7\n\
ldrb r5, [r0, #0x15]\n\
adds r0, r5, #0\n\
cmp r0, #0xcc\n\
bgt _08032542\n\
adds r0, r0, r4\n\
ldrb r0, [r0]\n\
lsls r0, r0, #1\n\
adds r0, r0, r6\n\
ldrh r0, [r0]\n\
lsls r1, r3, #0x10\n\
lsls r0, r0, #0x10\n\
cmp r1, r0\n\
bge _08032532\n\
lsrs r3, r0, #0x10\n\
_08032532:\n\
lsls r0, r2, #0x10\n\
movs r1, #0x80\n\
lsls r1, r1, #9\n\
adds r0, r0, r1\n\
lsrs r2, r0, #0x10\n\
asrs r0, r0, #0x10\n\
cmp r0, #1\n\
ble _0803250A\n\
_08032542:\n\
mov r4, r8\n\
asrs r1, r4, #0xf\n\
mov r5, ip\n\
ldrb r2, [r5, #4]\n\
movs r0, #0x34\n\
muls r0, r2, r0\n\
adds r1, r1, r0\n\
ldr r0, _080325D4 @ =gUnknown_086A4A38\n\
adds r1, r1, r0\n\
ldrh r5, [r1]\n\
ldr r1, _080325D8 @ =gUnknown_020314E0\n\
ldr r0, [r1]\n\
movs r4, #0xbe\n\
lsls r4, r4, #3\n\
adds r0, r0, r4\n\
ldrh r0, [r0]\n\
cmp r0, #0\n\
bne _0803257C\n\
lsls r0, r5, #0x10\n\
asrs r0, r0, #0x10\n\
lsls r1, r0, #1\n\
adds r1, r1, r0\n\
lsls r1, r1, #3\n\
ldr r0, _080325CC @ =gUnknown_086A3700\n\
adds r1, r1, r0\n\
ldrb r0, [r1, #0x15]\n\
cmp r0, #0xcc\n\
bls _0803257C\n\
movs r3, #0\n\
_0803257C:\n\
ldr r1, _080325D8 @ =gUnknown_020314E0\n\
ldr r4, [r1]\n\
ldr r1, _080325DC @ =0x0000059E\n\
adds r0, r4, r1\n\
ldrh r1, [r0]\n\
lsls r0, r5, #0x10\n\
asrs r0, r0, #0x10\n\
cmp r1, r0\n\
bne _08032590\n\
movs r3, #0\n\
_08032590:\n\
movs r5, #0x97\n\
lsls r5, r5, #1\n\
adds r0, r4, r5\n\
lsls r2, r3, #0x10\n\
asrs r2, r2, #0x10\n\
ldrh r1, [r0]\n\
adds r2, r2, r1\n\
strh r2, [r0]\n\
mov r3, r8\n\
asrs r1, r3, #0x10\n\
lsls r3, r1, #1\n\
adds r5, #2\n\
adds r0, r4, r5\n\
adds r0, r0, r3\n\
strh r2, [r0]\n\
adds r1, #1\n\
lsls r1, r1, #0x10\n\
lsrs r2, r1, #0x10\n\
asrs r1, r1, #0x10\n\
cmp r1, #0x18\n\
bgt _080325BC\n\
b _080324A8\n\
_080325BC:\n\
pop {r3, r4, r5}\n\
mov r8, r3\n\
mov sb, r4\n\
mov sl, r5\n\
pop {r4, r5, r6, r7}\n\
pop {r0}\n\
bx r0\n\
.align 2, 0\n\
_080325CC: .4byte gUnknown_086A3700\n\
_080325D0: .4byte gUnknown_086AE5E0\n\
_080325D4: .4byte gUnknown_086A4A38\n\
_080325D8: .4byte gUnknown_020314E0\n\
_080325DC: .4byte 0x0000059E");
}
#endif
void sub_325E0(void)
{
s16 i;
u32 rand;
rand = GetTimeAdjustedRandom();
if (gMain.unk8)
rand %= 100;
else
rand %= 50;
if (gUnknown_020314E0->unk59E == SPECIES_PICHU)
rand = 1;
if ((rand == 0 && gUnknown_020314E0->unk5F0 >= 5) || gUnknown_020314E0->unk12C)
gUnknown_020314E0->unk598 = SPECIES_PICHU;
else
{
rand = GetTimeAdjustedRandom();
rand %= gUnknown_020314E0->unk12E;
for (i = 0; i < 25 && gUnknown_020314E0->unk130[i] <= rand; i++) {}
gUnknown_020314E0->unk598 = gUnknown_086A4A38[gMain.unk4][i];
}
gUnknown_020314E0->unk59E = gUnknown_020314E0->unk598;
}