sub_304C8

This commit is contained in:
Marcus Huderle 2025-08-21 07:57:15 -05:00
parent f62c7af3fc
commit 80e6275b63
5 changed files with 164 additions and 526 deletions

View File

@ -6,523 +6,6 @@
.text
thumb_func_start sub_304C8
sub_304C8: @ 0x080304C8
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
sub sp, #4
movs r0, #0
mov r8, r0
mov ip, r0
movs r6, #0
ldr r7, _08030504 @ =gMain+0x2858 @gMain.spriteGroups[52]
movs r1, #0
str r1, [sp]
ldr r1, _08030508 @ =gCurrentPinballGame
ldr r0, [r1]
movs r2, #0xf6
lsls r2, r2, #1
adds r0, r0, r2
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
mov sb, r1
cmp r0, #5
bhi _08030552
lsls r0, r0, #2
ldr r1, _0803050C @ =_08030510
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08030504: .4byte gMain+0x2858 @gMain.spriteGroups[52]
_08030508: .4byte gCurrentPinballGame
_0803050C: .4byte _08030510
_08030510: @ jump table
.4byte _08030552 @ case 0
.4byte _08030552 @ case 1
.4byte _08030528 @ case 2
.4byte _08030532 @ case 3
.4byte _0803053E @ case 4
.4byte _08030548 @ case 5
_08030528:
movs r3, #4
mov r8, r3
mov ip, r3
movs r6, #3
b _08030552
_08030532:
movs r6, #8
mov r8, r6
movs r0, #4
mov ip, r0
movs r6, #3
b _08030552
_0803053E:
movs r1, #0xc
mov r8, r1
mov ip, r1
movs r6, #5
b _08030552
_08030548:
movs r2, #0x21
mov r8, r2
movs r3, #0
mov ip, r3
movs r6, #0
_08030552:
mov r1, sb
ldr r0, [r1]
movs r2, #0xf7
lsls r2, r2, #1
adds r1, r0, r2
ldr r5, _080305D8 @ =0x000001ED
adds r2, r0, r5
ldrb r1, [r1]
lsls r1, r1, #0x18
asrs r1, r1, #0x18
movs r0, #0
ldrsb r0, [r2, r0]
cmp r1, r0
beq _0803059E
ldr r1, _080305DC @ =gUnknown_086AD2EE
lsls r0, r0, #3
adds r1, #6
adds r0, r0, r1
ldr r2, _080305E0 @ =0x040000D4
movs r3, #0
ldrsh r0, [r0, r3]
lsls r0, r0, #9
ldr r1, _080305E4 @ =gUnknown_084FD18C
adds r0, r0, r1
str r0, [r2]
ldr r0, _080305E8 @ =0x06011CE0
str r0, [r2, #4]
ldr r0, _080305EC @ =0x80000100
str r0, [r2, #8]
ldr r0, [r2, #8]
mov r0, sb
ldr r1, [r0]
adds r0, r1, r5
ldrb r0, [r0]
movs r2, #0xf7
lsls r2, r2, #1
adds r1, r1, r2
strb r0, [r1]
_0803059E:
mov r3, sb
ldr r2, [r3]
movs r0, #0xf6
lsls r0, r0, #1
mov sl, r0
adds r0, r2, r0
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #1
bgt _080305B6
b _08030700
_080305B6:
ldr r0, _080305DC @ =gUnknown_086AD2EE
adds r3, r2, r5
movs r1, #0
ldrsb r1, [r3, r1]
lsls r1, r1, #3
adds r0, #2
adds r1, r1, r0
movs r0, #0xf8
lsls r0, r0, #1
adds r4, r2, r0
ldrh r2, [r4]
ldrh r0, [r1]
cmp r0, r2
bls _080305F0
adds r0, r2, #1
strh r0, [r4]
b _080306E6
.align 2, 0
_080305D8: .4byte 0x000001ED
_080305DC: .4byte gUnknown_086AD2EE
_080305E0: .4byte 0x040000D4
_080305E4: .4byte gUnknown_084FD18C
_080305E8: .4byte 0x06011CE0
_080305EC: .4byte 0x80000100
_080305F0:
ldrb r0, [r3]
adds r0, #1
movs r2, #0
strb r0, [r3]
mov r3, sb
ldr r1, [r3]
movs r3, #0xf8
lsls r3, r3, #1
adds r0, r1, r3
strh r2, [r0]
adds r1, r1, r5
movs r0, #0
ldrsb r0, [r1, r0]
cmp r0, r8
blt _0803061A
mov r0, ip
strb r0, [r1]
mov r1, sb
ldr r0, [r1]
add r0, sl
strb r6, [r0]
_0803061A:
mov r2, sb
ldr r0, [r2]
adds r0, r0, r5
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0x12
bne _0803062E
bl BuildSpeciesWeightsForEggMode
_0803062E:
mov r3, sb
ldr r0, [r3]
adds r0, r0, r5
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0x13
bne _0803065E
bl PickSpeciesForEggMode
ldr r0, _08030780 @ =gMain
ldrb r0, [r0, #2]
cmp r0, #3
beq _0803065E
mov r6, sb
ldr r0, [r6]
movs r1, #0xb3
lsls r1, r1, #3
adds r0, r0, r1
movs r2, #0
ldrsh r0, [r0, r2]
movs r1, #1
bl SaveFile_SetPokedexFlags
_0803065E:
ldr r5, _08030784 @ =gCurrentPinballGame
ldr r0, [r5]
ldr r4, _08030788 @ =0x000001ED
adds r0, r0, r4
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0x14
bne _08030674
bl sub_28BFC
_08030674:
ldr r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #8
beq _08030686
cmp r0, #0x1b
bne _08030696
_08030686:
movs r3, #0xf8
lsls r3, r3, #1
adds r0, r1, r3
ldrh r0, [r0]
cmp r0, #0
bne _08030696
bl m4aMPlayAllStop
_08030696:
ldr r0, _08030784 @ =gCurrentPinballGame
ldr r1, [r0]
ldr r6, _08030788 @ =0x000001ED
adds r0, r1, r6
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0xc
bne _080306BA
movs r2, #0xf8
lsls r2, r2, #1
adds r0, r1, r2
ldrh r0, [r0]
cmp r0, #0
bne _080306BA
movs r0, 0x16 @ =MUS_EGG_MODE_START
bl m4aSongNumStart
_080306BA:
ldr r5, _08030784 @ =gCurrentPinballGame
ldr r0, [r5]
ldr r4, _08030788 @ =0x000001ED
adds r0, r0, r4
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0x1d
bne _080306D2
movs r0, #5
bl sub_19B64
_080306D2:
ldr r0, [r5]
adds r0, r0, r4
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0x1c
bne _080306E6
movs r0, 0x92 @=SE_UNKNOWN_0x92
bl m4aSongNumStart
_080306E6:
ldr r2, _0803078C @ =gUnknown_086AD2EE
ldr r1, _08030784 @ =gCurrentPinballGame
ldr r0, [r1]
ldr r3, _08030788 @ =0x000001ED
adds r0, r0, r3
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
lsls r0, r0, #3
adds r0, r0, r2
ldrh r0, [r0]
str r0, [sp]
mov sb, r1
_08030700:
mov r6, sb
ldr r4, [r6]
movs r1, #0xfa
lsls r1, r1, #1
adds r0, r4, r1
movs r2, #0
ldrsh r0, [r0, r2]
movs r1, #0xa
bl __divsi3
adds r1, r4, #0
adds r1, #0x58
ldrh r1, [r1]
subs r0, r0, r1
strh r0, [r7, #2]
movs r3, #0xf6
lsls r3, r3, #1
adds r0, r4, r3
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
ble _080307AC
ldr r6, _08030788 @ =0x000001ED
adds r0, r4, r6
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0x20
bne _08030790
movs r0, #0xf8
lsls r0, r0, #1
adds r1, r4, r0
ldrh r0, [r1]
cmp r0, #0xd0
bls _08030790
adds r1, r0, #0
movs r0, #0x80
lsls r0, r0, #1
subs r0, r0, r1
cmp r0, #0
bge _08030756
adds r0, #0xf
_08030756:
asrs r0, r0, #4
ldr r1, _08030780 @ =gMain
adds r0, #1
lsls r0, r0, #1
ldr r1, [r1, #0x4c]
ands r1, r0
cmp r1, #0
beq _080307AC
movs r1, #0xfb
lsls r1, r1, #1
adds r0, r4, r1
movs r2, #0
ldrsh r0, [r0, r2]
movs r1, #0xa
bl __divsi3
adds r1, r4, #0
adds r1, #0x5a
ldrh r1, [r1]
subs r0, r0, r1
b _080307AE
.align 2, 0
_08030780: .4byte gMain
_08030784: .4byte gCurrentPinballGame
_08030788: .4byte 0x000001ED
_0803078C: .4byte gUnknown_086AD2EE
_08030790:
mov r3, sb
ldr r4, [r3]
movs r6, #0xfb
lsls r6, r6, #1
adds r0, r4, r6
movs r1, #0
ldrsh r0, [r0, r1]
movs r1, #0xa
bl __divsi3
adds r4, #0x5a
ldrh r1, [r4]
subs r0, r0, r1
b _080307AE
_080307AC:
movs r0, #0xc8
_080307AE:
strh r0, [r7, #4]
movs r2, #0
ldr r3, _08030870 @ =gOamBuffer
mov sl, r3
ldr r6, [sp]
lsls r1, r6, #0x10
asrs r1, r1, #0x10
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #2
mov r8, r0
ldr r0, _08030874 @ =0xFFFFFE00
mov ip, r0
_080307C8:
lsls r3, r2, #0x10
asrs r3, r3, #0x10
lsls r0, r3, #3
adds r0, #8
adds r5, r7, r0
ldrh r2, [r5]
lsls r2, r2, #3
ldr r1, _08030870 @ =gOamBuffer
adds r2, r2, r1
lsls r0, r3, #1
adds r0, r0, r3
lsls r0, r0, #1
ldr r6, _08030878 @ =gUnknown_086B4D4E
adds r0, r0, r6
add r0, r8
ldrh r1, [r0]
strh r1, [r2]
adds r0, #2
adds r2, #2
ldrh r1, [r0]
strh r1, [r2]
ldrh r0, [r0, #2]
strh r0, [r2, #2]
ldrh r2, [r5]
lsls r2, r2, #3
ldr r0, _08030870 @ =gOamBuffer
adds r2, r2, r0
ldrh r4, [r2, #2]
lsls r1, r4, #0x17
lsrs r1, r1, #0x17
movs r6, #2
ldrsh r0, [r7, r6]
adds r1, r1, r0
ldr r6, _0803087C @ =0x000001FF
adds r0, r6, #0
ands r1, r0
mov r0, ip
ands r0, r4
orrs r0, r1
strh r0, [r2, #2]
ldrh r1, [r5]
lsls r1, r1, #3
ldr r0, _08030870 @ =gOamBuffer
adds r1, r1, r0
ldrb r0, [r7, #4]
ldrb r2, [r1]
adds r0, r0, r2
strb r0, [r1]
adds r3, #1
lsls r3, r3, #0x10
lsrs r2, r3, #0x10
asrs r3, r3, #0x10
cmp r3, #1
ble _080307C8
ldr r7, _08030880 @ =gMain+0x27A0 @gMain.spriteGroups[51]
ldrh r0, [r7]
cmp r0, #0
beq _080308C2
mov r3, sb
ldr r0, [r3]
adds r0, #0x58
ldrh r1, [r0]
movs r0, #0xc0
subs r0, r0, r1
strh r0, [r7, #2]
ldr r1, [r3]
ldr r6, _08030884 @ =0x00000346
adds r0, r1, r6
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #2
ble _0803088C
ldr r2, _08030888 @ =0xFFFFD860
adds r0, r7, r2
ldrb r0, [r0, #0xf]
cmp r0, #0
beq _0803088C
adds r0, r1, #0
adds r0, #0x5a
ldrh r1, [r0]
movs r0, #0x38
subs r0, r0, r1
b _0803088E
.align 2, 0
_08030870: .4byte gOamBuffer
_08030874: .4byte 0xFFFFFE00
_08030878: .4byte gUnknown_086B4D4E
_0803087C: .4byte 0x000001FF
_08030880: .4byte gMain+0x27A0 @gMain.spriteGroups[51]
_08030884: .4byte 0x00000346
_08030888: .4byte 0xFFFFD860
_0803088C:
movs r0, #0xc8
_0803088E:
strh r0, [r7, #4]
adds r5, r7, #0
adds r5, #8
ldrh r2, [r7, #8]
lsls r2, r2, #3
add r2, sl
movs r3, #2
ldrsh r1, [r5, r3]
movs r6, #2
ldrsh r0, [r7, r6]
adds r1, r1, r0
ldr r3, _080308D4 @ =0x000001FF
adds r0, r3, #0
ands r1, r0
ldrh r3, [r2, #2]
ldr r0, _080308D8 @ =0xFFFFFE00
ands r0, r3
orrs r0, r1
strh r0, [r2, #2]
ldrh r1, [r7, #8]
lsls r1, r1, #3
add r1, sl
ldrb r0, [r7, #4]
ldrb r5, [r5, #4]
adds r0, r0, r5
strb r0, [r1]
_080308C2:
add sp, #4
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
_080308D4: .4byte 0x000001FF
_080308D8: .4byte 0xFFFFFE00
thumb_func_start sub_308DC
sub_308DC: @ 0x080308DC
push {r4, r5, r6, r7, lr}

Binary file not shown.

View File

@ -512,7 +512,7 @@ extern void sub_27D44(void);
//extern ? sub_28404();
//extern ? sub_28544();
extern void sub_28AE0(void);
//extern ? sub_28BFC();
extern void sub_28BFC(void);
extern void sub_28C90(void);
extern void sub_28E2C(void);
extern void sub_28EA0(void);
@ -560,8 +560,8 @@ extern void BuildSpeciesWeightsForCatchEmMode(void);
// asm/rom_3219C.s
//extern ? BuildSpeciesWeightsForEggMode();
//extern ? PickSpeciesForEggMode();
extern void BuildSpeciesWeightsForEggMode(void);
extern void PickSpeciesForEggMode(void);
//extern ? SapphireBoardProcess_3A_326F4();
//extern ? SapphireBoardProcess_3B_3276C();
extern void sub_327C0();

View File

@ -290,14 +290,14 @@ struct PinballGame
/*0x1E5*/ u8 unk1E5;
/*0x1E6*/ u8 unk1E6;
/*0x1E7*/ u8 filler1E7[0x5];
/*0x1EC*/ u8 unk1EC;
/*0x1EC*/ s8 unk1EC;
/*0x1ED*/ s8 unk1ED;
/*0x1EE*/ u8 unk1EE;
/*0x1EE*/ s8 unk1EE;
/*0x1EF*/ u8 unk1EF;
/*0x1F0*/ u16 unk1F0;
/*0x1F2*/ u8 unk1F2;
/*0x1F3*/ u8 unk1F3;
/*0x1F4*/ u16 unk1F4;
/*0x1F4*/ s16 unk1F4;
/*0x1F6*/ s16 unk1F6;
/*0x1F8*/ u8 filler1F8[0x8];
/*0x200*/ u32 unk200;

View File

@ -1,11 +1,166 @@
#include "global.h"
#include "m4a.h"
#include "main.h"
#include "constants/bg_music.h"
void sub_30480(void) {
extern const u8 gUnknown_084FD18C[][0x200];
extern const u16 gUnknown_086AD2EE[][4];
extern const u16 gUnknown_086B4D4E[][2][3];
void sub_30480(void)
{
gCurrentPinballGame->unk1EC = 1;
gCurrentPinballGame->unk1EE = 0;
gCurrentPinballGame->unk1ED = 0;
gCurrentPinballGame->unk1F0 = 0;
gCurrentPinballGame->unk1F4 = 0x820;
gCurrentPinballGame->unk1F4 = 2080;
gCurrentPinballGame->unk1F6 = 700;
}
}
void sub_304C8(void)
{
s16 i;
struct SpriteGroup *group;
struct OamDataSimple *oamSimple;
u16 *dst;
const u16 *src;
s16 sp0;
s16 index;
s16 var1;
s16 var2;
s16 var3;
int var0;
var3 = 0;
var1 = 0;
var2 = 0;
group = &gMain.spriteGroups[52];
sp0 = 0;
switch (gCurrentPinballGame->unk1EC)
{
case 0:
case 1:
break;
case 2:
var3 = 4;
var1 = 4;
var2 = 3;
break;
case 3:
var3 = 8;
var1 = 4;
var2 = 3;
break;
case 4:
var3 = 12;
var1 = 12;
var2 = 5;
break;
case 5:
var3 = 33;
var1 = 0;
var2 = 0;
break;
}
if (gCurrentPinballGame->unk1EE != gCurrentPinballGame->unk1ED)
{
index = gUnknown_086AD2EE[gCurrentPinballGame->unk1ED][3];
DmaCopy16(3, &gUnknown_084FD18C[index], (void *)0x06011CE0, 0x200);
gCurrentPinballGame->unk1EE = gCurrentPinballGame->unk1ED;
}
if (gCurrentPinballGame->unk1EC > 1)
{
if (gUnknown_086AD2EE[gCurrentPinballGame->unk1ED][1] > gCurrentPinballGame->unk1F0)
{
gCurrentPinballGame->unk1F0++;
}
else
{
gCurrentPinballGame->unk1ED++;
gCurrentPinballGame->unk1F0 = 0;
if (gCurrentPinballGame->unk1ED >= var3)
{
gCurrentPinballGame->unk1ED = var1;
gCurrentPinballGame->unk1EC = var2;
}
if (gCurrentPinballGame->unk1ED == 18)
BuildSpeciesWeightsForEggMode();
if (gCurrentPinballGame->unk1ED == 19)
{
PickSpeciesForEggMode();
if (gMain.mainState != STATE_GAME_IDLE)
SaveFile_SetPokedexFlags(gCurrentPinballGame->currentSpecies, 1);
}
if (gCurrentPinballGame->unk1ED == 20)
sub_28BFC();
if ((gCurrentPinballGame->unk1ED == 8 || gCurrentPinballGame->unk1ED == 27) && gCurrentPinballGame->unk1F0 == 0)
m4aMPlayAllStop();
if (gCurrentPinballGame->unk1ED == 12 && gCurrentPinballGame->unk1F0 == 0)
m4aSongNumStart(MUS_EGG_MODE_START);
if (gCurrentPinballGame->unk1ED == 29)
sub_19B64(5);
if (gCurrentPinballGame->unk1ED == 28)
m4aSongNumStart(SE_UNKNOWN_0x92);
}
sp0 = gUnknown_086AD2EE[gCurrentPinballGame->unk1ED][0];
}
group->baseX = gCurrentPinballGame->unk1F4 / 10 - gCurrentPinballGame->unk58;
if (gCurrentPinballGame->unk1EC > 0)
{
if (gCurrentPinballGame->unk1ED == 32 && gCurrentPinballGame->unk1F0 > 208)
{
var0 = (0x100 - gCurrentPinballGame->unk1F0) / 16;
if (gMain.systemFrameCount & ((var0 + 1) * 2))
group->baseY = gCurrentPinballGame->unk1F6 / 10 - gCurrentPinballGame->unk5A;
else
group->baseY = 200;
}
else
{
group->baseY = gCurrentPinballGame->unk1F6 / 10 - gCurrentPinballGame->unk5A;
}
}
else
{
group->baseY = 200;
}
for (i = 0; i < 2; i++)
{
oamSimple = &group->oam[i];
dst = (u16*)&gOamBuffer[oamSimple->oamId];
src = gUnknown_086B4D4E[sp0][i];
*dst++ = *src++;
*dst++ = *src++;
*dst++ = *src++;
gOamBuffer[oamSimple->oamId].x += group->baseX;
gOamBuffer[oamSimple->oamId].y += group->baseY;
}
group = &gMain.spriteGroups[51];
if (group->available)
{
group->baseX = 192 - gCurrentPinballGame->unk58;
if (gCurrentPinballGame->unk346 > 2 && gMain.unkF)
group->baseY = 56 - gCurrentPinballGame->unk5A;
else
group->baseY = 200;
oamSimple = &group->oam[0];
gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX;
gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY;
}
}