mirror of
https://github.com/pret/pokepinballrs.git
synced 2026-03-21 17:24:13 -05:00
Decompile sub_12BF8 (#96)
* Decompile sub_12BF8 * Fix up types and DmaCopy calls * formatting cleanup --------- Co-authored-by: Marcus Huderle <huderlem@gmail.com>
This commit is contained in:
ColinT
GitHub
parent
5c35766f7f
commit
09403d1e89
910
asm/rom_11B9C.s
910
asm/rom_11B9C.s
|
|
@ -5,916 +5,6 @@
|
|||
.syntax unified
|
||||
|
||||
.text
|
||||
.section .text11C14
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_12BF8
|
||||
sub_12BF8: @ 0x08012BF8
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sl
|
||||
mov r6, sb
|
||||
mov r5, r8
|
||||
push {r5, r6, r7}
|
||||
ldr r3, _08012C30 @ =gCurrentPinballGame
|
||||
ldr r0, [r3]
|
||||
ldr r1, _08012C34 @ =0x00001330
|
||||
adds r2, r0, r1
|
||||
ldr r4, _08012C38 @ =0x00001334
|
||||
adds r1, r0, r4
|
||||
str r1, [r2]
|
||||
ldr r6, _08012C3C @ =0x0000132C
|
||||
adds r0, r0, r6
|
||||
str r1, [r0]
|
||||
mov r8, r1
|
||||
ldr r1, _08012C40 @ =gMain
|
||||
ldrb r0, [r1, #4]
|
||||
subs r0, #3
|
||||
mov sl, r3
|
||||
cmp r0, #4
|
||||
bhi _08012CA0
|
||||
lsls r0, r0, #2
|
||||
ldr r1, _08012C44 @ =_08012C48
|
||||
adds r0, r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_08012C30: .4byte gCurrentPinballGame
|
||||
_08012C34: .4byte 0x00001330
|
||||
_08012C38: .4byte 0x00001334
|
||||
_08012C3C: .4byte 0x0000132C
|
||||
_08012C40: .4byte gMain
|
||||
_08012C44: .4byte _08012C48
|
||||
_08012C48: @ jump table
|
||||
.4byte _08012C5C @ case 0
|
||||
.4byte _08012C78 @ case 1
|
||||
.4byte _08012C78 @ case 2
|
||||
.4byte _08012C88 @ case 3
|
||||
.4byte _08012C78 @ case 4
|
||||
_08012C5C:
|
||||
movs r0, #2
|
||||
mov r1, r8
|
||||
strb r0, [r1, #1]
|
||||
ldr r0, _08012C70 @ =gUnknown_02031590
|
||||
ldrb r1, [r0, #0x16]
|
||||
movs r0, #0xb8
|
||||
muls r1, r0, r1
|
||||
ldr r0, _08012C74 @ =gUnknown_0200B3B8
|
||||
adds r6, r1, r0
|
||||
b _08012CAC
|
||||
.align 2, 0
|
||||
_08012C70: .4byte gUnknown_02031590
|
||||
_08012C74: .4byte gUnknown_0200B3B8
|
||||
_08012C78:
|
||||
movs r0, #1
|
||||
mov r2, r8
|
||||
strb r0, [r2, #1]
|
||||
ldr r3, _08012C84 @ =gMain
|
||||
ldr r0, [r3, #0x44]
|
||||
b _08012CAA
|
||||
.align 2, 0
|
||||
_08012C84: .4byte gMain
|
||||
_08012C88:
|
||||
mov r4, r8
|
||||
movs r0, #1
|
||||
ldrsb r0, [r4, r0]
|
||||
cmp r0, #2
|
||||
ble _08012C96
|
||||
movs r0, #2
|
||||
strb r0, [r4, #1]
|
||||
_08012C96:
|
||||
ldr r6, _08012C9C @ =gMain
|
||||
ldr r0, [r6, #0x44]
|
||||
b _08012CAA
|
||||
.align 2, 0
|
||||
_08012C9C: .4byte gMain
|
||||
_08012CA0:
|
||||
movs r0, #3
|
||||
mov r1, r8
|
||||
strb r0, [r1, #1]
|
||||
ldr r2, _08012DC0 @ =gMain
|
||||
ldr r0, [r2, #0x44]
|
||||
_08012CAA:
|
||||
ldr r6, [r0]
|
||||
_08012CAC:
|
||||
mov r3, sl
|
||||
ldr r1, [r3]
|
||||
ldr r4, _08012DC4 @ =0x0000132C
|
||||
adds r0, r1, r4
|
||||
ldr r0, [r0]
|
||||
ldrh r0, [r0, #0xa]
|
||||
lsrs r5, r0, #0xc
|
||||
ldr r2, _08012DC8 @ =0x040000D4
|
||||
ldr r0, _08012DCC @ =0x000005F6
|
||||
adds r1, r1, r0
|
||||
ldrb r1, [r1]
|
||||
lsls r1, r1, #0x18
|
||||
asrs r1, r1, #0x18
|
||||
lsls r0, r1, #4
|
||||
adds r0, r0, r1
|
||||
adds r0, r5, r0
|
||||
lsls r0, r0, #7
|
||||
ldr r1, _08012DD0 @ =gUnknown_083BB16C
|
||||
adds r0, r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _08012DD4 @ =0x06010400
|
||||
str r0, [r2, #4]
|
||||
ldr r0, _08012DD8 @ =0x80000040
|
||||
str r0, [r2, #8]
|
||||
ldr r0, [r2, #8]
|
||||
mov r2, r8
|
||||
movs r3, #0x28
|
||||
ldrsh r1, [r2, r3]
|
||||
lsrs r0, r1, #0x1f
|
||||
adds r1, r1, r0
|
||||
asrs r1, r1, #1
|
||||
strh r1, [r2, #0x10]
|
||||
movs r4, #0x2a
|
||||
ldrsh r0, [r2, r4]
|
||||
lsrs r2, r0, #0x1f
|
||||
adds r0, r0, r2
|
||||
asrs r0, r0, #1
|
||||
mov r2, r8
|
||||
strh r0, [r2, #0x12]
|
||||
mov r3, sl
|
||||
ldr r2, [r3]
|
||||
adds r0, r2, #0
|
||||
adds r0, #0x4c
|
||||
ldrh r0, [r0]
|
||||
adds r0, #7
|
||||
subs r1, r1, r0
|
||||
ldr r4, _08012DDC @ =0x000002AA
|
||||
adds r0, r2, r4
|
||||
ldrh r0, [r0]
|
||||
subs r1, r1, r0
|
||||
strh r1, [r6, #2]
|
||||
adds r0, r2, #0
|
||||
adds r0, #0x4e
|
||||
ldrh r0, [r0]
|
||||
adds r0, #7
|
||||
mov r1, r8
|
||||
ldrh r4, [r1, #0x12]
|
||||
subs r4, r4, r0
|
||||
ldr r3, _08012DE0 @ =0x000005FC
|
||||
adds r0, r2, r3
|
||||
ldrh r0, [r0]
|
||||
subs r4, r4, r0
|
||||
adds r0, r2, #0
|
||||
adds r0, #0xe6
|
||||
ldrh r0, [r0]
|
||||
subs r4, r4, r0
|
||||
movs r1, #0xab
|
||||
lsls r1, r1, #2
|
||||
adds r0, r2, r1
|
||||
ldrh r0, [r0]
|
||||
subs r4, r4, r0
|
||||
movs r3, #0xe3
|
||||
lsls r3, r3, #2
|
||||
adds r0, r2, r3
|
||||
movs r1, #0
|
||||
ldrsh r0, [r0, r1]
|
||||
movs r1, #0xa
|
||||
bl __divsi3
|
||||
subs r4, r4, r0
|
||||
strh r4, [r6, #4]
|
||||
lsls r4, r4, #0x10
|
||||
asrs r4, r4, #0x10
|
||||
movs r0, #0x3c
|
||||
rsbs r0, r0, #0
|
||||
cmp r4, r0
|
||||
bge _08012D5E
|
||||
ldr r0, _08012DE4 @ =0x0000FFC4
|
||||
strh r0, [r6, #4]
|
||||
_08012D5E:
|
||||
movs r2, #4
|
||||
ldrsh r0, [r6, r2]
|
||||
cmp r0, #0xb4
|
||||
ble _08012D6A
|
||||
movs r0, #0xb4
|
||||
strh r0, [r6, #4]
|
||||
_08012D6A:
|
||||
ldrh r0, [r6, #2]
|
||||
mov r3, r8
|
||||
strh r0, [r3, #0x24]
|
||||
ldrh r0, [r6, #4]
|
||||
strh r0, [r3, #0x26]
|
||||
adds r7, r6, #0
|
||||
adds r7, #8
|
||||
ldrh r0, [r6, #8]
|
||||
lsls r0, r0, #3
|
||||
ldr r3, _08012DE8 @ =gOamBuffer
|
||||
adds r4, r0, r3
|
||||
movs r0, #3
|
||||
mov r2, r8
|
||||
ldrb r1, [r2, #1]
|
||||
ands r1, r0
|
||||
lsls r1, r1, #2
|
||||
ldrb r2, [r4, #5]
|
||||
movs r0, #0xd
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #5]
|
||||
movs r0, #2
|
||||
ldrsh r1, [r7, r0]
|
||||
movs r2, #2
|
||||
ldrsh r0, [r6, r2]
|
||||
adds r1, r1, r0
|
||||
ldr r2, _08012DEC @ =0x000001FF
|
||||
adds r0, r2, #0
|
||||
ands r1, r0
|
||||
ldrh r2, [r4, #2]
|
||||
ldr r0, _08012DF0 @ =0xFFFFFE00
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strh r0, [r4, #2]
|
||||
mov r1, r8
|
||||
movs r0, #0
|
||||
ldrsb r0, [r1, r0]
|
||||
mov sb, r3
|
||||
cmp r0, #0
|
||||
beq _08012DF4
|
||||
movs r0, #0xc8
|
||||
b _08012DFA
|
||||
.align 2, 0
|
||||
_08012DC0: .4byte gMain
|
||||
_08012DC4: .4byte 0x0000132C
|
||||
_08012DC8: .4byte 0x040000D4
|
||||
_08012DCC: .4byte 0x000005F6
|
||||
_08012DD0: .4byte gUnknown_083BB16C
|
||||
_08012DD4: .4byte 0x06010400
|
||||
_08012DD8: .4byte 0x80000040
|
||||
_08012DDC: .4byte 0x000002AA
|
||||
_08012DE0: .4byte 0x000005FC
|
||||
_08012DE4: .4byte 0x0000FFC4
|
||||
_08012DE8: .4byte gOamBuffer
|
||||
_08012DEC: .4byte 0x000001FF
|
||||
_08012DF0: .4byte 0xFFFFFE00
|
||||
_08012DF4:
|
||||
ldrb r0, [r6, #4]
|
||||
ldrb r7, [r7, #4]
|
||||
adds r0, r0, r7
|
||||
_08012DFA:
|
||||
strb r0, [r4]
|
||||
mov r2, sl
|
||||
ldr r3, [r2]
|
||||
movs r4, #0xe2
|
||||
lsls r4, r4, #2
|
||||
adds r0, r3, r4
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
bne _08012E12
|
||||
b _0801309C
|
||||
_08012E12:
|
||||
ldr r6, _08012F84 @ =gMain
|
||||
ldr r0, [r6, #0x44]
|
||||
ldr r6, [r0, #4]
|
||||
ldrh r0, [r6]
|
||||
cmp r0, #0
|
||||
beq _08012E5E
|
||||
mov r1, r8
|
||||
ldrh r0, [r1, #0x24]
|
||||
subs r0, #8
|
||||
strh r0, [r6, #2]
|
||||
ldrh r0, [r1, #0x26]
|
||||
subs r0, #8
|
||||
strh r0, [r6, #4]
|
||||
adds r7, r6, #0
|
||||
adds r7, #8
|
||||
ldrh r2, [r6, #8]
|
||||
lsls r2, r2, #3
|
||||
add r2, sb
|
||||
movs r3, #2
|
||||
ldrsh r1, [r7, r3]
|
||||
movs r4, #2
|
||||
ldrsh r0, [r6, r4]
|
||||
adds r1, r1, r0
|
||||
ldr r3, _08012F88 @ =0x000001FF
|
||||
adds r0, r3, #0
|
||||
ands r1, r0
|
||||
ldrh r3, [r2, #2]
|
||||
ldr r0, _08012F8C @ =0xFFFFFE00
|
||||
ands r0, r3
|
||||
orrs r0, r1
|
||||
strh r0, [r2, #2]
|
||||
ldrh r1, [r6, #8]
|
||||
lsls r1, r1, #3
|
||||
add r1, sb
|
||||
ldrb r0, [r6, #4]
|
||||
ldrb r7, [r7, #4]
|
||||
adds r0, r0, r7
|
||||
strb r0, [r1]
|
||||
_08012E5E:
|
||||
mov r4, sl
|
||||
ldr r2, [r4]
|
||||
movs r1, #0xe2
|
||||
lsls r1, r1, #2
|
||||
adds r0, r2, r1
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
cmp r0, #1
|
||||
beq _08012E78
|
||||
cmp r0, #3
|
||||
beq _08012E78
|
||||
b _08012FBC
|
||||
_08012E78:
|
||||
ldr r4, _08012F90 @ =0x00000392
|
||||
adds r0, r2, r4
|
||||
ldrh r1, [r0]
|
||||
cmp r1, #0
|
||||
bne _08012E8E
|
||||
movs r0, #1
|
||||
strb r0, [r2, #0x1f]
|
||||
mov r2, r8
|
||||
strh r1, [r2, #0x30]
|
||||
strh r1, [r2, #0x32]
|
||||
strh r1, [r2, #6]
|
||||
_08012E8E:
|
||||
mov r3, sl
|
||||
ldr r0, [r3]
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #0x96
|
||||
bne _08012E9E
|
||||
movs r0, #1
|
||||
strh r0, [r6]
|
||||
_08012E9E:
|
||||
mov r1, sl
|
||||
ldr r0, [r1]
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #0x9a
|
||||
bne _08012EB0
|
||||
movs r0, SE_UNKNOWN_0xF9
|
||||
bl m4aSongNumStart
|
||||
_08012EB0:
|
||||
mov r2, sl
|
||||
ldr r0, [r2]
|
||||
adds r1, r0, r4
|
||||
ldrh r0, [r1]
|
||||
cmp r0, #0x95
|
||||
bls _08012EEA
|
||||
subs r0, #0x96
|
||||
movs r1, #0x42
|
||||
bl __modsi3
|
||||
movs r1, #6
|
||||
bl __divsi3
|
||||
lsls r0, r0, #0x10
|
||||
ldr r2, _08012F94 @ =0x040000D4
|
||||
lsrs r5, r0, #0x10
|
||||
asrs r0, r0, #7
|
||||
ldr r1, _08012F98 @ =gUnknown_083BF16C
|
||||
adds r0, r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _08012F9C @ =0x06010720
|
||||
str r0, [r2, #4]
|
||||
ldr r0, _08012FA0 @ =0x80000100
|
||||
str r0, [r2, #8]
|
||||
ldr r0, [r2, #8]
|
||||
mov r3, r8
|
||||
ldrh r0, [r3, #6]
|
||||
subs r0, #0x28
|
||||
strh r0, [r3, #6]
|
||||
_08012EEA:
|
||||
ldr r1, _08012F84 @ =gMain
|
||||
ldrb r0, [r1, #0xf]
|
||||
movs r1, #0x41
|
||||
rsbs r1, r1, #0
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _08012F30
|
||||
mov r2, sl
|
||||
ldr r3, [r2]
|
||||
adds r0, r3, r4
|
||||
ldrh r1, [r0]
|
||||
adds r1, #1
|
||||
strh r1, [r0]
|
||||
lsls r0, r5, #0x10
|
||||
ldr r4, _08012FA4 @ =0xFFF90000
|
||||
adds r0, r0, r4
|
||||
lsrs r0, r0, #0x10
|
||||
cmp r0, #3
|
||||
bhi _08012F30
|
||||
ldr r2, _08012F94 @ =0x040000D4
|
||||
ldr r1, _08012FA8 @ =0x000005F6
|
||||
adds r0, r3, r1
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
adds r0, #4
|
||||
lsls r0, r0, #5
|
||||
ldr r1, _08012FAC @ =gUnknown_08137E14
|
||||
adds r0, r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _08012FB0 @ =0x05000220
|
||||
str r0, [r2, #4]
|
||||
ldr r0, _08012FB4 @ =0x80000010
|
||||
str r0, [r2, #8]
|
||||
ldr r0, [r2, #8]
|
||||
_08012F30:
|
||||
ldr r3, _08012FB8 @ =gCurrentPinballGame
|
||||
ldr r0, [r3]
|
||||
ldr r2, _08012F90 @ =0x00000392
|
||||
adds r0, r0, r2
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #0xba
|
||||
bne _08012F44
|
||||
movs r0, #0
|
||||
mov r4, r8
|
||||
strb r0, [r4]
|
||||
_08012F44:
|
||||
ldr r1, [r3]
|
||||
adds r0, r1, r2
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #0xd7
|
||||
bhi _08012F50
|
||||
b _0801310A
|
||||
_08012F50:
|
||||
movs r2, #0xe2
|
||||
lsls r2, r2, #2
|
||||
adds r0, r1, r2
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
cmp r0, #3
|
||||
bne _08012F6A
|
||||
movs r0, #0xa5
|
||||
lsls r0, r0, #2
|
||||
adds r1, r1, r0
|
||||
movs r0, #2
|
||||
strb r0, [r1]
|
||||
_08012F6A:
|
||||
ldr r0, [r3]
|
||||
adds r0, r0, r2
|
||||
movs r1, #0
|
||||
strb r1, [r0]
|
||||
movs r2, #0
|
||||
strh r1, [r6]
|
||||
ldr r0, [r3]
|
||||
strb r2, [r0, #0x1f]
|
||||
ldr r2, _08012F94 @ =0x040000D4
|
||||
ldr r0, [r3]
|
||||
ldr r1, _08012FA8 @ =0x000005F6
|
||||
adds r0, r0, r1
|
||||
b _080130F2
|
||||
.align 2, 0
|
||||
_08012F84: .4byte gMain
|
||||
_08012F88: .4byte 0x000001FF
|
||||
_08012F8C: .4byte 0xFFFFFE00
|
||||
_08012F90: .4byte 0x00000392
|
||||
_08012F94: .4byte 0x040000D4
|
||||
_08012F98: .4byte gUnknown_083BF16C
|
||||
_08012F9C: .4byte 0x06010720
|
||||
_08012FA0: .4byte 0x80000100
|
||||
_08012FA4: .4byte 0xFFF90000
|
||||
_08012FA8: .4byte 0x000005F6
|
||||
_08012FAC: .4byte gUnknown_08137E14
|
||||
_08012FB0: .4byte 0x05000220
|
||||
_08012FB4: .4byte 0x80000010
|
||||
_08012FB8: .4byte gCurrentPinballGame
|
||||
_08012FBC:
|
||||
ldr r4, _0801307C @ =0x00000392
|
||||
adds r0, r2, r4
|
||||
ldrh r1, [r0]
|
||||
cmp r1, #0
|
||||
bne _08012FD2
|
||||
movs r0, #1
|
||||
strb r0, [r2, #0x1f]
|
||||
mov r2, r8
|
||||
strh r1, [r2, #0x30]
|
||||
strh r1, [r2, #0x32]
|
||||
strh r1, [r2, #6]
|
||||
_08012FD2:
|
||||
mov r3, sl
|
||||
ldr r0, [r3]
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #5
|
||||
bne _08012FE2
|
||||
movs r0, #1
|
||||
strh r0, [r6]
|
||||
_08012FE2:
|
||||
mov r1, sl
|
||||
ldr r0, [r1]
|
||||
adds r1, r0, r4
|
||||
ldrh r0, [r1]
|
||||
cmp r0, #4
|
||||
bls _0801301A
|
||||
subs r0, #5
|
||||
movs r1, #0x3f
|
||||
bl __modsi3
|
||||
movs r1, #7
|
||||
bl __divsi3
|
||||
ldr r2, _08013080 @ =0x040000D4
|
||||
lsls r0, r0, #0x10
|
||||
asrs r0, r0, #7
|
||||
ldr r1, _08013084 @ =gUnknown_083BDF6C
|
||||
adds r0, r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _08013088 @ =0x06010720
|
||||
str r0, [r2, #4]
|
||||
ldr r0, _0801308C @ =0x80000100
|
||||
str r0, [r2, #8]
|
||||
ldr r0, [r2, #8]
|
||||
mov r2, r8
|
||||
ldrh r0, [r2, #6]
|
||||
subs r0, #0x14
|
||||
strh r0, [r2, #6]
|
||||
_0801301A:
|
||||
ldr r3, _08013090 @ =gMain
|
||||
ldrb r0, [r3, #0xf]
|
||||
movs r1, #0x81
|
||||
rsbs r1, r1, #0
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _08013034
|
||||
mov r0, sl
|
||||
ldr r1, [r0]
|
||||
adds r1, r1, r4
|
||||
ldrh r0, [r1]
|
||||
adds r0, #1
|
||||
strh r0, [r1]
|
||||
_08013034:
|
||||
mov r1, sl
|
||||
ldr r0, [r1]
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #0x17
|
||||
bne _08013046
|
||||
movs r0, SE_UNKNOWN_0xF9
|
||||
bl m4aSongNumStart
|
||||
_08013046:
|
||||
mov r2, sl
|
||||
ldr r0, [r2]
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #0x14
|
||||
bne _08013058
|
||||
movs r0, #1
|
||||
mov r3, r8
|
||||
strb r0, [r3]
|
||||
_08013058:
|
||||
ldr r0, _08013094 @ =gCurrentPinballGame
|
||||
ldr r1, [r0]
|
||||
adds r0, r1, r4
|
||||
ldrh r0, [r0]
|
||||
cmp r0, #0x43
|
||||
bls _0801310A
|
||||
movs r2, #0xe2
|
||||
lsls r2, r2, #2
|
||||
adds r1, r1, r2
|
||||
movs r0, #0
|
||||
strb r0, [r1]
|
||||
strh r0, [r6]
|
||||
ldr r2, _08013080 @ =0x040000D4
|
||||
ldr r3, _08013094 @ =gCurrentPinballGame
|
||||
ldr r0, [r3]
|
||||
ldr r4, _08013098 @ =0x000005F6
|
||||
adds r0, r0, r4
|
||||
b _080130F2
|
||||
.align 2, 0
|
||||
_0801307C: .4byte 0x00000392
|
||||
_08013080: .4byte 0x040000D4
|
||||
_08013084: .4byte gUnknown_083BDF6C
|
||||
_08013088: .4byte 0x06010720
|
||||
_0801308C: .4byte 0x80000100
|
||||
_08013090: .4byte gMain
|
||||
_08013094: .4byte gCurrentPinballGame
|
||||
_08013098: .4byte 0x000005F6
|
||||
_0801309C:
|
||||
ldr r6, _08013204 @ =0x000005F7
|
||||
adds r0, r3, r6
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
bne _0801310A
|
||||
movs r4, #0xbf
|
||||
lsls r4, r4, #3
|
||||
adds r2, r3, r4
|
||||
ldrh r0, [r2]
|
||||
cmp r0, #0
|
||||
beq _0801310A
|
||||
subs r0, #1
|
||||
strh r0, [r2]
|
||||
lsls r0, r0, #0x10
|
||||
cmp r0, #0
|
||||
bne _0801310A
|
||||
ldr r0, _08013208 @ =0x000005F6
|
||||
adds r2, r3, r0
|
||||
ldrb r3, [r2]
|
||||
movs r0, #0
|
||||
ldrsb r0, [r2, r0]
|
||||
cmp r0, #0
|
||||
ble _080130E8
|
||||
subs r0, r3, #1
|
||||
strb r0, [r2]
|
||||
mov r2, sl
|
||||
ldr r1, [r2]
|
||||
ldr r3, _08013208 @ =0x000005F6
|
||||
adds r0, r1, r3
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
ble _080130E8
|
||||
adds r1, r1, r4
|
||||
movs r0, #0xe1
|
||||
lsls r0, r0, #4
|
||||
strh r0, [r1]
|
||||
_080130E8:
|
||||
ldr r2, _0801320C @ =0x040000D4
|
||||
mov r4, sl
|
||||
ldr r0, [r4]
|
||||
ldr r6, _08013208 @ =0x000005F6
|
||||
adds r0, r0, r6
|
||||
_080130F2:
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
lsls r0, r0, #5
|
||||
ldr r1, _08013210 @ =gUnknown_08137E14
|
||||
adds r0, r0, r1
|
||||
str r0, [r2]
|
||||
ldr r0, _08013214 @ =0x05000220
|
||||
str r0, [r2, #4]
|
||||
ldr r0, _08013218 @ =0x80000010
|
||||
str r0, [r2, #8]
|
||||
ldr r0, [r2, #8]
|
||||
_0801310A:
|
||||
ldr r1, _0801321C @ =gMain
|
||||
ldrb r0, [r1, #4]
|
||||
cmp r0, #6
|
||||
ble _08013114
|
||||
b _0801330C
|
||||
_08013114:
|
||||
cmp r0, #4
|
||||
bge _0801311A
|
||||
b _0801330C
|
||||
_0801311A:
|
||||
ldr r0, _08013220 @ =gCurrentPinballGame
|
||||
ldr r1, [r0]
|
||||
adds r1, #0x71
|
||||
ldrb r1, [r1]
|
||||
lsls r1, r1, #0x18
|
||||
asrs r1, r1, #0x18
|
||||
mov sl, r0
|
||||
cmp r1, #0
|
||||
bne _0801312E
|
||||
b _08013280
|
||||
_0801312E:
|
||||
movs r3, #4
|
||||
mov r5, sl
|
||||
_08013132:
|
||||
ldr r2, [r5]
|
||||
lsls r1, r3, #0x10
|
||||
asrs r1, r1, #0x10
|
||||
lsls r4, r1, #2
|
||||
adds r4, r2, r4
|
||||
subs r1, #1
|
||||
lsls r0, r1, #2
|
||||
adds r2, r2, r0
|
||||
adds r0, r2, #0
|
||||
adds r0, #0xd0
|
||||
ldrh r3, [r0]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0xd0
|
||||
strh r3, [r0]
|
||||
adds r2, #0xd2
|
||||
ldrh r0, [r2]
|
||||
adds r4, #0xd2
|
||||
strh r0, [r4]
|
||||
lsls r1, r1, #0x10
|
||||
lsrs r3, r1, #0x10
|
||||
cmp r1, #0
|
||||
bgt _08013132
|
||||
mov r3, sl
|
||||
ldr r2, [r3]
|
||||
mov r4, r8
|
||||
ldrh r0, [r4, #0x10]
|
||||
subs r0, #7
|
||||
adds r1, r2, #0
|
||||
adds r1, #0xd0
|
||||
strh r0, [r1]
|
||||
ldrh r0, [r4, #0x12]
|
||||
subs r0, #7
|
||||
adds r2, #0xd2
|
||||
strh r0, [r2]
|
||||
movs r3, #0
|
||||
ldr r6, _0801321C @ =gMain
|
||||
mov sb, r6
|
||||
_0801317C:
|
||||
lsls r2, r3, #0x10
|
||||
asrs r5, r2, #0x10
|
||||
mov r0, sb
|
||||
ldr r1, [r0, #0x44]
|
||||
lsls r0, r5, #2
|
||||
adds r0, r0, r1
|
||||
ldr r6, [r0, #0x18]
|
||||
ldrh r0, [r6]
|
||||
mov ip, r2
|
||||
cmp r0, #0
|
||||
beq _0801325E
|
||||
adds r7, r6, #0
|
||||
adds r7, #8
|
||||
ldrh r0, [r6, #8]
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _08013224 @ =gOamBuffer
|
||||
adds r4, r0, r1
|
||||
movs r0, #3
|
||||
mov r2, r8
|
||||
ldrb r1, [r2, #1]
|
||||
ands r1, r0
|
||||
lsls r1, r1, #2
|
||||
ldrb r2, [r4, #5]
|
||||
movs r0, #0xd
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #5]
|
||||
movs r3, #2
|
||||
ldrsh r2, [r7, r3]
|
||||
mov r6, sl
|
||||
ldr r3, [r6]
|
||||
adds r0, r5, #1
|
||||
lsls r0, r0, #3
|
||||
adds r0, r3, r0
|
||||
adds r0, #0xd0
|
||||
movs r6, #0
|
||||
ldrsh r1, [r0, r6]
|
||||
adds r0, r3, #0
|
||||
adds r0, #0x4c
|
||||
movs r6, #0
|
||||
ldrsh r0, [r0, r6]
|
||||
subs r1, r1, r0
|
||||
adds r2, r2, r1
|
||||
ldr r1, _08013228 @ =0x000001FF
|
||||
adds r0, r1, #0
|
||||
ands r2, r0
|
||||
ldrh r1, [r4, #2]
|
||||
ldr r0, _0801322C @ =0xFFFFFE00
|
||||
ands r0, r1
|
||||
orrs r0, r2
|
||||
strh r0, [r4, #2]
|
||||
cmp r5, #0
|
||||
bne _08013230
|
||||
adds r0, r3, #0
|
||||
adds r0, #0xda
|
||||
ldrb r0, [r0]
|
||||
adds r1, r3, #0
|
||||
adds r1, #0x4e
|
||||
ldrb r1, [r1]
|
||||
subs r0, r0, r1
|
||||
adds r1, r3, #0
|
||||
adds r1, #0xe6
|
||||
ldrb r1, [r1]
|
||||
subs r0, r0, r1
|
||||
ldrb r7, [r7, #4]
|
||||
adds r0, r0, r7
|
||||
b _0801325C
|
||||
.align 2, 0
|
||||
_08013204: .4byte 0x000005F7
|
||||
_08013208: .4byte 0x000005F6
|
||||
_0801320C: .4byte 0x040000D4
|
||||
_08013210: .4byte gUnknown_08137E14
|
||||
_08013214: .4byte 0x05000220
|
||||
_08013218: .4byte 0x80000010
|
||||
_0801321C: .4byte gMain
|
||||
_08013220: .4byte gCurrentPinballGame
|
||||
_08013224: .4byte gOamBuffer
|
||||
_08013228: .4byte 0x000001FF
|
||||
_0801322C: .4byte 0xFFFFFE00
|
||||
_08013230:
|
||||
cmp r5, #1
|
||||
bne _0801325E
|
||||
mov r2, sb
|
||||
ldr r0, [r2, #0x4c]
|
||||
ands r0, r5
|
||||
cmp r0, #0
|
||||
bne _0801325A
|
||||
adds r0, r3, #0
|
||||
adds r0, #0xe2
|
||||
ldrb r0, [r0]
|
||||
adds r1, r3, #0
|
||||
adds r1, #0x4e
|
||||
ldrb r1, [r1]
|
||||
subs r0, r0, r1
|
||||
adds r1, r3, #0
|
||||
adds r1, #0xe6
|
||||
ldrb r1, [r1]
|
||||
subs r0, r0, r1
|
||||
ldrb r7, [r7, #4]
|
||||
adds r0, r0, r7
|
||||
b _0801325C
|
||||
_0801325A:
|
||||
movs r0, #0xc8
|
||||
_0801325C:
|
||||
strb r0, [r4]
|
||||
_0801325E:
|
||||
movs r0, #0x80
|
||||
lsls r0, r0, #9
|
||||
add r0, ip
|
||||
lsrs r3, r0, #0x10
|
||||
asrs r0, r0, #0x10
|
||||
cmp r0, #1
|
||||
ble _0801317C
|
||||
ldr r3, _0801327C @ =gMain
|
||||
ldr r0, [r3, #0x44]
|
||||
ldr r0, [r0, #0x18]
|
||||
movs r1, #1
|
||||
strh r1, [r0]
|
||||
ldr r0, [r3, #0x44]
|
||||
b _08013308
|
||||
.align 2, 0
|
||||
_0801327C: .4byte gMain
|
||||
_08013280:
|
||||
movs r3, #0
|
||||
movs r4, #3
|
||||
mov sb, r4
|
||||
movs r6, #0xd
|
||||
rsbs r6, r6, #0
|
||||
mov ip, r6
|
||||
ldr r7, _0801331C @ =0xFFFFFE00
|
||||
_0801328E:
|
||||
lsls r0, r3, #0x10
|
||||
asrs r5, r0, #0x10
|
||||
ldr r0, _08013320 @ =gMain
|
||||
ldr r1, [r0, #0x44]
|
||||
lsls r0, r5, #2
|
||||
adds r0, r0, r1
|
||||
ldr r6, [r0, #0x18]
|
||||
ldrh r0, [r6]
|
||||
cmp r0, #0
|
||||
beq _080132F0
|
||||
ldrh r0, [r6, #8]
|
||||
lsls r0, r0, #3
|
||||
ldr r1, _08013324 @ =gOamBuffer
|
||||
adds r4, r0, r1
|
||||
mov r2, r8
|
||||
ldrb r1, [r2, #1]
|
||||
mov r3, sb
|
||||
ands r1, r3
|
||||
lsls r1, r1, #2
|
||||
ldrb r2, [r4, #5]
|
||||
mov r0, ip
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #5]
|
||||
movs r0, #0xa
|
||||
ldrsh r3, [r6, r0]
|
||||
mov r1, sl
|
||||
ldr r2, [r1]
|
||||
adds r0, r5, #1
|
||||
lsls r0, r0, #3
|
||||
adds r0, r2, r0
|
||||
adds r0, #0xd0
|
||||
movs r6, #0
|
||||
ldrsh r1, [r0, r6]
|
||||
adds r2, #0x4c
|
||||
movs r6, #0
|
||||
ldrsh r0, [r2, r6]
|
||||
subs r1, r1, r0
|
||||
adds r3, r3, r1
|
||||
ldr r1, _08013328 @ =0x000001FF
|
||||
adds r0, r1, #0
|
||||
ands r3, r0
|
||||
ldrh r1, [r4, #2]
|
||||
adds r0, r7, #0
|
||||
ands r0, r1
|
||||
orrs r0, r3
|
||||
strh r0, [r4, #2]
|
||||
movs r0, #0xc8
|
||||
strb r0, [r4]
|
||||
_080132F0:
|
||||
adds r0, r5, #1
|
||||
lsls r0, r0, #0x10
|
||||
lsrs r3, r0, #0x10
|
||||
asrs r0, r0, #0x10
|
||||
cmp r0, #1
|
||||
ble _0801328E
|
||||
ldr r2, _08013320 @ =gMain
|
||||
ldr r0, [r2, #0x44]
|
||||
ldr r0, [r0, #0x18]
|
||||
movs r1, #0
|
||||
strh r1, [r0]
|
||||
ldr r0, [r2, #0x44]
|
||||
_08013308:
|
||||
ldr r0, [r0, #0x1c]
|
||||
strh r1, [r0]
|
||||
_0801330C:
|
||||
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
|
||||
_0801331C: .4byte 0xFFFFFE00
|
||||
_08013320: .4byte gMain
|
||||
_08013324: .4byte gOamBuffer
|
||||
_08013328: .4byte 0x000001FF
|
||||
|
||||
.section .text1333C
|
||||
|
||||
thumb_func_start sub_13B28
|
||||
|
|
|
|||
|
|
@ -2918,10 +2918,10 @@ gUnknown_086B0128:: @ 0x086B0128
|
|||
gUnknown_086B0150:: @ 0x086B0150
|
||||
.ascii "SUBTOTAL____________POK^MON_EVOLVED_____BONUS_______________SUBTOTAL____________TRAVELED_AREA_______BONUS_______________SUBTOTAL____________SLOT_PLAYED_________BONUS_______________SUBTOTAL____________PIKA_SAVER__________BONUS_______________SUBTOTAL____________SUBTOTAL____________SUBTOTAL____________SUBTOTAL____________SUBTOTAL____________MULTIPLIER__________TOTAL_______________"
|
||||
|
||||
gUnknown_086B02CC:: @ 0x086B02CC
|
||||
gMainFieldSpriteGroups:: @ 0x086B02CC
|
||||
.incbin "baserom.gba", 0x6B02CC, 0x1E0
|
||||
|
||||
gUnknown_086B04AC:: @ 0x086B04AC
|
||||
gBonusFieldSpriteGroups:: @ 0x086B04AC
|
||||
.incbin "baserom.gba", 0x6B04AC, 0x2D0
|
||||
|
||||
gUnknown_086B077C:: @ 0x086B077C
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -370,7 +370,6 @@ extern void ClearSomeArray(void);
|
|||
//extern ? sub_11B9C();
|
||||
//extern ? sub_11C14();
|
||||
//extern ? sub_11C98();
|
||||
//extern ? sub_12BF8();
|
||||
extern void sub_1332C();
|
||||
extern void sub_1333C();
|
||||
extern u16 sub_13824(struct Vector16*);
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ struct BgOffsets
|
|||
struct UnkPinballGame1334
|
||||
{
|
||||
/*0x00*/ s8 unk0;
|
||||
/*0x01*/ s8 unk1;
|
||||
/*0x01*/ s8 unk1; // oam data priority
|
||||
/*0x02*/ u8 filler2[0x4];
|
||||
/*0x06*/ u16 unk6;
|
||||
/*0x08*/ u16 unk8;
|
||||
|
|
@ -154,7 +154,7 @@ struct PinballGame
|
|||
/*0x06E*/ s8 unk6E;
|
||||
/*0x06F*/ s8 unk6F;
|
||||
/*0x070*/ u8 filler70[0x1];
|
||||
/*0x071*/ s8 unk71;
|
||||
/*0x071*/ s8 unk71; // flag for catching animation?
|
||||
/*0x072*/ u8 filler72[0x5A];
|
||||
/*0x0CC*/ u16 unkCC;
|
||||
/*0x0CE*/ u8 fillerCE[0x2];
|
||||
|
|
@ -254,7 +254,8 @@ struct PinballGame
|
|||
/*0x2A4*/ s8 unk2A4;
|
||||
/*0x2A5*/ u8 filler2A5[0x5];
|
||||
/*0x2AA*/ u16 unk2AA;
|
||||
/*0x2AC*/ u8 filler2AC[0x28];
|
||||
/*0x2AC*/ s16 unk2AC;
|
||||
/*0x2AE*/ u8 filler2AE[0x26];
|
||||
/*0x2D4*/ u16 unk2D4;
|
||||
/*0x2D6*/ u16 unk2D6;
|
||||
/*0x2D8*/ u8 filler2D8[0x2];
|
||||
|
|
@ -286,8 +287,10 @@ struct PinballGame
|
|||
/*0x385*/ u8 unk385;
|
||||
/*0x386*/ s8 unk386;
|
||||
/*0x387*/ u8 unk387;
|
||||
/*0x388*/ u8 unk388;
|
||||
/*0x389*/ u8 filler389[0x9];
|
||||
/*0x388*/ s8 unk388;
|
||||
/*0x389*/ u8 filler389[0x3];
|
||||
/*0x38C*/ s16 unk38C;
|
||||
/*0x38E*/ u8 filler38E[0x4];
|
||||
/*0x392*/ u16 unk392;
|
||||
/*0x394*/ u16 unk394;
|
||||
/*0x396*/ u8 unk396;
|
||||
|
|
@ -481,11 +484,18 @@ struct Unk02031520
|
|||
/*0x2C*/ u8 *unk2C;
|
||||
};
|
||||
|
||||
struct Unk02031590
|
||||
{
|
||||
u8 filler[0x16];
|
||||
u8 unk16;
|
||||
};
|
||||
|
||||
extern struct PinballGame *gCurrentPinballGame;
|
||||
extern u32 gUnknown_02031510;
|
||||
extern struct Unk02031520 gUnknown_02031520;
|
||||
extern s32 gUnknown_081B36A4[64];
|
||||
extern s32 gUnknown_082EE0E0[];
|
||||
extern const u8 gUnknown_08138834[0x2000];
|
||||
extern struct Unk02031590 gUnknown_02031590;
|
||||
|
||||
#endif // GUARD_GLOBAL_H
|
||||
|
|
|
|||
|
|
@ -33,19 +33,6 @@ struct SaveData
|
|||
u32 unk2E4;
|
||||
};
|
||||
|
||||
struct MainUnk44_item
|
||||
{
|
||||
/*0x0*/ u16 unk0;
|
||||
/*0x2*/ s16 unk2;
|
||||
/*0x4*/ s16 unk4;
|
||||
};
|
||||
|
||||
struct MainUnk44
|
||||
{
|
||||
struct MainUnk44_item a;
|
||||
struct MainUnk44_item b;
|
||||
};
|
||||
|
||||
struct Main
|
||||
{
|
||||
/*0x00*/ u8 filler0[0x2];
|
||||
|
|
@ -83,7 +70,7 @@ struct Main
|
|||
/*0x3C*/ volatile u16 blendBrightness;
|
||||
// may be a sub-struct. possibly for saved game?
|
||||
/*0x40*/ int hasSavedGame;
|
||||
/*0x44*/ struct MainUnk44 **unk44;
|
||||
/*0x44*/ struct SpriteGroup **unk44;
|
||||
/*0x48*/ int rngValue;
|
||||
/*0x4C*/ u32 systemFrameCount;
|
||||
/*0x50*/ int fieldFrameCount;
|
||||
|
|
|
|||
|
|
@ -18,17 +18,18 @@ struct SpriteSet
|
|||
|
||||
struct OamDataSimple
|
||||
{
|
||||
u16 oamId;
|
||||
s16 xOffset;
|
||||
s16 yOffset;
|
||||
/*0x00*/ u16 oamId;
|
||||
/*0x02*/ s16 xOffset;
|
||||
/*0x04*/ s16 yOffset;
|
||||
};
|
||||
// size: 0x8
|
||||
|
||||
struct SpriteGroup
|
||||
{
|
||||
u16 available;
|
||||
s16 baseX;
|
||||
s16 baseY;
|
||||
struct OamDataSimple oam[MAX_SPRITES_IN_GROUP];
|
||||
/*0x00*/ u16 available;
|
||||
/*0x02*/ s16 baseX;
|
||||
/*0x04*/ s16 baseY;
|
||||
/*0x08*/ struct OamDataSimple oam[MAX_SPRITES_IN_GROUP];
|
||||
};
|
||||
// size: 0xB8
|
||||
|
||||
|
|
|
|||
|
|
@ -46,9 +46,8 @@ SECTIONS
|
|||
src/rom_1068C.o(.text);
|
||||
src/titlescreen.o(.text);
|
||||
src/rom_11B9C.o(.text);
|
||||
asm/rom_11B9C.o(.text11C14);
|
||||
src/rom_1332C.o(.text);
|
||||
asm/rom_11B9C.o(.text1333C);
|
||||
src/rom_1332C.o(.text);
|
||||
asm/rom_11B9C.o(.text1333C);
|
||||
src/rom_19B64.o(.text);
|
||||
src/rom_19D04.o(.text);
|
||||
asm/rom_11B9C.o(.text19E10);
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ extern u8 gUnknown_020030A0[][0x400];
|
|||
|
||||
extern const struct Unk20028D8 gUnknown_086B077C[];
|
||||
extern const VoidFunc gUnknown_086B085C[];
|
||||
extern struct MainUnk44 *gUnknown_086B02CC[][60];
|
||||
extern struct MainUnk44 *gUnknown_086B04AC[][30];
|
||||
extern struct SpriteGroup *gMainFieldSpriteGroups[][60];
|
||||
extern struct SpriteGroup *gBonusFieldSpriteGroups[][30];
|
||||
|
||||
extern const u8 gUnknown_08158284[];
|
||||
extern const u8 gUnknown_08395A4C[];
|
||||
|
|
@ -364,7 +364,7 @@ void sub_4A518(void)
|
|||
gCurrentPinballGame->unk1DC = 60;
|
||||
DmaCopy16(3, gUnknown_084C0C6C, (void *)OBJ_VRAM0 + 0x600, 0x180);
|
||||
gCurrentPinballGame->unk1E2 = 2;
|
||||
gMain.unk44[41]->a.unk0 = 0;
|
||||
gMain.unk44[41]->available = FALSE;
|
||||
gCurrentPinballGame->unk1C0 = 1;
|
||||
gCurrentPinballGame->unk5F6 = 3;
|
||||
gCurrentPinballGame->unk5F8 = 60 * 60;
|
||||
|
|
@ -484,7 +484,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[11];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[1];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[13];
|
||||
gMain.unk44 = gUnknown_086B02CC[gMain.selectedField];
|
||||
gMain.unk44 = gMainFieldSpriteGroups[gMain.selectedField];
|
||||
break;
|
||||
case FIELD_SAPPHIRE:
|
||||
gUnknown_020028D8[3] = gUnknown_086B077C[4];
|
||||
|
|
@ -493,7 +493,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[11];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[1];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[13];
|
||||
gMain.unk44 = gUnknown_086B02CC[gMain.selectedField];
|
||||
gMain.unk44 = gMainFieldSpriteGroups[gMain.selectedField];
|
||||
break;
|
||||
case FIELD_DUSCLOPS:
|
||||
gUnknown_020028D8[3] = gUnknown_086B077C[5];
|
||||
|
|
@ -502,7 +502,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[12];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[2];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[14];
|
||||
gMain.unk44 = gUnknown_086B04AC[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
gMain.unk44 = gBonusFieldSpriteGroups[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
break;
|
||||
case FIELD_KECLEON:
|
||||
gUnknown_020028D8[3] = gUnknown_086B077C[6];
|
||||
|
|
@ -511,7 +511,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[12];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[2];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[14];
|
||||
gMain.unk44 = gUnknown_086B04AC[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
gMain.unk44 = gBonusFieldSpriteGroups[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
break;
|
||||
case FIELD_KYOGRE:
|
||||
gUnknown_020028D8[3] = gUnknown_086B077C[7];
|
||||
|
|
@ -520,7 +520,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[12];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[2];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[14];
|
||||
gMain.unk44 = gUnknown_086B04AC[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
gMain.unk44 = gBonusFieldSpriteGroups[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
break;
|
||||
case FIELD_GROUDON:
|
||||
gUnknown_020028D8[3] = gUnknown_086B077C[8];
|
||||
|
|
@ -529,7 +529,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[12];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[2];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[14];
|
||||
gMain.unk44 = gUnknown_086B04AC[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
gMain.unk44 = gBonusFieldSpriteGroups[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
break;
|
||||
case FIELD_RAYQUAZA:
|
||||
gUnknown_020028D8[3] = gUnknown_086B077C[9];
|
||||
|
|
@ -538,7 +538,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[12];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[2];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[14];
|
||||
gMain.unk44 = gUnknown_086B04AC[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
gMain.unk44 = gBonusFieldSpriteGroups[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
break;
|
||||
case FIELD_SPHEAL:
|
||||
gUnknown_020028D8[3] = gUnknown_086B077C[10];
|
||||
|
|
@ -547,7 +547,7 @@ void sub_4A90C(void)
|
|||
gUnknown_020028D8[4] = gUnknown_086B077C[12];
|
||||
gUnknown_020028D8[2] = gUnknown_086B077C[2];
|
||||
gUnknown_020028D8[5] = gUnknown_086B077C[14];
|
||||
gMain.unk44 = gUnknown_086B04AC[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
gMain.unk44 = gBonusFieldSpriteGroups[gMain.selectedField - FIELD_DUSCLOPS];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
301
src/rom_11B9C.c
301
src/rom_11B9C.c
|
|
@ -2,6 +2,7 @@
|
|||
#include "main.h"
|
||||
#include "constants/bg_music.h"
|
||||
#include "constants/fields.h"
|
||||
#include "m4a.h"
|
||||
|
||||
void sub_11C14(s16);
|
||||
void sub_12524(void);
|
||||
|
|
@ -11,6 +12,8 @@ void sub_2AADC(void);
|
|||
extern const u8 gUnknown_08137E14[][0x20];
|
||||
extern const u8 gUnknown_083BB16C[][0x80];
|
||||
extern const u8 gUnknown_083BD36C[][0x200];
|
||||
extern const u32 gUnknown_083BDF6C[][0x80];
|
||||
extern const u32 gUnknown_083BF16C[][0x80];
|
||||
|
||||
void sub_11B9C(void)
|
||||
{
|
||||
|
|
@ -435,10 +438,10 @@ void sub_12524(void)
|
|||
}
|
||||
}
|
||||
|
||||
gMain.unk44[1]->a.unk0 = 1;
|
||||
gMain.unk44[2]->a.unk0 = 1;
|
||||
gMain.unk44[49]->a.unk0 = 1;
|
||||
gMain.unk44[0]->a.unk0 = 0;
|
||||
gMain.unk44[1]->available = 1;
|
||||
gMain.unk44[2]->available = 1;
|
||||
gMain.unk44[49]->available = 1;
|
||||
gMain.unk44[0]->available = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -448,19 +451,19 @@ void sub_12524(void)
|
|||
mainUnk44 = gMain.unk44[i + 1];
|
||||
if (mainUnk44->a.unk0)
|
||||
{
|
||||
oam = &gOamBuffer[mainUnk44->b.unk0];
|
||||
oam = &gOamBuffer[mainUnk44->oam[0].oamId];
|
||||
oam->priority = unk132c->unk1;
|
||||
oam->x = mainUnk44->b.unk2 +
|
||||
oam->x = mainUnk44->oam[0].xOffset +
|
||||
gCurrentPinballGame->unkD0[(i + 1) * 2].x -
|
||||
gCurrentPinballGame->unk4C;
|
||||
oam->y = 200;
|
||||
}
|
||||
}
|
||||
|
||||
gMain.unk44[1]->a.unk0 = 0;
|
||||
gMain.unk44[2]->a.unk0 = 0;
|
||||
gMain.unk44[49]->a.unk0 = 0;
|
||||
gMain.unk44[0]->a.unk0 = 1;
|
||||
gMain.unk44[1]->available = 0;
|
||||
gMain.unk44[2]->available = 0;
|
||||
gMain.unk44[49]->available = 0;
|
||||
gMain.unk44[0]->available = 1;
|
||||
}
|
||||
|
||||
// _08012AE4
|
||||
|
|
@ -469,21 +472,21 @@ void sub_12524(void)
|
|||
{
|
||||
if (gCurrentPinballGame->unk71C < 59)
|
||||
{
|
||||
mainUnk44->a.unk2 = gMain.unk44[0]->a.unk2 - 8;
|
||||
mainUnk44->a.unk4 = gMain.unk44[0]->a.unk4 - 8;
|
||||
mainUnk44->baseX = gMain.unk44[0]->xOffset - 8;
|
||||
mainUnk44->baseY = gMain.unk44[0]->yOffset - 8;
|
||||
}
|
||||
else
|
||||
{
|
||||
mainUnk44->a.unk2 = 0;
|
||||
mainUnk44->a.unk4 = 180;
|
||||
mainUnk44->baseX = 0;
|
||||
mainUnk44->baseY = 180;
|
||||
}
|
||||
|
||||
DmaCopy16(3, gUnknown_083BD36C[gCurrentPinballGame->unk6E], (void *)0x6011EE0, 0x200);
|
||||
gOamBuffer[mainUnk44->b.unk0].x = mainUnk44->a.unk2 + mainUnk44->b.unk2;
|
||||
gOamBuffer[mainUnk44->b.unk0].y = mainUnk44->a.unk4 + mainUnk44->b.unk4;
|
||||
gOamBuffer[mainUnk44->b.unk0].priority = unk132c->unk1;
|
||||
gOamBuffer[mainUnk44->oam[0].oamId].x = mainUnk44->a.unk2 + mainUnk44->b.unk2;
|
||||
gOamBuffer[mainUnk44->oam[0].oamId].y = mainUnk44->a.unk4 + mainUnk44->b.unk4;
|
||||
gOamBuffer[mainUnk44->oam[0].oamId].priority = unk132c->unk1;
|
||||
if (gCurrentPinballGame->unk71C < 14)
|
||||
gMain.unk44[43]->a.unk0 = 0;
|
||||
gMain.unk44[43]->available = 0;
|
||||
}
|
||||
}
|
||||
#else
|
||||
|
|
@ -1355,3 +1358,265 @@ _08012BF4: .4byte gMain\n\
|
|||
");
|
||||
}
|
||||
#endif
|
||||
|
||||
void sub_12BF8()
|
||||
{
|
||||
s16 i;
|
||||
s16 r5;
|
||||
struct SpriteGroup *spriteGroup;
|
||||
struct OamData *oamData;
|
||||
struct OamDataSimple *oam;
|
||||
struct UnkPinballGame1334 *unk1334_0;
|
||||
|
||||
gCurrentPinballGame->unk1330 = gCurrentPinballGame->unk1334;
|
||||
gCurrentPinballGame->unk132c = gCurrentPinballGame->unk1334;
|
||||
|
||||
unk1334_0 = &gCurrentPinballGame->unk1334[0];
|
||||
|
||||
switch (gMain.selectedField)
|
||||
{
|
||||
case FIELD_KECLEON:
|
||||
unk1334_0->unk1 = 2;
|
||||
spriteGroup = &gUnknown_0200B3B8[gUnknown_02031590.unk16];
|
||||
break;
|
||||
case FIELD_KYOGRE:
|
||||
case FIELD_GROUDON:
|
||||
case FIELD_SPHEAL:
|
||||
unk1334_0->unk1 = 1;
|
||||
spriteGroup = gMain.unk44[0];
|
||||
break;
|
||||
case FIELD_RAYQUAZA:
|
||||
if (unk1334_0->unk1 > 2) {
|
||||
unk1334_0->unk1 = 2;
|
||||
}
|
||||
spriteGroup = gMain.unk44[0];
|
||||
break;
|
||||
default:
|
||||
unk1334_0->unk1 = 3;
|
||||
spriteGroup = gMain.unk44[0];
|
||||
break;
|
||||
}
|
||||
|
||||
r5 = gCurrentPinballGame->unk132c->unkA >> 12;
|
||||
DmaCopy16(3, &gUnknown_083BB16C[r5 + gCurrentPinballGame->unk5F6 * 17], (void *)VRAM + 0x10400, 0x80);
|
||||
|
||||
unk1334_0->unk10.x = unk1334_0->unk28.x / 2;
|
||||
unk1334_0->unk10.y = unk1334_0->unk28.y / 2;
|
||||
|
||||
spriteGroup->baseX = unk1334_0->unk10.x
|
||||
- (gCurrentPinballGame->unk4C + 7)
|
||||
- gCurrentPinballGame->unk2AA;
|
||||
spriteGroup->baseY = unk1334_0->unk10.y
|
||||
- 7
|
||||
- gCurrentPinballGame->unk4E
|
||||
- gCurrentPinballGame->unk5FC
|
||||
- gCurrentPinballGame->unkE6
|
||||
- gCurrentPinballGame->unk2AC
|
||||
- (gCurrentPinballGame->unk38C / 10);
|
||||
|
||||
if (spriteGroup->baseY < -60)
|
||||
spriteGroup->baseY = -60;
|
||||
|
||||
if (spriteGroup->baseY > 180)
|
||||
spriteGroup->baseY = 180;
|
||||
|
||||
unk1334_0->unk24 = spriteGroup->baseX;
|
||||
unk1334_0->unk26 = spriteGroup->baseY;
|
||||
|
||||
oam = &spriteGroup->oam[0];
|
||||
oamData = &gOamBuffer[oam->oamId];
|
||||
oamData->priority = unk1334_0->unk1;
|
||||
oamData->x = oam->xOffset + spriteGroup->baseX;
|
||||
|
||||
if (unk1334_0->unk0)
|
||||
oamData->y = 200;
|
||||
else
|
||||
oamData->y = oam->yOffset + spriteGroup->baseY;
|
||||
|
||||
if (gCurrentPinballGame->unk388)
|
||||
{
|
||||
spriteGroup = gMain.unk44[1];
|
||||
if (spriteGroup->available)
|
||||
{
|
||||
spriteGroup->baseX = unk1334_0->unk24 - 8;
|
||||
spriteGroup->baseY = unk1334_0->unk26 - 8;
|
||||
oam = &spriteGroup->oam[0];
|
||||
gOamBuffer[oam->oamId].x = oam->xOffset + spriteGroup->baseX;
|
||||
gOamBuffer[oam->oamId].y = oam->yOffset + spriteGroup->baseY;
|
||||
}
|
||||
|
||||
if (gCurrentPinballGame->unk388 == 1 || gCurrentPinballGame->unk388 == 3)
|
||||
{
|
||||
if (gCurrentPinballGame->unk392 == 0)
|
||||
{
|
||||
gCurrentPinballGame->unk1F = 1;
|
||||
unk1334_0->velocity.x = 0;
|
||||
unk1334_0->velocity.y = 0;
|
||||
unk1334_0->unk6 = 0;
|
||||
}
|
||||
|
||||
if (gCurrentPinballGame->unk392 == 150)
|
||||
spriteGroup->available = TRUE;
|
||||
|
||||
if (gCurrentPinballGame->unk392 == 154)
|
||||
m4aSongNumStart(SE_UNKNOWN_0xF9);
|
||||
|
||||
if (gCurrentPinballGame->unk392 > 149)
|
||||
{
|
||||
r5 = ((gCurrentPinballGame->unk392 - 150) % 66) / 6;
|
||||
DmaCopy16(3, &gUnknown_083BF16C[r5], (void *)VRAM + 0x10720, 0x200);
|
||||
unk1334_0->unk6 -= 40;
|
||||
}
|
||||
|
||||
if ((gMain.unkF & -0x41) == 0) // 1011 1111
|
||||
{
|
||||
gCurrentPinballGame->unk392++;
|
||||
if (r5 >= 7 && r5 <= 10)
|
||||
{
|
||||
DmaCopy16(3, &gUnknown_08137E14[(s16) (gCurrentPinballGame->unk5F6 + 4)], (void *)PLTT + 0x220, 0x20);
|
||||
}
|
||||
}
|
||||
|
||||
if (gCurrentPinballGame->unk392 == 186)
|
||||
unk1334_0->unk0 = 0;
|
||||
|
||||
if (gCurrentPinballGame->unk392 > 215)
|
||||
{
|
||||
if (gCurrentPinballGame->unk388 == 3)
|
||||
gCurrentPinballGame->unk294 = 2;
|
||||
|
||||
gCurrentPinballGame->unk388 = 0;
|
||||
spriteGroup->available = FALSE;
|
||||
gCurrentPinballGame->unk1F = 0;
|
||||
DmaCopy16(3, &gUnknown_08137E14[gCurrentPinballGame->unk5F6], (void *)PLTT + 0x220, 0x20);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gCurrentPinballGame->unk392 == 0)
|
||||
{
|
||||
gCurrentPinballGame->unk1F = 1;
|
||||
unk1334_0->velocity.x = 0;
|
||||
unk1334_0->velocity.y = 0;
|
||||
unk1334_0->unk6 = 0;
|
||||
}
|
||||
|
||||
if (gCurrentPinballGame->unk392 == 5)
|
||||
spriteGroup->available = TRUE;
|
||||
|
||||
if (gCurrentPinballGame->unk392 > 4)
|
||||
{
|
||||
r5 = ((gCurrentPinballGame->unk392 - 5) % 63 / 7);
|
||||
DmaCopy16(3, &gUnknown_083BDF6C[r5], (void *)VRAM + 0x10720, 0x200);
|
||||
unk1334_0->unk6 -= 20;
|
||||
}
|
||||
|
||||
if ((gMain.unkF & -0x81) == 0) // 0111 1111
|
||||
gCurrentPinballGame->unk392++;
|
||||
|
||||
if (gCurrentPinballGame->unk392 == 23)
|
||||
m4aSongNumStart(SE_UNKNOWN_0xF9);
|
||||
|
||||
if (gCurrentPinballGame->unk392 == 20)
|
||||
unk1334_0->unk0 = 1;
|
||||
|
||||
if (gCurrentPinballGame->unk392 > 67)
|
||||
{
|
||||
gCurrentPinballGame->unk388 = 0;
|
||||
spriteGroup->available = FALSE;
|
||||
DmaCopy16(3, &gUnknown_08137E14[gCurrentPinballGame->unk5F6], (void *)PLTT + 0x220, 0x20);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gCurrentPinballGame->unk5F7 == 0 && gCurrentPinballGame->unk5F8 != 0)
|
||||
{
|
||||
gCurrentPinballGame->unk5F8 -= 1;
|
||||
if (gCurrentPinballGame->unk5F8 == 0)
|
||||
{
|
||||
if (gCurrentPinballGame->unk5F6 > 0)
|
||||
{
|
||||
gCurrentPinballGame->unk5F6 -= 1;
|
||||
if (gCurrentPinballGame->unk5F6 > 0)
|
||||
{
|
||||
gCurrentPinballGame->unk5F8 = 3600;
|
||||
}
|
||||
}
|
||||
DmaCopy16(3, &gUnknown_08137E14[gCurrentPinballGame->unk5F6], (void *)PLTT + 0x220, 0x20);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch (gMain.selectedField) {
|
||||
case FIELD_KYOGRE:
|
||||
case FIELD_GROUDON:
|
||||
case FIELD_RAYQUAZA:
|
||||
if (gCurrentPinballGame->unk71)
|
||||
{
|
||||
for (i = 4; i > 0; i--)
|
||||
{
|
||||
gCurrentPinballGame->unkD0[i].x = gCurrentPinballGame->unkD0[i - 1].x;
|
||||
gCurrentPinballGame->unkD0[i].y = gCurrentPinballGame->unkD0[i - 1].y;
|
||||
}
|
||||
gCurrentPinballGame->unkD0[0].x = unk1334_0->unk10.x - 7;
|
||||
gCurrentPinballGame->unkD0[0].y = unk1334_0->unk10.y - 7;
|
||||
|
||||
for (i = 0; i < 2; i++)
|
||||
{
|
||||
spriteGroup = gMain.unk44[i + 6];
|
||||
if (spriteGroup->available)
|
||||
{
|
||||
oam = &spriteGroup->oam[0];
|
||||
oamData = &gOamBuffer[oam->oamId];
|
||||
oamData->priority = unk1334_0->unk1;
|
||||
oamData->x = oam->xOffset
|
||||
+ (gCurrentPinballGame->unkD0[(i + 1) * 2].x
|
||||
- gCurrentPinballGame->unk4C);
|
||||
|
||||
if (i == 0)
|
||||
{
|
||||
oamData->y = oam->yOffset
|
||||
+ (gCurrentPinballGame->unkD0[2].y
|
||||
- gCurrentPinballGame->unk4E
|
||||
- gCurrentPinballGame->unkE6);
|
||||
}
|
||||
else if (i == 1)
|
||||
{
|
||||
if ((gMain.systemFrameCount & i) == 0)
|
||||
{
|
||||
oamData->y = oam->yOffset
|
||||
+ (gCurrentPinballGame->unkD0[4].y
|
||||
- gCurrentPinballGame->unk4E
|
||||
- gCurrentPinballGame->unkE6);
|
||||
}
|
||||
else
|
||||
{
|
||||
oamData->y = 200;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
gMain.unk44[6]->available = TRUE;
|
||||
gMain.unk44[7]->available = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i = 0; i < 2; i++)
|
||||
{
|
||||
spriteGroup = gMain.unk44[i + 6];
|
||||
if (spriteGroup->available)
|
||||
{
|
||||
oam = &spriteGroup->oam[0];
|
||||
oamData = &gOamBuffer[oam->oamId];
|
||||
oamData->priority = unk1334_0->unk1;
|
||||
oamData->x = oam->xOffset
|
||||
+ (gCurrentPinballGame->unkD0[(i + 1) * 2].x - gCurrentPinballGame->unk4C);
|
||||
oamData->y = 200;
|
||||
}
|
||||
}
|
||||
gMain.unk44[6]->available = FALSE;
|
||||
gMain.unk44[7]->available = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ void sub_23E18(void);
|
|||
void sub_2C9A4(void);
|
||||
void sub_4E9F0(s8);
|
||||
|
||||
void sub_19A20(void)
|
||||
{
|
||||
void sub_19A20(void)
|
||||
{
|
||||
gCurrentPinballGame->catchModeArrows = 2;
|
||||
sub_1D5D8();
|
||||
sub_4E9F0(0);
|
||||
|
|
@ -35,7 +35,7 @@ void sub_19A20(void)
|
|||
gCurrentPinballGame->unk2DA = 0;
|
||||
sub_23E18();
|
||||
sub_1DDDC();
|
||||
|
||||
|
||||
gCurrentPinballGame->unk170 = 10;
|
||||
gCurrentPinballGame->unk171 = 10;
|
||||
gCurrentPinballGame->unk172 = 10;
|
||||
|
|
@ -59,7 +59,7 @@ void sub_19A20(void)
|
|||
sub_31B30();
|
||||
}
|
||||
|
||||
void sub_19B10(void)
|
||||
void sub_19B10(void)
|
||||
{
|
||||
sub_19B90();
|
||||
sub_19E10();
|
||||
|
|
@ -73,7 +73,7 @@ void sub_19B10(void)
|
|||
if (gCurrentPinballGame->unk29C != 0)
|
||||
{
|
||||
gCurrentPinballGame->unk29C -= 1;
|
||||
if (gCurrentPinballGame->unk29C == 0)
|
||||
if (gCurrentPinballGame->unk29C == 0)
|
||||
{
|
||||
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
|
||||
}
|
||||
|
|
@ -84,11 +84,11 @@ void sub_19B64(u8 arg0)
|
|||
{
|
||||
gCurrentPinballGame->unk16 = 2;
|
||||
gCurrentPinballGame->unk14 = arg0;
|
||||
if (gCurrentPinballGame->unk13 == 2)
|
||||
gMain.unk44[13]->a.unk0 = 0;
|
||||
if (gCurrentPinballGame->unk13 == 2)
|
||||
gMain.unk44[13]->available = 0;
|
||||
}
|
||||
|
||||
void sub_19B90(void)
|
||||
void sub_19B90(void)
|
||||
{
|
||||
switch (gCurrentPinballGame->unk16)
|
||||
{
|
||||
|
|
@ -108,11 +108,11 @@ void sub_19B90(void)
|
|||
}
|
||||
}
|
||||
|
||||
void sub_19C04(void)
|
||||
void sub_19C04(void)
|
||||
{
|
||||
s16 num1;
|
||||
u8 num2;
|
||||
|
||||
|
||||
if (gCurrentPinballGame->unk15 > 0)
|
||||
{
|
||||
if (gMain.selectedField == 0)
|
||||
|
|
@ -140,7 +140,7 @@ void sub_19C04(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
num2 = gCurrentPinballGame->unk15 - 1;
|
||||
if (num2 > 1)
|
||||
{
|
||||
|
|
@ -151,7 +151,7 @@ void sub_19C04(void)
|
|||
}
|
||||
}
|
||||
|
||||
void sub_19CC8(void)
|
||||
void sub_19CC8(void)
|
||||
{
|
||||
if (gCurrentPinballGame->unk714 != 0)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user