mirror of
https://github.com/pret/pokepinballrs.git
synced 2026-03-21 17:24:13 -05:00
Marcus Huderle
parent
26c4cdd660
commit
1b89e8b1e4
370
asm/rom_1D5D8.s
370
asm/rom_1D5D8.s
|
|
@ -3534,373 +3534,3 @@ _0801F294: .4byte gUnknown_086B3A04
|
|||
_0801F298: .4byte gOamBuffer
|
||||
_0801F29C: .4byte 0xFFFFFE00
|
||||
_0801F2A0: .4byte 0x000001FF
|
||||
|
||||
thumb_func_start sub_1F2A4
|
||||
sub_1F2A4: @ 0x0801F2A4
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sb
|
||||
mov r6, r8
|
||||
push {r6, r7}
|
||||
ldr r5, _0801F3E8 @ =gCurrentPinballGame
|
||||
ldr r4, [r5]
|
||||
movs r1, #0xe3
|
||||
lsls r1, r1, #1
|
||||
adds r0, r4, r1
|
||||
movs r2, #0xe4
|
||||
lsls r2, r2, #1
|
||||
mov sb, r2
|
||||
adds r2, r4, r2
|
||||
movs r3, #0
|
||||
ldrsh r1, [r0, r3]
|
||||
ldrh r3, [r2]
|
||||
movs r6, #0
|
||||
ldrsh r0, [r2, r6]
|
||||
cmp r1, r0
|
||||
beq _0801F39A
|
||||
adds r0, r3, #2
|
||||
strh r0, [r2]
|
||||
movs r1, #0
|
||||
ldrsh r0, [r2, r1]
|
||||
movs r1, #0xe
|
||||
bl __divsi3
|
||||
movs r6, #0xe5
|
||||
lsls r6, r6, #1
|
||||
adds r2, r4, r6
|
||||
strh r0, [r2]
|
||||
movs r3, #0xe8
|
||||
lsls r3, r3, #1
|
||||
mov r8, r3
|
||||
adds r1, r4, r3
|
||||
movs r0, #0x50
|
||||
strh r0, [r1]
|
||||
movs r0, #0xec
|
||||
lsls r0, r0, #1
|
||||
mov ip, r0
|
||||
adds r0, r4, r0
|
||||
subs r3, #0xd0
|
||||
strh r3, [r0]
|
||||
movs r7, #0xed
|
||||
lsls r7, r7, #1
|
||||
adds r0, r4, r7
|
||||
strh r3, [r0]
|
||||
movs r1, #0
|
||||
ldrsh r0, [r2, r1]
|
||||
cmp r0, #0xb
|
||||
bne _0801F314
|
||||
movs r2, #0xe7
|
||||
lsls r2, r2, #1
|
||||
adds r1, r4, r2
|
||||
movs r0, #0x78
|
||||
strh r0, [r1]
|
||||
_0801F314:
|
||||
ldr r2, [r5]
|
||||
adds r1, r2, r6
|
||||
movs r4, #0
|
||||
ldrsh r0, [r1, r4]
|
||||
cmp r0, #0xb
|
||||
ble _0801F336
|
||||
movs r0, #0xc
|
||||
strh r0, [r1]
|
||||
mov r6, r8
|
||||
adds r1, r2, r6
|
||||
movs r0, #0x78
|
||||
strh r0, [r1]
|
||||
mov r1, ip
|
||||
adds r0, r2, r1
|
||||
strh r3, [r0]
|
||||
adds r0, r2, r7
|
||||
strh r3, [r0]
|
||||
_0801F336:
|
||||
ldr r0, [r5]
|
||||
mov r3, sb
|
||||
adds r2, r0, r3
|
||||
movs r4, #0
|
||||
ldrsh r0, [r2, r4]
|
||||
cmp r0, #0xa7
|
||||
bgt _0801F368
|
||||
ldrh r0, [r2]
|
||||
movs r1, #7
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0801F368
|
||||
movs r5, #0
|
||||
ldrsh r0, [r2, r5]
|
||||
movs r1, #0x15
|
||||
bl __divsi3
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #8
|
||||
movs r6, #0xa8
|
||||
lsls r6, r6, #0x10
|
||||
adds r0, r0, r6
|
||||
lsrs r0, r0, #0x10
|
||||
bl m4aSongNumStart
|
||||
_0801F368:
|
||||
ldr r4, _0801F3E8 @ =gCurrentPinballGame
|
||||
ldr r1, [r4]
|
||||
movs r2, #0xe3
|
||||
lsls r2, r2, #1
|
||||
adds r0, r1, r2
|
||||
movs r3, #0xe4
|
||||
lsls r3, r3, #1
|
||||
adds r2, r1, r3
|
||||
ldrh r3, [r0]
|
||||
movs r5, #0
|
||||
ldrsh r1, [r0, r5]
|
||||
movs r6, #0
|
||||
ldrsh r0, [r2, r6]
|
||||
cmp r1, r0
|
||||
bgt _0801F39A
|
||||
strh r3, [r2]
|
||||
cmp r1, #0xa7
|
||||
ble _0801F39A
|
||||
ldr r0, _0801F3EC @ =gMPlayInfo_SE1
|
||||
ldr r1, _0801F3F0 @ =gUnknown_0869F2A0
|
||||
bl MPlayStart
|
||||
ldr r1, [r4]
|
||||
ldr r0, _0801F3F4 @ =0x00000BB8
|
||||
str r0, [r1, #0x3c]
|
||||
_0801F39A:
|
||||
ldr r5, _0801F3E8 @ =gCurrentPinballGame
|
||||
ldr r0, [r5]
|
||||
ldr r2, _0801F3F8 @ =0x00000616
|
||||
adds r1, r0, r2
|
||||
ldrh r0, [r1]
|
||||
cmp r0, #0
|
||||
beq _0801F3AC
|
||||
subs r0, #1
|
||||
strh r0, [r1]
|
||||
_0801F3AC:
|
||||
ldr r4, [r5]
|
||||
ldr r3, _0801F3FC @ =0x00000614
|
||||
adds r2, r4, r3
|
||||
ldrh r0, [r2]
|
||||
movs r6, #0
|
||||
ldrsh r1, [r2, r6]
|
||||
cmp r1, #0
|
||||
ble _0801F478
|
||||
subs r0, #3
|
||||
movs r3, #0
|
||||
strh r0, [r2]
|
||||
lsls r0, r0, #0x10
|
||||
cmp r0, #0
|
||||
bge _0801F3CA
|
||||
strh r3, [r2]
|
||||
_0801F3CA:
|
||||
ldr r0, [r5]
|
||||
movs r2, #0xc3
|
||||
lsls r2, r2, #3
|
||||
adds r1, r0, r2
|
||||
ldrh r2, [r1]
|
||||
ldr r4, _0801F400 @ =0x0000061A
|
||||
adds r0, r0, r4
|
||||
movs r6, #0
|
||||
ldrsh r0, [r0, r6]
|
||||
subs r0, #1
|
||||
cmp r2, r0
|
||||
bge _0801F404
|
||||
adds r0, r2, #1
|
||||
strh r0, [r1]
|
||||
b _0801F44E
|
||||
.align 2, 0
|
||||
_0801F3E8: .4byte gCurrentPinballGame
|
||||
_0801F3EC: .4byte gMPlayInfo_SE1
|
||||
_0801F3F0: .4byte gUnknown_0869F2A0
|
||||
_0801F3F4: .4byte 0x00000BB8
|
||||
_0801F3F8: .4byte 0x00000616
|
||||
_0801F3FC: .4byte 0x00000614
|
||||
_0801F400: .4byte 0x0000061A
|
||||
_0801F404:
|
||||
strh r3, [r1]
|
||||
ldr r0, _0801F464 @ =gUnknown_02032FB0
|
||||
ldr r1, _0801F468 @ =gUnknown_0869F240
|
||||
bl MPlayStart
|
||||
ldr r2, [r5]
|
||||
movs r0, #0x64
|
||||
str r0, [r2, #0x3c]
|
||||
movs r1, #0xe5
|
||||
lsls r1, r1, #1
|
||||
adds r0, r2, r1
|
||||
movs r3, #0
|
||||
ldrsh r0, [r0, r3]
|
||||
cmp r0, #0xb
|
||||
bgt _0801F44E
|
||||
ldr r4, _0801F46C @ =0x0000061C
|
||||
adds r0, r2, r4
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
bne _0801F44E
|
||||
movs r5, #0xe8
|
||||
lsls r5, r5, #1
|
||||
adds r1, r2, r5
|
||||
movs r0, #0x50
|
||||
strh r0, [r1]
|
||||
movs r6, #0xec
|
||||
lsls r6, r6, #1
|
||||
adds r0, r2, r6
|
||||
movs r1, #0x80
|
||||
lsls r1, r1, #1
|
||||
strh r1, [r0]
|
||||
movs r3, #0xed
|
||||
lsls r3, r3, #1
|
||||
adds r0, r2, r3
|
||||
strh r1, [r0]
|
||||
_0801F44E:
|
||||
ldr r5, _0801F470 @ =gCurrentPinballGame
|
||||
ldr r4, [r5]
|
||||
ldr r6, _0801F474 @ =0x00000614
|
||||
adds r0, r4, r6
|
||||
movs r2, #0
|
||||
ldrsh r1, [r0, r2]
|
||||
movs r0, #0xe1
|
||||
lsls r0, r0, #1
|
||||
subs r0, r0, r1
|
||||
b _0801F508
|
||||
.align 2, 0
|
||||
_0801F464: .4byte gUnknown_02032FB0
|
||||
_0801F468: .4byte gUnknown_0869F240
|
||||
_0801F46C: .4byte 0x0000061C
|
||||
_0801F470: .4byte gCurrentPinballGame
|
||||
_0801F474: .4byte 0x00000614
|
||||
_0801F478:
|
||||
cmp r1, #0
|
||||
bge _0801F55C
|
||||
adds r0, #3
|
||||
movs r3, #0
|
||||
strh r0, [r2]
|
||||
lsls r0, r0, #0x10
|
||||
cmp r0, #0
|
||||
ble _0801F48A
|
||||
strh r3, [r2]
|
||||
_0801F48A:
|
||||
ldr r0, [r5]
|
||||
movs r2, #0xc3
|
||||
lsls r2, r2, #3
|
||||
adds r1, r0, r2
|
||||
ldrh r2, [r1]
|
||||
ldr r4, _0801F4A8 @ =0x0000061A
|
||||
adds r0, r0, r4
|
||||
movs r6, #0
|
||||
ldrsh r0, [r0, r6]
|
||||
subs r0, #1
|
||||
cmp r2, r0
|
||||
bge _0801F4AC
|
||||
adds r0, r2, #1
|
||||
strh r0, [r1]
|
||||
b _0801F4F6
|
||||
.align 2, 0
|
||||
_0801F4A8: .4byte 0x0000061A
|
||||
_0801F4AC:
|
||||
strh r3, [r1]
|
||||
ldr r0, _0801F540 @ =gUnknown_02032FB0
|
||||
ldr r1, _0801F544 @ =gUnknown_0869F240
|
||||
bl MPlayStart
|
||||
ldr r2, [r5]
|
||||
movs r0, #0x64
|
||||
str r0, [r2, #0x3c]
|
||||
movs r1, #0xe5
|
||||
lsls r1, r1, #1
|
||||
adds r0, r2, r1
|
||||
movs r3, #0
|
||||
ldrsh r0, [r0, r3]
|
||||
cmp r0, #0xb
|
||||
bgt _0801F4F6
|
||||
ldr r4, _0801F548 @ =0x0000061C
|
||||
adds r0, r2, r4
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
bne _0801F4F6
|
||||
movs r5, #0xe8
|
||||
lsls r5, r5, #1
|
||||
adds r1, r2, r5
|
||||
movs r0, #0x50
|
||||
strh r0, [r1]
|
||||
movs r6, #0xec
|
||||
lsls r6, r6, #1
|
||||
adds r0, r2, r6
|
||||
movs r1, #0x80
|
||||
lsls r1, r1, #1
|
||||
strh r1, [r0]
|
||||
movs r3, #0xed
|
||||
lsls r3, r3, #1
|
||||
adds r0, r2, r3
|
||||
strh r1, [r0]
|
||||
_0801F4F6:
|
||||
ldr r5, _0801F54C @ =gCurrentPinballGame
|
||||
ldr r4, [r5]
|
||||
ldr r6, _0801F550 @ =0x00000614
|
||||
adds r0, r4, r6
|
||||
movs r1, #0
|
||||
ldrsh r0, [r0, r1]
|
||||
movs r2, #0xe1
|
||||
lsls r2, r2, #1
|
||||
adds r0, r0, r2
|
||||
_0801F508:
|
||||
movs r1, #0xa
|
||||
bl __divsi3
|
||||
ldr r1, _0801F554 @ =0x0000061A
|
||||
adds r4, r4, r1
|
||||
strh r0, [r4]
|
||||
lsls r0, r0, #0x10
|
||||
asrs r0, r0, #0x10
|
||||
cmp r0, #4
|
||||
bgt _0801F520
|
||||
movs r0, #5
|
||||
strh r0, [r4]
|
||||
_0801F520:
|
||||
ldr r4, [r5]
|
||||
movs r3, #0xc3
|
||||
lsls r3, r3, #3
|
||||
adds r0, r4, r3
|
||||
ldrh r0, [r0]
|
||||
lsls r0, r0, #4
|
||||
adds r1, r4, r1
|
||||
movs r5, #0
|
||||
ldrsh r1, [r1, r5]
|
||||
bl __divsi3
|
||||
ldr r6, _0801F558 @ =0x000001E5
|
||||
adds r1, r4, r6
|
||||
strb r0, [r1]
|
||||
b _0801F58A
|
||||
.align 2, 0
|
||||
_0801F540: .4byte gUnknown_02032FB0
|
||||
_0801F544: .4byte gUnknown_0869F240
|
||||
_0801F548: .4byte 0x0000061C
|
||||
_0801F54C: .4byte gCurrentPinballGame
|
||||
_0801F550: .4byte 0x00000614
|
||||
_0801F554: .4byte 0x0000061A
|
||||
_0801F558: .4byte 0x000001E5
|
||||
_0801F55C:
|
||||
ldr r0, _0801F598 @ =0x000001E5
|
||||
adds r5, r4, r0
|
||||
movs r0, #0
|
||||
ldrsb r0, [r5, r0]
|
||||
cmp r0, #0
|
||||
ble _0801F58A
|
||||
movs r1, #0xc3
|
||||
lsls r1, r1, #3
|
||||
adds r4, r4, r1
|
||||
ldrh r0, [r4]
|
||||
adds r0, #1
|
||||
strh r0, [r4]
|
||||
ldrh r0, [r4]
|
||||
movs r1, #0x28
|
||||
bl __umodsi3
|
||||
strh r0, [r4]
|
||||
ldrh r0, [r4]
|
||||
lsls r0, r0, #4
|
||||
movs r1, #0x28
|
||||
bl __divsi3
|
||||
strb r0, [r5]
|
||||
_0801F58A:
|
||||
pop {r3, r4}
|
||||
mov r8, r3
|
||||
mov sb, r4
|
||||
pop {r4, r5, r6, r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0801F598: .4byte 0x000001E5
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -280,8 +280,8 @@ struct PinballGame
|
|||
/*0x1C2*/ s8 unk1C2;
|
||||
/*0x1C3*/ u8 filler1C3[0x1];
|
||||
/*0x1C4*/ u16 unk1C4;
|
||||
/*0x1C6*/ u16 unk1C6;
|
||||
/*0x1C8*/ u16 unk1C8;
|
||||
/*0x1C6*/ s16 unk1C6;
|
||||
/*0x1C8*/ s16 unk1C8;
|
||||
/*0x1CA*/ s16 unk1CA;
|
||||
/*0x1CC*/ s16 unk1CC;
|
||||
/*0x1CE*/ u16 unk1CE;
|
||||
|
|
@ -688,8 +688,10 @@ struct PinballGame
|
|||
/*0x604*/ u16 unk604;
|
||||
/*0x606*/ u16 unk606;
|
||||
/*0x608*/ u8 filler608[0xC];
|
||||
/*0x614*/ u16 unk614;
|
||||
/*0x616*/ u8 filler616[0x6];
|
||||
/*0x614*/ s16 unk614;
|
||||
/*0x616*/ u16 unk616;
|
||||
/*0x618*/ u16 unk618;
|
||||
/*0x61A*/ s16 unk61A;
|
||||
/*0x61C*/ s8 unk61C;
|
||||
/*0x61D*/ u8 filler61D[0x7];
|
||||
/*0x624*/ s8 unk624;
|
||||
|
|
|
|||
|
|
@ -23,5 +23,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
|||
extern struct MusicPlayerInfo gMPlayInfo_SE1;
|
||||
extern struct MusicPlayerInfo gMPlayInfo_SE2;
|
||||
extern struct SoundInfo gSoundInfo;
|
||||
extern struct MusicPlayerInfo gUnknown_02032FB0;
|
||||
|
||||
#endif //GUARD_M4A_H
|
||||
|
|
|
|||
115
src/rom_201B8.c
115
src/rom_201B8.c
|
|
@ -15,6 +15,121 @@ extern const u8 gUnknown_083C562C[][0x100];
|
|||
extern const u8 gUnknown_083C542C[][0x80];
|
||||
extern const u8 gUnknown_084FA48C[][0x120];
|
||||
|
||||
extern struct SongHeader gUnknown_0869F2A0;
|
||||
extern struct SongHeader gUnknown_0869F240;
|
||||
|
||||
|
||||
void sub_1F2A4(void)
|
||||
{
|
||||
if (gCurrentPinballGame->unk1C6 != gCurrentPinballGame->unk1C8)
|
||||
{
|
||||
gCurrentPinballGame->unk1C8 += 2;
|
||||
gCurrentPinballGame->unk1CA = gCurrentPinballGame->unk1C8 / 14;
|
||||
gCurrentPinballGame->unk1D0 = 80;
|
||||
gCurrentPinballGame->unk1D8 = 256;
|
||||
gCurrentPinballGame->unk1DA = 256;
|
||||
if (gCurrentPinballGame->unk1CA == 11)
|
||||
gCurrentPinballGame->unk1CE = 120;
|
||||
|
||||
if (gCurrentPinballGame->unk1CA > 11)
|
||||
{
|
||||
gCurrentPinballGame->unk1CA = 12;
|
||||
gCurrentPinballGame->unk1D0 = 120;
|
||||
gCurrentPinballGame->unk1D8 = 256;
|
||||
gCurrentPinballGame->unk1DA = 256;
|
||||
}
|
||||
|
||||
if (gCurrentPinballGame->unk1C8 < 168 && gCurrentPinballGame->unk1C8 % 8 == 0)
|
||||
{
|
||||
s8 offset = gCurrentPinballGame->unk1C8 / 21;
|
||||
m4aSongNumStart(SE_UNKNOWN_0xA8 + offset);
|
||||
}
|
||||
|
||||
if (gCurrentPinballGame->unk1C6 <= gCurrentPinballGame->unk1C8)
|
||||
{
|
||||
gCurrentPinballGame->unk1C8 = gCurrentPinballGame->unk1C6;
|
||||
if (gCurrentPinballGame->unk1C8 >= 168)
|
||||
{
|
||||
MPlayStart(&gMPlayInfo_SE1, &gUnknown_0869F2A0);
|
||||
gCurrentPinballGame->unk3C = 3000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (gCurrentPinballGame->unk616)
|
||||
gCurrentPinballGame->unk616--;
|
||||
|
||||
if (gCurrentPinballGame->unk614 > 0)
|
||||
{
|
||||
gCurrentPinballGame->unk614 -= 3;
|
||||
if (gCurrentPinballGame->unk614 < 0)
|
||||
gCurrentPinballGame->unk614 = 0;
|
||||
|
||||
if (gCurrentPinballGame->unk618 < gCurrentPinballGame->unk61A - 1)
|
||||
{
|
||||
gCurrentPinballGame->unk618++;
|
||||
}
|
||||
else
|
||||
{
|
||||
gCurrentPinballGame->unk618 = 0;
|
||||
MPlayStart(&gUnknown_02032FB0, &gUnknown_0869F240);
|
||||
gCurrentPinballGame->unk3C = 100;
|
||||
if (gCurrentPinballGame->unk1CA < 12 && gCurrentPinballGame->unk61C == 0)
|
||||
{
|
||||
gCurrentPinballGame->unk1D0 = 80;
|
||||
gCurrentPinballGame->unk1D8 = 256;
|
||||
gCurrentPinballGame->unk1DA = 256;
|
||||
}
|
||||
}
|
||||
|
||||
gCurrentPinballGame->unk61A = (450 - gCurrentPinballGame->unk614) / 10;
|
||||
if (gCurrentPinballGame->unk61A < 5)
|
||||
gCurrentPinballGame->unk61A = 5;
|
||||
|
||||
gCurrentPinballGame->unk1E5 = (gCurrentPinballGame->unk618 * 16) / gCurrentPinballGame->unk61A;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gCurrentPinballGame->unk614 < 0)
|
||||
{
|
||||
gCurrentPinballGame->unk614 += 3;
|
||||
if (gCurrentPinballGame->unk614 > 0)
|
||||
gCurrentPinballGame->unk614 = 0;
|
||||
|
||||
if (gCurrentPinballGame->unk618 < gCurrentPinballGame->unk61A - 1)
|
||||
{
|
||||
gCurrentPinballGame->unk618++;
|
||||
}
|
||||
else
|
||||
{
|
||||
gCurrentPinballGame->unk618 = 0;
|
||||
MPlayStart(&gUnknown_02032FB0, &gUnknown_0869F240);
|
||||
gCurrentPinballGame->unk3C = 100;
|
||||
if (gCurrentPinballGame->unk1CA < 12 && gCurrentPinballGame->unk61C == 0)
|
||||
{
|
||||
gCurrentPinballGame->unk1D0 = 80;
|
||||
gCurrentPinballGame->unk1D8 = 256;
|
||||
gCurrentPinballGame->unk1DA = 256;
|
||||
}
|
||||
}
|
||||
|
||||
gCurrentPinballGame->unk61A = (450 + gCurrentPinballGame->unk614) / 10;
|
||||
if (gCurrentPinballGame->unk61A < 5)
|
||||
gCurrentPinballGame->unk61A = 5;
|
||||
|
||||
gCurrentPinballGame->unk1E5 = (gCurrentPinballGame->unk618 * 16) / gCurrentPinballGame->unk61A;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gCurrentPinballGame->unk1E5 > 0)
|
||||
{
|
||||
gCurrentPinballGame->unk618++;
|
||||
gCurrentPinballGame->unk618 %= 40;
|
||||
gCurrentPinballGame->unk1E5 = (gCurrentPinballGame->unk618 * 16) / 40;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sub_1F59C(void)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user