pret/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-10-01 22:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match sub_329B0

Browse Source
This commit is contained in:
WhenGryphonsFly
2023-06-16 19:49:08 -05:00
parent 16a924b3b0
commit 16f4dee6bf
3 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/rom_3219C.s
-33
View File
@@ -4,39 +4,6 @@
.text
thumb_func_start sub_329B0
sub_329B0: @ 0x080329B0
push {r4, lr}
ldr r0, _080329E4 @ =gUnknown_020314E0
ldr r2, [r0]
movs r3, #0
movs r0, #0xb4
strh r0, [r2, #0x28]
movs r4, #0xdd
lsls r4, r4, #1
adds r1, r2, r4
strh r0, [r1]
ldr r0, _080329E8 @ =0x0007A120
str r0, [r2, #0x3c]
ldr r0, _080329EC @ =gMain
ldrh r1, [r0, #0x38]
movs r1, #0xce
strh r1, [r0, #0x38]
ldrh r1, [r0, #0x3c]
strh r3, [r0, #0x3c]
ldr r0, _080329F0 @ =0x000005F7
adds r2, r2, r0
movs r0, #1
strb r0, [r2]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080329E4: .4byte gUnknown_020314E0
_080329E8: .4byte 0x0007A120
_080329EC: .4byte gMain
_080329F0: .4byte 0x000005F7
thumb_func_start sub_329F4
sub_329F4: @ 0x080329F4
push {r4, r5, r6, r7, lr}
include/global.h
+11 -4
View File
@@ -86,9 +86,12 @@ struct PinballGame
/*0x014*/ u8 filler14[0x11];
/*0x025*/ s8 unk25;
/*0x026*/ u16 unk26;
/*0x026*/ u8 filler28[0xD];
/*0x028*/ u16 unk28;
/*0x02A*/ u8 filler2A[0xB];
/*0x035*/ s8 area;
/*0x036*/ u8 filler36[0x32];
/*0x036*/ u8 filler36[0x6];
/*0x03C*/ u32 unk3C;
/*0x040*/ u8 filler40[0x28];
/*0x068*/ s16 unk68;
/*0x06A*/ u8 filler6A[0xC1];
/*0x12B*/ s8 unk12B;
@@ -98,7 +101,9 @@ struct PinballGame
/*0x130*/ s16 unk130[8];
/*0x140*/ u8 filler140[0x54];
/*0x194*/ s8 unk194;
/*0x195*/ u8 filler195[0x43];
/*0x195*/ u8 filler195[0x25];
/*0x1BA*/ u16 unk1BA;
/*0x1BC*/ u8 filler1BC[0x1C];
/*0x1D8*/ u16 unk1D8;
/*0x1DA*/ u16 unk1DA;
/*0x1DC*/ u8 filler1DC[0x9];
@@ -115,7 +120,9 @@ struct PinballGame
/*0x59E*/ u16 unk59E; // Previous hatch mode species?
/*0x5A0*/ u8 filler5A0[0x50];
/*0x5F0*/ u16 unk5F0;
/*0x5F2*/ u8 filler5F2[0xE];
/*0x5F2*/ u8 filler5F2[0x5];
/*0x5F7*/ u8 unk5F7;
/*0x5F8*/ u8 filler5F8[0x8];
/*0x600*/ u16 unk600;
/*0x602*/ u8 filler602[0x126];
/*0x728*/ u8 unk728; // TODO: unknown type
src/rom_3219C.c
+10
View File
@@ -504,3 +504,13 @@ void sub_32968(void)
break;
}
}
void sub_329B0(void)
{
gUnknown_020314E0->unk28 = 0xB4;
gUnknown_020314E0->unk1BA = 0xB4;
gUnknown_020314E0->unk3C = 500000;
gMain.blendControl = 0xCE;
gMain.blendBrightness = 0;
gUnknown_020314E0->unk5F7 = 1;
}