mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-08 14:36:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #501 from hatal175/data8

Browse Source
This commit is contained in:
notyourav
2022-04-22 00:45:46 -07:00
committed by GitHub
parent f4a0460453 0ab1dec741
commit a957ee9580
141 changed files with 1996 additions and 4050 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matching/lilypadLarge/sub_080855E8.inc
-564
View File
@@ -1,564 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r7, r0, #0
ldrb r1, [r7, #0x10]
movs r0, #0x20
orrs r0, r1
strb r0, [r7, #0x10]
ldr r6, _0808564C @ =gPlayerEntity
adds r0, r7, #0
adds r1, r6, #0
movs r2, #0x18
bl sub_0806FC80
adds r1, r0, #0
cmp r1, #0
beq _080856EE
ldr r3, _08085650 @ =gPlayerState
ldr r0, [r3, #0x30]
movs r1, #2
orrs r0, r1
str r0, [r3, #0x30]
ldr r4, [r6, #0x34]
cmp r4, #0
beq _0808561C
b _080857CE
_0808561C:
adds r5, r3, #0
adds r5, #0x26
ldrb r0, [r5]
cmp r0, #0
beq _08085634
adds r2, r6, #0
adds r2, #0x3c
ldrb r1, [r2]
movs r0, #0xfb
ands r0, r1
strb r0, [r2]
strb r4, [r5]
_08085634:
adds r0, r3, #0
adds r0, #0x84
str r7, [r0]
adds r0, r7, #0
adds r0, #0x38
ldrb r0, [r0]
cmp r0, #1
bne _08085654
adds r0, r6, #0
bl ResetCollisionLayer
b _0808565A
.align 2, 0
_0808564C: .4byte gPlayerEntity
_08085650: .4byte gPlayerState
_08085654:
adds r0, r6, #0
bl sub_08004542
_0808565A:
ldrb r0, [r7, #0xf]
cmp r0, #0
bne _0808568C
movs r0, #4
strb r0, [r7, #0xf]
_08085664:
adds r0, r7, #0
movs r1, #8
movs r2, #0xa
bl sub_080A2AF4
ldrb r0, [r7, #0xf]
subs r0, #1
strb r0, [r7, #0xf]
lsls r0, r0, #0x18
lsrs r2, r0, #0x18
cmp r2, #0
bne _08085664
movs r0, #1
strb r0, [r7, #0xf]
ldrb r1, [r7, #0xe]
movs r0, #0x80
orrs r0, r1
strb r0, [r7, #0xe]
str r2, [r7, #0x70]
str r2, [r7, #0x6c]
_0808568C:
ldr r2, _080856B8 @ =gPlayerState
ldrb r0, [r2, #0x1c]
cmp r0, #3
beq _08085696
b _080857CE
_08085696:
ldr r1, _080856BC @ =gUnk_08120620
ldrb r0, [r2, #0x1d]
subs r0, #1
lsls r0, r0, #2
adds r0, r0, r1
ldr r4, [r0]
ldr r0, _080856C0 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
movs r1, #6
ands r1, r0
cmp r1, #2
beq _080856DE
cmp r1, #2
bgt _080856C4
cmp r1, #0
beq _080856D6
b _080857CE
.align 2, 0
_080856B8: .4byte gPlayerState
_080856BC: .4byte gUnk_08120620
_080856C0: .4byte gPlayerEntity
_080856C4:
cmp r1, #4
beq _080856CE
cmp r1, #6
beq _080856E6
b _080857CE
_080856CE:
ldr r0, [r7, #0x70]
subs r0, r0, r4
str r0, [r7, #0x70]
b _080857CE
_080856D6:
ldr r0, [r7, #0x70]
adds r0, r0, r4
str r0, [r7, #0x70]
b _080857CE
_080856DE:
ldr r0, [r7, #0x6c]
subs r0, r0, r4
str r0, [r7, #0x6c]
b _080857CE
_080856E6:
ldr r0, [r7, #0x6c]
adds r0, r0, r4
str r0, [r7, #0x6c]
b _080857CE
_080856EE:
ldrb r0, [r7, #0xf]
cmp r0, #0
beq _080856FC
strb r1, [r7, #0xf]
movs r0, #0x83
bl SoundReq
_080856FC:
adds r2, r7, #0
adds r2, #0x41
ldrb r1, [r2]
movs r0, #0x7f
ands r0, r1
mov r8, r2
cmp r0, #0x13
bne _080857C8
movs r0, #0x2e
ldrsh r1, [r6, r0]
ldr r3, _08085758 @ =gUnk_08126EE4
ldrb r2, [r6, #0x14]
movs r0, #0xe
ands r0, r2
adds r0, r0, r3
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
adds r5, r1, r0
movs r0, #0x32
ldrsh r1, [r6, r0]
movs r0, #1
orrs r0, r2
adds r0, r0, r3
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
adds r3, r1, r0
movs r1, #0x2e
ldrsh r0, [r7, r1]
movs r2, #0x32
ldrsh r1, [r7, r2]
adds r2, r5, #0
bl CalculateDirectionTo
strb r0, [r7, #0x15]
ldr r0, _0808575C @ =gPlayerState
ldrb r0, [r0, #0x1d]
cmp r0, #2
beq _0808576A
cmp r0, #2
bgt _08085760
cmp r0, #1
beq _08085770
b _08085774
.align 2, 0
_08085758: .4byte gUnk_08126EE4
_0808575C: .4byte gPlayerState
_08085760:
cmp r0, #3
bne _08085774
movs r4, #0x80
lsls r4, r4, #3
b _08085774
_0808576A:
movs r4, #0xc0
lsls r4, r4, #2
b _08085774
_08085770:
movs r4, #0x80
lsls r4, r4, #2
_08085774:
ldr r6, _080858A8 @ =gSineTable
ldrb r0, [r7, #0x15]
lsls r0, r0, #4
adds r0, r0, r6
movs r1, #0
ldrsh r0, [r0, r1]
lsls r4, r4, #0x10
asrs r4, r4, #0x18
adds r1, r4, #0
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r5, #0x80
lsls r5, r5, #1
adds r1, r5, #0
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r7, #0x6c]
adds r1, r1, r0
str r1, [r7, #0x6c]
ldrb r0, [r7, #0x15]
lsls r0, r0, #4
adds r0, #0x80
adds r0, r0, r6
movs r2, #0
ldrsh r0, [r0, r2]
adds r1, r4, #0
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r5, #0
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r7, #0x70]
subs r1, r1, r0
str r1, [r7, #0x70]
_080857C8:
movs r0, #0
mov r1, r8
strb r0, [r1]
_080857CE:
ldr r0, [r7, #0x2c]
str r0, [r7, #0x54]
ldr r0, [r7, #0x30]
str r0, [r7, #0x50]
ldr r0, [r7, #0x6c]
cmp r0, #0
bne _080857E4
ldr r0, [r7, #0x70]
cmp r0, #0
bne _080857E4
b _080859F4
_080857E4:
ldr r0, [r7, #0x70]
ldr r1, _080858AC @ =0xFFFF0000
cmp r0, r1
blt _080857F4
movs r1, #0x80
lsls r1, r1, #9
cmp r0, r1
ble _080857F6
_080857F4:
str r1, [r7, #0x70]
_080857F6:
ldr r0, [r7, #0x6c]
ldr r1, _080858AC @ =0xFFFF0000
cmp r0, r1
blt _08085806
movs r1, #0x80
lsls r1, r1, #9
cmp r0, r1
ble _08085808
_08085806:
str r1, [r7, #0x6c]
_08085808:
ldr r0, _080858B0 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
cmp r0, #0
bne _0808581A
adds r0, r7, #0
bl CreateLargeWaterTrace
_0808581A:
ldr r0, [r7, #0x2c]
ldr r1, [r7, #0x6c]
adds r5, r0, r1
ldr r1, [r7, #0x30]
ldr r2, [r7, #0x70]
adds r3, r1, r2
adds r2, r5, #0
bl CalculateDirectionTo
strb r0, [r7, #0x15]
ldr r0, [r7, #0x6c]
lsls r0, r0, #8
asrs r0, r0, #0x10
movs r4, #0x80
lsls r4, r4, #1
adds r1, r4, #0
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
ldr r5, _080858A8 @ =gSineTable
ldrb r1, [r7, #0x15]
lsls r1, r1, #4
adds r1, r1, r5
movs r2, #0
ldrsh r1, [r1, r2]
bl FixedDiv
strh r0, [r7, #0x24]
ldr r0, [r7, #0x70]
lsls r0, r0, #8
asrs r0, r0, #0x10
adds r1, r4, #0
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
ldrb r1, [r7, #0x15]
lsls r1, r1, #4
adds r1, #0x80
adds r1, r1, r5
movs r2, #0
ldrsh r1, [r1, r2]
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #0x10
rsbs r4, r0, #0
movs r1, #0x24
ldrsh r0, [r7, r1]
cmp r4, r0
ble _08085884
strh r4, [r7, #0x24]
_08085884:
ldrb r0, [r7, #0xb]
cmp r0, #0
beq _080858BC
adds r0, r7, #0
adds r0, #0x7e
movs r2, #0
ldrsh r1, [r0, r2]
ldr r0, _080858B4 @ =0x00000FFF
cmp r1, r0
bgt _080858B8
movs r0, #0x24
ldrsh r1, [r7, r0]
lsls r1, r1, #0xc
ldr r0, [r7, #0x7c]
adds r0, r0, r1
str r0, [r7, #0x7c]
b _080858E0
.align 2, 0
_080858A8: .4byte gSineTable
_080858AC: .4byte 0xFFFF0000
_080858B0: .4byte gRoomTransition
_080858B4: .4byte 0x00000FFF
_080858B8:
movs r0, #0
b _080858DE
_080858BC:
adds r0, r7, #0
adds r0, #0x7e
movs r2, #0
ldrsh r1, [r0, r2]
ldr r0, _080858D8 @ =0xFFFFF000
cmp r1, r0
ble _080858DC
movs r0, #0x24
ldrsh r1, [r7, r0]
lsls r1, r1, #0xc
ldr r0, [r7, #0x7c]
subs r0, r0, r1
str r0, [r7, #0x7c]
b _080858E0
.align 2, 0
_080858D8: .4byte 0xFFFFF000
_080858DC:
movs r0, #1
_080858DE:
strb r0, [r7, #0xb]
_080858E0:
adds r0, r7, #0
bl sub_08085EFC
adds r0, r7, #0
bl ProcessMovement4
ldr r1, [r7, #0x54]
ldr r0, [r7, #0x2c]
cmp r1, r0
bne _0808590C
adds r0, r7, #0
adds r0, #0x85
ldrb r1, [r0]
adds r2, r0, #0
cmp r1, #2
bne _08085906
movs r0, #0
str r0, [r7, #0x6c]
b _08085916
_08085906:
adds r0, r1, #1
strb r0, [r2]
b _08085916
_0808590C:
adds r1, r7, #0
adds r1, #0x85
movs r0, #0
strb r0, [r1]
adds r2, r1, #0
_08085916:
ldr r1, [r7, #0x50]
ldr r0, [r7, #0x30]
cmp r1, r0
bne _0808592E
ldrb r0, [r2]
cmp r0, #2
bne _0808592A
movs r0, #0
str r0, [r7, #0x70]
b _08085932
_0808592A:
adds r0, #1
b _08085930
_0808592E:
movs r0, #0
_08085930:
strb r0, [r2]
_08085932:
ldr r0, _0808595C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #2
ands r0, r1
cmp r0, #0
beq _08085944
adds r0, r7, #0
bl sub_08085F1C
_08085944:
ldr r1, [r7, #0x6c]
cmp r1, #0
beq _08085998
cmp r1, #0
bge _0808596E
movs r0, #0x80
rsbs r0, r0, #0
cmp r1, r0
ble _08085960
movs r0, #0
b _08085964
.align 2, 0
_0808595C: .4byte gPlayerState
_08085960:
adds r0, r1, #0
adds r0, #0x80
_08085964:
str r0, [r7, #0x6c]
ldrh r2, [r7, #0x2a]
movs r1, #0xe0
lsls r1, r1, #4
b _08085982
_0808596E:
cmp r1, #0x7f
bhi _08085976
movs r0, #0
b _0808597A
_08085976:
adds r0, r1, #0
subs r0, #0x80
_0808597A:
str r0, [r7, #0x6c]
ldrh r2, [r7, #0x2a]
movs r1, #0xe0
lsls r1, r1, #8
_08085982:
adds r0, r1, #0
ands r0, r2
cmp r0, r1
bne _08085998
ldr r0, [r7, #0x6c]
cmp r0, #0
bge _08085992
adds r0, #3
_08085992:
asrs r0, r0, #2
rsbs r0, r0, #0
str r0, [r7, #0x6c]
_08085998:
ldr r1, [r7, #0x70]
cmp r1, #0
beq _080859E6
cmp r1, #0
bge _080859C0
movs r0, #0x80
rsbs r0, r0, #0
cmp r1, r0
ble _080859AE
movs r0, #0
b _080859B2
_080859AE:
adds r0, r1, #0
adds r0, #0x80
_080859B2:
str r0, [r7, #0x70]
ldrh r1, [r7, #0x2a]
movs r0, #0xe
ands r0, r1
cmp r0, #0xe
bne _080859E6
b _080859D8
_080859C0:
cmp r1, #0x7f
bhi _080859C8
movs r0, #0
b _080859CC
_080859C8:
adds r0, r1, #0
subs r0, #0x80
_080859CC:
str r0, [r7, #0x70]
ldrh r1, [r7, #0x2a]
movs r0, #0xe0
ands r0, r1
cmp r0, #0xe0
bne _080859E6
_080859D8:
ldr r0, [r7, #0x70]
cmp r0, #0
bge _080859E0
adds r0, #3
_080859E0:
asrs r0, r0, #2
rsbs r0, r0, #0
str r0, [r7, #0x70]
_080859E6:
adds r0, r7, #0
bl sub_08085D28
adds r0, r7, #0
bl sub_08085D60
b _08085A0A
_080859F4:
ldr r0, _08085A18 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0x1f
ands r0, r1
cmp r0, #0
bne _08085A0A
adds r0, r7, #0
movs r1, #8
movs r2, #0xa
bl sub_080A2AF4
_08085A0A:
adds r0, r7, #0
bl sub_08085F48
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08085A18: .4byte gRoomTransition
.syntax divided
asm/non_matching/lilypadLarge/sub_08085D60.inc
-139
View File
@@ -1,139 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r5, r0, #0
ldr r2, _08085D94 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #2
ands r0, r1
cmp r0, #0
beq _08085E64
adds r0, r2, #0
adds r0, #0xa8
ldrb r0, [r0]
cmp r0, #0x12
beq _08085E64
ldrb r0, [r2, #2]
cmp r0, #0
bne _08085E64
ldrb r1, [r5, #0x15]
movs r0, #7
ands r0, r1
cmp r0, #0
bne _08085D98
ldrb r6, [r5, #0x15]
adds r4, r6, #0
b _08085DB0
.align 2, 0
_08085D94: .4byte gPlayerState
_08085D98:
movs r0, #0x10
ands r0, r1
movs r4, #8
cmp r0, #0
beq _08085DA4
movs r4, #0x18
_08085DA4:
ldrb r0, [r5, #0x15]
subs r0, #8
movs r6, #0x10
cmp r0, #0x10
ble _08085DB0
movs r6, #0
_08085DB0:
cmp r4, #0x18
beq _08085DB8
cmp r4, #8
bne _08085E20
_08085DB8:
lsrs r3, r4, #2
ldr r1, _08085E10 @ =gUnk_08120638
adds r0, r3, r1
movs r7, #0
ldrsb r7, [r0, r7]
adds r0, r3, #1
adds r0, r0, r1
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
mov r8, r0
adds r0, r5, #0
adds r1, r7, #0
mov r2, r8
bl sub_080B1AF0
cmp r0, #0xff
bne _08085E20
movs r1, #0x2e
ldrsh r0, [r5, r1]
ldr r2, _08085E14 @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
adds r0, r0, r7
movs r3, #0x32
ldrsh r1, [r5, r3]
ldrh r2, [r2, #8]
subs r1, r1, r2
add r1, r8
adds r2, r4, #0
movs r3, #5
bl sub_080806BC
cmp r0, #0
bne _08085E1C
ldr r0, _08085E18 @ =gPlayerEntity
lsrs r1, r4, #3
bl sub_0807BD14
cmp r0, #0
beq _08085E20
strb r4, [r5, #0x15]
b _08085E52
.align 2, 0
_08085E10: .4byte gUnk_08120638
_08085E14: .4byte gRoomControls
_08085E18: .4byte gPlayerEntity
_08085E1C:
strb r4, [r5, #0x15]
b _08085E6C
_08085E20:
cmp r6, #0
beq _08085E28
cmp r6, #0x10
bne _08085E6C
_08085E28:
lsrs r3, r6, #2
ldr r2, _08085E5C @ =gUnk_08120638
adds r0, r3, r2
movs r1, #0
ldrsb r1, [r0, r1]
adds r0, r3, #1
adds r0, r0, r2
movs r2, #0
ldrsb r2, [r0, r2]
adds r0, r5, #0
bl sub_080B1AF0
cmp r0, #0xff
bne _08085E6C
ldr r0, _08085E60 @ =gPlayerEntity
lsrs r1, r6, #3
bl sub_0807BD14
cmp r0, #0
beq _08085E6C
strb r6, [r5, #0x15]
_08085E52:
adds r0, r5, #0
bl sub_08085E74
b _08085E6C
.align 2, 0
_08085E5C: .4byte gUnk_08120638
_08085E60: .4byte gPlayerEntity
_08085E64:
ldrb r1, [r5, #0x10]
movs r0, #0xdf
ands r0, r1
strb r0, [r5, #0x10]
_08085E6C:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided
asm/non_matching/playerItem13/sub_080ACF2C.inc
-81
View File
@@ -1,81 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
ldr r0, _080ACF60 @ =gUnk_081320E4
str r0, [r4, #0x48]
ldr r5, [r4, #0x54]
adds r6, r5, #0
cmp r5, #0
beq _080ACF64
ldr r0, [r5, #0x2c]
str r0, [r4, #0x2c]
ldr r0, [r5, #0x30]
str r0, [r4, #0x30]
ldr r0, [r5, #0x34]
str r0, [r4, #0x34]
adds r0, r5, #0
adds r0, #0x38
ldrb r1, [r0]
adds r0, r4, #0
adds r0, #0x38
strb r1, [r0]
ldrb r0, [r5, #0x16]
strb r0, [r4, #0x16]
b _080ACFB6
.align 2, 0
_080ACF60: .4byte gUnk_081320E4
_080ACF64:
adds r5, r4, #0
str r4, [r4, #0x54]
movs r0, #2
strb r0, [r4, #0xc]
ldr r3, _080ACFC8 @ =gUnk_081320B8
ldrb r0, [r4, #0xf]
lsls r0, r0, #2
adds r0, r0, r3
ldrb r1, [r0, #1]
movs r0, #0xf
ands r1, r0
ldrb r2, [r4, #0x1a]
movs r0, #0x10
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x1a]
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
strb r6, [r4, #0x16]
ldrb r0, [r4, #0xf]
lsls r0, r0, #2
adds r0, r0, r3
ldrb r1, [r0, #2]
adds r0, r4, #0
adds r0, #0x60
strh r1, [r0]
ldrb r0, [r4, #0xf]
lsls r0, r0, #2
adds r0, r0, r3
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
bl sub_08078D60
_080ACFB6:
ldrb r1, [r5, #8]
adds r0, r4, #0
adds r0, #0x6c
strh r1, [r0]
ldrb r1, [r5, #9]
adds r0, #2
strh r1, [r0]
pop {r4, r5, r6, pc}
.align 2, 0
_080ACFC8: .4byte gUnk_081320B8
.syntax divided
asm/non_matching/playerItemSword/sub_080A758C.inc
-156
View File
@@ -1,156 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r5, r0, #0
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _080A75AC
ldr r1, _080A7654 @ =gPlayerState
ldrb r0, [r1, #4]
cmp r0, #0
bne _080A75AC
ldrb r1, [r1, #2]
movs r0, #0x20
ands r0, r1
cmp r0, #0
bne _080A75AC
bl DeleteThisEntity
_080A75AC:
adds r0, r5, #0
bl AllocMutableHitbox
cmp r0, #0
bne _080A75BA
bl DeleteThisEntity
_080A75BA:
adds r0, r5, #0
movs r1, #1
movs r2, #3
bl LoadSwapGFX
ldr r1, _080A7658 @ =gPlayerEntity
adds r0, r1, #0
adds r0, #0x3c
ldrb r0, [r0]
adds r0, #1
movs r2, #0x20
adds r3, r5, #0
adds r3, #0x3c
movs r4, #0
orrs r0, r2
strb r0, [r3]
adds r1, #0x3b
ldrb r0, [r1]
adds r1, r5, #0
adds r1, #0x3b
strb r0, [r1]
ldrb r1, [r5, #0x11]
movs r0, #0x10
rsbs r0, r0, #0
ands r0, r1
movs r1, #6
orrs r0, r1
strb r0, [r5, #0x11]
adds r0, r5, #0
adds r0, #0x41
strb r4, [r0]
subs r0, #4
strb r4, [r0]
adds r0, #5
strb r4, [r0]
ldrb r0, [r5, #0xc]
adds r0, #1
strb r0, [r5, #0xc]
movs r0, #0xff
strb r0, [r5, #0x1e]
adds r0, r5, #0
bl sub_0801766C
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _080A76BC
ldr r2, _080A7654 @ =gPlayerState
ldrb r1, [r2, #2]
movs r0, #0x20
ands r0, r1
cmp r0, #0
beq _080A767A
ldrb r1, [r5, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r5, #0x10]
movs r0, #2
strb r0, [r5, #0xb]
adds r0, r2, #0
adds r0, #0x3e
ldrb r0, [r0]
lsls r0, r0, #0x1e
lsrs r0, r0, #0x1d
adds r0, #8
adds r1, r5, #0
adds r1, #0x44
strb r0, [r1]
adds r0, r5, #0
adds r0, #0x68
ldrb r0, [r0]
cmp r0, #1
beq _080A765C
cmp r0, #6
bne _080A7664
subs r1, #4
movs r0, #0x1a
b _080A766A
.align 2, 0
_080A7654: .4byte gPlayerState
_080A7658: .4byte gPlayerEntity
_080A765C:
adds r1, r5, #0
adds r1, #0x40
movs r0, #0x18
b _080A766A
_080A7664:
adds r1, r5, #0
adds r1, #0x40
movs r0, #0x19
_080A766A:
strb r0, [r1]
ldrb r0, [r5, #0xc]
adds r0, #1
strb r0, [r5, #0xc]
adds r0, r5, #0
bl sub_080A7824
b _080A7692
_080A767A:
adds r0, r2, #0
adds r0, #0x3e
ldrb r0, [r0]
lsls r0, r0, #0x1e
lsrs r0, r0, #0x1d
adds r0, #4
adds r1, r5, #0
adds r1, #0x44
strb r0, [r1]
adds r0, r5, #0
bl sub_080A76CC
_080A7692:
ldr r0, _080A76B0 @ =gPlayerState
str r5, [r0, #0x2c]
adds r0, r5, #0
bl sub_08079BD8
ldr r4, _080A76B4 @ =gUnk_0812906C
ldr r0, _080A76B8 @ =gUnk_08129068
bl GetRandomByWeight
lsls r0, r0, #1
adds r0, r0, r4
ldrh r0, [r0]
bl SoundReq
b _080A76C2
.align 2, 0
_080A76B0: .4byte gPlayerState
_080A76B4: .4byte gUnk_0812906C
_080A76B8: .4byte gUnk_08129068
_080A76BC:
adds r0, r5, #0
bl sub_080A76CC
_080A76C2:
movs r0, #0x87
lsls r0, r0, #1
bl SoundReq
pop {r4, r5, pc}
.syntax divided
asm/non_matching/playerItemSword/sub_080A76CC.inc
-180
View File
@@ -1,180 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _080A76D8
b _080A77DC
_080A76D8:
ldr r5, _080A771C @ =gPlayerState
ldr r0, [r5, #0x2c]
cmp r0, r4
beq _080A76E4
bl DeleteThisEntity
_080A76E4:
ldrb r0, [r5, #4]
cmp r0, #0
bne _080A76F2
str r0, [r5, #0x2c]
strb r0, [r5, #0x1b]
bl DeleteThisEntity
_080A76F2:
ldrb r2, [r5, #0x1b]
cmp r2, #0
beq _080A7744
adds r1, r4, #0
adds r1, #0x40
movs r0, #0xd
strb r0, [r1]
movs r0, #0x40
ands r0, r2
cmp r0, #0
beq _080A7728
adds r0, r4, #0
adds r0, #0x68
ldrb r0, [r0]
cmp r0, #1
beq _080A7720
cmp r0, #6
bne _080A7724
movs r0, #0xa
b _080A7726
.align 2, 0
_080A771C: .4byte gPlayerState
_080A7720:
movs r0, #8
b _080A7726
_080A7724:
movs r0, #9
_080A7726:
strb r0, [r1]
_080A7728:
ldr r0, _080A7740 @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x20
ands r0, r1
cmp r0, #0
beq _080A77C4
movs r0, #0x8b
lsls r0, r0, #1
bl SoundReq
b _080A77C4
.align 2, 0
_080A7740: .4byte gPlayerEntity
_080A7744:
ldr r0, [r5, #0x30]
movs r1, #0x80
lsls r1, r1, #0x14
ands r0, r1
cmp r0, #0
beq _080A776A
adds r0, r4, #0
adds r0, #0x68
ldrb r0, [r0]
cmp r0, #6
bne _080A7762
adds r1, r4, #0
adds r1, #0x40
movs r0, #0xc
b _080A7768
_080A7762:
adds r1, r4, #0
adds r1, #0x40
movs r0, #0xb
_080A7768:
strb r0, [r1]
_080A776A:
ldr r0, _080A77D0 @ =gPlayerState
adds r0, #0x3e
ldrb r0, [r0]
movs r2, #3
ands r2, r0
cmp r2, #0
beq _080A77C4
ldr r0, _080A77D4 @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x40
ands r0, r1
cmp r0, #0
beq _080A77C4
movs r1, #0x12
cmp r2, #1
bne _080A778E
movs r1, #0x14
_080A778E:
adds r0, r4, #0
movs r2, #0
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _080A77C4
ldrb r1, [r4, #0x1e]
lsls r1, r1, #1
ldr r0, _080A77D8 @ =gUnk_081292E2
adds r1, r1, r0
movs r0, #1
ldrsb r0, [r1, r0]
ldrh r3, [r4, #0x32]
adds r0, r0, r3
strh r0, [r2, #0x32]
ldrb r1, [r1]
lsls r1, r1, #0x18
asrs r1, r1, #0x18
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x19
cmp r0, #0
bge _080A77BE
rsbs r1, r1, #0
_080A77BE:
ldrh r0, [r4, #0x2e]
adds r0, r0, r1
strh r0, [r2, #0x2e]
_080A77C4:
ldr r1, _080A77D4 @ =gPlayerEntity
adds r0, r4, #0
bl sub_080A78B8
b _080A7806
.align 2, 0
_080A77D0: .4byte gPlayerState
_080A77D4: .4byte gPlayerEntity
_080A77D8: .4byte gUnk_081292E2
_080A77DC:
ldr r1, _080A7810 @ =gPlayerState
ldrb r0, [r1, #4]
cmp r0, #0
beq _080A7814
ldr r0, [r1, #0x2c]
adds r2, r0, #0
adds r2, #0x40
ldrb r0, [r2]
cmp r0, #0
beq _080A7814
ldrb r1, [r4, #0x10]
movs r0, #0x80
orrs r0, r1
strb r0, [r4, #0x10]
ldrb r1, [r2]
adds r0, r4, #0
adds r0, #0x40
strb r1, [r0]
adds r0, r4, #0
bl sub_080A7A54
_080A7806:
adds r0, r4, #0
bl sub_080A7A84
b _080A7820
.align 2, 0
_080A7810: .4byte gPlayerState
_080A7814:
movs r0, #0xff
strb r0, [r4, #0x1e]
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x10]
_080A7820:
pop {r4, r5, pc}
.align 2, 0
.syntax divided
assets/assets.json
-1011
View File
File diff suppressed because it is too large Load Diff
data/animations/object/furniture.s
-32
View File
@@ -1,32 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08122128:: @ 08122128
.incbin "furniture/gUnk_08122128.bin"
gUnk_08122198:: @ 08122198
.incbin "furniture/gUnk_08122198.bin"
gUnk_081221A8:: @ 081221A8
.incbin "furniture/gUnk_081221A8.bin"
gUnk_081221B8:: @ 081221B8
.incbin "furniture/gUnk_081221B8.bin"
gUnk_081221C8:: @ 081221C8
.incbin "furniture/gUnk_081221C8.bin"
gUnk_081221D8:: @ 081221D8
.incbin "furniture/gUnk_081221D8.bin"
gUnk_081221E8:: @ 081221E8
.incbin "furniture/gUnk_081221E8.bin"
gUnk_081221F8:: @ 081221F8
.incbin "furniture/gUnk_081221F8.bin"
gUnk_08122208:: @ 08122208
.incbin "furniture/gUnk_08122208.bin"
data/const/demo.s
-18
View File
@@ -1,18 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
.ifdef DEMO_USA
@ TODO choose demo screen
demoFunctions::
.4byte sub_080A2E40
.4byte sub_080A2FD0
.4byte sub_080A2F8C
gUnk_08127C98::
.incbin "demoScreen/gUnk_08127C98_DEMO_USA.bin"
gUnk_08127CC8::
.incbin "demoScreen/gUnk_08127CC8_DEMO_USA.bin"
.endif
data/const/manager/manager12.s
-49
View File
@@ -1,49 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108398:: @ 08108398
.incbin "manager12/gUnk_08108398.bin"
gUnk_081083AE:: @ 081083AE
.incbin "manager12/gUnk_081083AE.bin"
gUnk_081083C4:: @ 081083C4
.incbin "manager12/gUnk_081083C4.bin"
gUnk_081083DA:: @ 081083DA
.incbin "manager12/gUnk_081083DA.bin"
gUnk_081083F2:: @ 081083F2
.incbin "manager12/gUnk_081083F2.bin"
gUnk_08108408:: @ 08108408
.ifdef EU
@ TODO only small differences
.incbin "manager12/gUnk_08108408_EU.bin"
.else
.incbin "manager12/gUnk_08108408_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
.ifdef EU
@ TODO only small differences
.incbin "manager12/gUnk_08108408_2_EU.bin"
.else
.incbin "manager12/gUnk_08108408_3_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
gUnk_08108468:: @ 08108468
.ifdef EU
@ TODO only small differences
.incbin "manager12/gUnk_08108468_EU.bin"
.else
.incbin "manager12/gUnk_08108468_1_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
.ifdef EU
@ TODO only small differences
.incbin "manager12/gUnk_08108468_2_EU.bin"
.else
.incbin "manager12/gUnk_08108468_3_USA-JP-DEMO_USA-DEMO_JP.bin"
.endif
.incbin "manager12/gUnk_08108468_4.bin"
data/const/manager/manager13.s
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081084C8:: @ 081084C8
.incbin "manager13/gUnk_081084C8.bin"
gUnk_08108530:: @ 08108530
.incbin "manager13/gUnk_08108530.bin"
data/const/manager/manager15.s
-49
View File
@@ -1,49 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081085B8:: @ 081085B8
.incbin "manager15/gUnk_081085B8.bin"
gUnk_081085D8:: @ 081085D8
.4byte sub_0805A298
.4byte sub_0805A2E4
.4byte sub_0805A3D4
.4byte sub_0805A3D4
.4byte sub_0805A500
.4byte sub_0805A660
.4byte sub_0805A664
.4byte sub_0805A804
gUnk_081085F8:: @ 081085F8
.4byte 00000000
.4byte sub_0805A464
.4byte sub_0805A370
.4byte sub_0805A394
.4byte nullsub_496
gUnk_0810860C:: @ 0810860C
.4byte 00000000
.4byte sub_0805A464
.4byte sub_0805A480
.4byte sub_0805A498
.4byte sub_0805A4B4
gUnk_08108620:: @ 08108620
.4byte 00000000
.4byte sub_0805A5FC
.4byte sub_0805A618
.4byte sub_0805A628
.4byte sub_0805A64C
.4byte sub_0805A65C
gUnk_08108638:: @ 08108638
.4byte sub_0805A6E8
.4byte sub_0805A758
.4byte sub_0805A76C
.4byte sub_0805A7E4
gUnk_08108648:: @ 08108648
.incbin "manager15/gUnk_08108648.bin"
data/const/manager/manager17.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108654:: @ 08108654
.4byte sub_0805AD60
.4byte sub_0805AD80
data/const/manager/manager18.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0810865C:: @ 0810865C
.incbin "manager18/gUnk_0810865C.bin"
data/const/manager/manager1B.s
-18
View File
@@ -1,18 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108C28:: @ 08108C28
.incbin "manager1B/gUnk_08108C28.bin"
gUnk_08108C44:: @ 08108C44
.incbin "manager1B/gUnk_08108C44.bin"
gUnk_08108C54:: @ 08108C54
.4byte sub_0805B448
.4byte sub_0805B474
gUnk_08108C5C:: @ 08108C5C
.incbin "manager1B/gUnk_08108C5C.bin"
data/const/manager/manager1C.s
-15
View File
@@ -1,15 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108C64:: @ 08108C64
.4byte sub_0805B554
.4byte sub_0805B55C
gUnk_08108C6C:: @ 08108C6C
.incbin "manager1C/gUnk_08108C6C.bin"
gUnk_08108C7C:: @ 08108C7C
.incbin "manager1C/gUnk_08108C7C.bin"
data/const/manager/manager1D.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108C80:: @ 08108C80
.4byte sub_0805B5E0
.4byte sub_0805B638
gUnk_08108C88:: @ 08108C88
.incbin "manager1D/gUnk_08108C88.bin"
data/const/manager/manager1F.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108C94:: @ 08108C94
.4byte sub_0805B70C
.4byte sub_0805B744
gUnk_08108C9C:: @ 08108C9C
.incbin "manager1F/gUnk_08108C9C.bin"
data/const/manager/manager23.s
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108CCC:: @ 08108CCC
.4byte sub_0805BC8C
.4byte sub_0805BCD4
.4byte sub_0805BD5C
.4byte sub_0805BDB4
data/const/manager/manager24.s
-20
View File
@@ -1,20 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108CDC:: @ 08108CDC
.4byte sub_0805BF30
.4byte sub_0805BF78
.4byte sub_0805BFA4
gUnk_08108CE8:: @ 08108CE8
.4byte sub_0805C050
.4byte sub_0805C178
.4byte sub_0805C294
.4byte sub_0805C3B4
.4byte sub_0805C4E0
gUnk_08108CFC:: @ 08108CFC
.incbin "manager24/gUnk_08108CFC.bin"
data/const/manager/manager2B.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D30:: @ 08108D30
.4byte sub_0805D02C
.4byte sub_0805D0C4
.4byte sub_0805D0FC
data/const/manager/manager2E.s
-19
View File
@@ -1,19 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D3C:: @ 08108D3C
.4byte sub_0805D268
.4byte sub_0805D32C
gUnk_08108D44:: @ 08108D44
.4byte sub_0805D280
.4byte sub_0805D2C0
.4byte sub_0805D2F4
gUnk_08108D50:: @ 08108D50
.4byte sub_0805D344
.4byte sub_0805D36C
.4byte sub_0805D384
data/const/manager/manager31.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D5C:: @ 08108D5C
.incbin "manager31/gUnk_08108D5C.bin"
data/const/manager/manager32.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D74:: @ 08108D74
.incbin "manager32/gUnk_08108D74.bin"
gUnk_08108D7C:: @ 08108D7C
.4byte sub_0805D7DC
.4byte sub_0805D860
.4byte sub_0805D900
.4byte sub_0805D98C
data/const/manager/manager34.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D8C:: @ 08108D8C
.4byte sub_0805DBB4
.4byte sub_0805DBCC
.4byte nullsub_498
data/const/manager/manager35.s
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D98:: @ 08108D98
.4byte sub_0805DC9C
.4byte sub_0805DCC8
.4byte sub_0805DD24
.4byte sub_0805DD68
data/const/manager/manager36.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108DA8:: @ 08108DA8
.incbin "manager36/gUnk_08108DA8.bin"
data/const/manager/manager37.s
-20
View File
@@ -1,20 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108DBC:: @ 08108DBC
.4byte sub_0805DE50
.4byte sub_0805DFE8
gUnk_08108DC4:: @ 08108DC4
.4byte sub_0805DE68
.4byte sub_0805DEB8
.4byte sub_0805DF4C
.4byte sub_0805DF98
.4byte sub_0805DFCC
gUnk_08108DD8:: @ 08108DD8
.4byte sub_0805E000
.4byte sub_0805E078
data/const/manager/manager38.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108DE0:: @ 08108DE0
.4byte sub_0805E0C0
.4byte sub_0805E0F4
data/const/manager/manager4.s
-209
View File
@@ -1,209 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08107C70:: @ 08107C70
.4byte sub_0805786C
.4byte sub_08057920
gUnk_08107C78:: @ 08107C78
.incbin "manager4/gUnk_08107C78.bin"
gUnk_08107C80:: @ 08107C80
.incbin "manager4/gUnk_08107C80.bin"
gUnk_08107C98:: @ 08107C98
.incbin "manager4/gUnk_08107C98.bin"
gUnk_08107CC0:: @ 08107CC0
.incbin "manager4/gUnk_08107CC0.bin"
gUnk_08107CD0:: @ 08107CD0
.incbin "manager4/gUnk_08107CD0.bin"
gUnk_08107CE0:: @ 08107CE0
.incbin "manager4/gUnk_08107CE0.bin"
gUnk_08107CF8:: @ 08107CF8
.incbin "manager4/gUnk_08107CF8.bin"
gUnk_08107D08:: @ 08107D08
.incbin "manager4/gUnk_08107D08.bin"
gUnk_08107D20:: @ 08107D20
.incbin "manager4/gUnk_08107D20.bin"
gUnk_08107D38:: @ 08107D38
.incbin "manager4/gUnk_08107D38.bin"
gUnk_08107D48:: @ 08107D48
.incbin "manager4/gUnk_08107D48.bin"
gUnk_08107D68:: @ 08107D68
.incbin "manager4/gUnk_08107D68.bin"
gUnk_08107D78:: @ 08107D78
.incbin "manager4/gUnk_08107D78.bin"
gUnk_08107D90:: @ 08107D90
.incbin "manager4/gUnk_08107D90.bin"
gUnk_08107DA0:: @ 08107DA0
.incbin "manager4/gUnk_08107DA0.bin"
diggingCaveEntrances:: @ 08107DC0
.4byte gUnk_08107C80
.4byte gUnk_08107C78
.4byte gUnk_08107CC0
.4byte gUnk_08107C98
.4byte gUnk_08107CF8
.4byte gUnk_08107C78
.4byte gUnk_08107CD0
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107CE0
.4byte gUnk_08107D08
.4byte gUnk_08107D20
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107D38
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107D48
.4byte gUnk_08107D68
.4byte gUnk_08107C78
.4byte gUnk_08107D78
.4byte gUnk_08107D90
.4byte gUnk_08107C78
.4byte gUnk_08107DA0
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
.4byte gUnk_08107C78
data/const/manager/managerD.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108308:: @ 08108308
.4byte sub_08058DE8
.4byte sub_08058E18
.4byte sub_08058E34
data/const/npc/cow.s
-21
View File
@@ -1,21 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08111914:: @ 08111914
.4byte sub_08068FC0
.4byte sub_08069018
.4byte sub_08069068
.4byte sub_08069124
.4byte sub_080691E0
gUnk_08111928:: @ 08111928
.4byte sub_08069148
.4byte sub_08069168
.4byte sub_08069188
.4byte sub_080691BC
gUnk_08111938:: @ 08111938
.incbin "cow/gUnk_08111938.bin"
data/const/npc/townMinish.s
-158
View File
@@ -1,158 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081125F4:: @ 081125F4
.incbin "townMinish/gUnk_081125F4.bin"
gUnk_08112674:: @ 08112674
.incbin "townMinish/gUnk_08112674.bin"
gUnk_081126D4:: @ 081126D4
.incbin "townMinish/gUnk_081126D4.bin"
gUnk_081126E4:: @ 081126E4
.incbin "townMinish/gUnk_081126E4.bin"
gUnk_081126E8:: @ 081126E8
.4byte sub_0806ABFC
.4byte sub_0806AC3C
gUnk_081126F0:: @ 081126F0
.incbin "townMinish/gUnk_081126F0.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_1.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_2.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_3.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_4.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_5.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_6.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_7.bin"
.4byte sub_0806B004
.incbin "townMinish/gUnk_081126F0_8.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_9.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_10.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_11.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_12.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_13.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_14.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_15.bin"
.4byte sub_0806B064
.incbin "townMinish/gUnk_081126F0_16.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_17.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_18.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_19.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_20.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_21.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_22.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_23.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_24.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_25.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_26.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_27.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_28.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_29.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_30.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_31.bin"
.4byte sub_0806B098
.incbin "townMinish/gUnk_081126F0_32.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_33.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_34.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_35.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_36.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_37.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_38.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_39.bin"
.4byte sub_0806B0E0
.incbin "townMinish/gUnk_081126F0_40.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_41.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_42.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_43.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_44.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_45.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_46.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_47.bin"
.4byte sub_0806B134
.incbin "townMinish/gUnk_081126F0_48.bin"
gUnk_08112BF0:: @ 08112BF0
.4byte sub_0806B004
.4byte sub_0806B064
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806B098
.4byte sub_0806B098
.4byte sub_0806B0E0
.4byte sub_0806B134
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
.4byte sub_0806AFBC
gUnk_08112C40:: @ 08112C40
.incbin "townMinish/gUnk_08112C40.bin"
gUnk_08112C4A:: @ 08112C4A
.incbin "townMinish/gUnk_08112C4A.bin"
gUnk_08112C50:: @ 08112C50
.incbin "townMinish/gUnk_08112C50.bin"
gUnk_08112C5C:: @ 08112C5C
.incbin "townMinish/gUnk_08112C5C.bin"
gUnk_08112C60:: @ 08112C60
.incbin "townMinish/gUnk_08112C60.bin"
data/const/npc/windTribespeople.s
-83
View File
@@ -1,83 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08113A1C:: @ 08113A1C
.incbin "windTribespeople/gUnk_08113A1C.bin"
gUnk_08113A7C:: @ 08113A7C
.4byte sub_0806C798
.4byte sub_0806C7D4
.4byte sub_0806C834
.4byte sub_0806C85C
gUnk_08113A8C:: @ 08113A8C
.4byte sub_0806C928
.4byte sub_0806C944
.4byte sub_0806C978
.4byte sub_0806C99C
.4byte sub_0806C9D0
.4byte sub_0806C928
.4byte sub_0806C9F8
.4byte sub_0806C99C
.4byte sub_0806CA1C
.4byte sub_0806CA2C
.4byte sub_0806CA3C
.4byte sub_0806CA4C
gUnk_08113ABC:: @ 08113ABC
.incbin "windTribespeople/gUnk_08113ABC.bin"
gUnk_08113B0C:: @ 08113B0C
.incbin "windTribespeople/gUnk_08113B0C.bin"
gUnk_08113B12:: @ 08113B12
.incbin "windTribespeople/gUnk_08113B12.bin"
gUnk_08113B16:: @ 08113B16
.incbin "windTribespeople/gUnk_08113B16.bin"
gUnk_08113B1E:: @ 08113B1E
.incbin "windTribespeople/gUnk_08113B1E.bin"
gUnk_08113B22:: @ 08113B22
.incbin "windTribespeople/gUnk_08113B22.bin"
gUnk_08113B28:: @ 08113B28
.ifdef JP
@ TODO only small differences
.incbin "windTribespeople/gUnk_08113B28_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "windTribespeople/gUnk_08113B28_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "windTribespeople/gUnk_08113B28_2_EU.bin"
.else
.incbin "windTribespeople/gUnk_08113B28_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_08113B30:: @ 08113B30
.ifdef JP
@ TODO only small differences
.incbin "windTribespeople/gUnk_08113B30_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "windTribespeople/gUnk_08113B30_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "windTribespeople/gUnk_08113B30_2_EU.bin"
.else
.incbin "windTribespeople/gUnk_08113B30_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_08113B38:: @ 08113B38
.incbin "windTribespeople/gUnk_08113B38.bin"
data/const/object/backgroundCloud.s
-16
View File
@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121EA4:: @ 08121EA4
.4byte sub_0808F658
.4byte sub_0808F6E0
.4byte sub_0808F70C
gUnk_08121EB0:: @ 08121EB0
.incbin "backgroundCloud/gUnk_08121EB0.bin"
gUnk_08121EB3:: @ 08121EB3
.incbin "backgroundCloud/gUnk_08121EB3.bin"
data/const/object/bakerOven.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123E20:: @ 08123E20
.4byte sub_0809CC74
.4byte sub_0809CD0C
.4byte sub_0809CDB4
data/const/object/bell.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123384:: @ 08123384
.4byte sub_08097D90
.4byte sub_08097DCC
data/const/object/bigVortex.s
-16
View File
@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812367C:: @ 0812367C
.4byte sub_08098D1C
.4byte sub_08098D6C
.4byte sub_08098D9C
.4byte sub_08098DC4
.4byte sub_08098E34
gUnk_08123690:: @ 08123690
.incbin "bigVortex/gUnk_08123690.bin"
data/const/object/cloud.s
-30
View File
@@ -1,30 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124798:: @ 08124798
.4byte sub_0809F4DC
.4byte sub_0809F700
gUnk_081247A0:: @ 081247A0
.4byte sub_0809F514
.4byte sub_0809F548
.4byte sub_0809F5B0
gUnk_081247AC:: @ 081247AC
.4byte sub_0809F5DC
.4byte sub_0809F5F0
.4byte sub_0809F61C
.4byte sub_0809F69C
.4byte sub_0809F6CC
gUnk_081247C0:: @ 081247C0
.incbin "cloud/gUnk_081247C0.bin"
gUnk_081247C8:: @ 081247C8
.incbin "cloud/gUnk_081247C8.bin"
gUnk_081247D0:: @ 081247D0
.incbin "cloud/gUnk_081247D0.bin"
data/const/object/fileScreenObjects.s
-55
View File
@@ -1,55 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121C64:: @ 08121C64
.4byte sub_0808EA28
.4byte sub_0808EA28
.4byte sub_0808EA28
.4byte sub_0808EA28
.4byte sub_0808ECBC
.4byte sub_0808ECBC
.4byte sub_0808ECBC
.4byte sub_0808ECBC
.4byte sub_0808ED64
.4byte sub_0808ED98
.4byte sub_0808EE00
.4byte sub_0808EE00
.4byte sub_0808EE00
.4byte sub_0808EE00
.4byte sub_0808EE00
.4byte sub_0808EB74
.4byte sub_0808EBB8
.4byte nullsub_522
.4byte sub_0808EE98
.4byte sub_0808EED8
.4byte sub_0808EED8
.4byte sub_0808EF24
.4byte sub_0808EF24
.4byte sub_0808E7D8
.4byte sub_0808E988
.4byte sub_0808E9F4
gUnk_08121CCC:: @ 08121CCC
.4byte sub_0808E7F0
.4byte sub_0808E818
gUnk_08121CD4:: @ 08121CD4
.incbin "fileScreenObjects/gUnk_08121CD4.bin"
gUnk_08121D10:: @ 08121D10
.incbin "fileScreenObjects/gUnk_08121D10.bin"
gUnk_08121D18:: @ 08121D18
.incbin "fileScreenObjects/gUnk_08121D18.bin"
gUnk_08121D38:: @ 08121D38
.incbin "fileScreenObjects/gUnk_08121D38.bin"
gUnk_08121D48:: @ 08121D48
.incbin "fileScreenObjects/gUnk_08121D48.bin"
gUnk_08121D54:: @ 08121D54
.incbin "fileScreenObjects/gUnk_08121D54.bin"
data/const/object/fireplace.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123D98:: @ 08123D98
.4byte sub_0809B708
.4byte sub_0809B7A0
data/const/object/furniture.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121EF8:: @ 08121EF8
.incbin "furniture/gUnk_08121EF8.bin"
data/const/object/giantLeaf.s
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121750:: @ 08121750
.incbin "giantLeaf/gUnk_08121750.bin"
gUnk_0812176A:: @ 0812176A
.incbin "giantLeaf/gUnk_0812176A.bin"
data/const/object/heartContainer.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121C58:: @ 08121C58
.incbin "heartContainer/gUnk_08121C58.bin"
data/const/object/hiddenLadderDown.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08122604:: @ 08122604
.4byte sub_08091F14
.4byte sub_08092000
data/const/object/houseDoorExterior.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081206AC:: @ 081206AC
.incbin "houseDoorExterior/gUnk_081206AC.bin"
gUnk_081206B4:: @ 081206B4
.4byte sub_080866D8
.4byte sub_080867E4
.4byte sub_0808681C
.4byte sub_080868B0
data/const/object/jailBars.s
-17
View File
@@ -1,17 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124950:: @ 08124950
.4byte sub_080A08C4
.4byte sub_080A0910
.4byte sub_080A0938
.4byte nullsub_127
gUnk_08124960:: @ 08124960
.incbin "jailBars/gUnk_08124960.bin"
gUnk_0812497A:: @ 0812497A
.incbin "jailBars/gUnk_0812497A.bin"
data/const/object/jarPortal.s
-13
View File
@@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121488:: @ 08121488
.4byte sub_0808BE9C
.4byte sub_0808BF14
.4byte sub_0808BF58
.4byte sub_0808BFD8
.4byte sub_0808C0AC
data/const/object/lightableSwitch.s
-19
View File
@@ -1,19 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081243B4:: @ 081243B4
.4byte sub_0809EA1C
.4byte sub_0809EB68
gUnk_081243BC:: @ 081243BC
.4byte sub_0809EA34
.4byte sub_0809EA80
gUnk_081243C4:: @ 081243C4
.4byte sub_0809EB80
.4byte sub_0809EBD8
.4byte sub_0809EC08
.4byte nullsub_126
data/const/object/lilypadLarge.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08120608:: @ 08120608
.4byte sub_08085504
.4byte sub_080855E8
.4byte sub_08085A1C
.4byte sub_08085C5C
.4byte sub_08085CDC
.4byte sub_08085D10
gUnk_08120620:: @ 08120620
.incbin "lilypadLarge/gUnk_08120620.bin"
gUnk_0812062C:: @ 0812062C
.4byte sub_08085A44
.4byte sub_08085A98
.4byte sub_08085B40
gUnk_08120638:: @ 08120638
.incbin "lilypadLarge/gUnk_08120638.bin"
gUnk_08120640:: @ 08120640
.incbin "lilypadLarge/gUnk_08120640.bin"
data/const/object/lilypadSmall.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123318:: @ 08123318
.incbin "lilypadSmall/gUnk_08123318.bin"
data/const/object/mask.s
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
MaskActionFuncs:: @ 081227A4
.4byte sub_080929A4
.4byte sub_08092A94
.4byte sub_08092B0C
.4byte Mask_Delete+1
data/const/object/metalDoor.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812493C:: @ 0812493C
.4byte sub_080A0684
.4byte sub_080A0718
.4byte sub_080A074C
.4byte sub_080A07BC
.4byte sub_080A07F0
data/const/object/mineralWaterSource.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
MineralWaterSourceActionFuncs:: @ 08123298
.4byte MineralWaterSource_Init
.4byte sub_080973DC
MineralWaterSourceParameters:: @ 081232A0
.incbin "mineralWaterSource/MineralWaterSourceParameters.bin"
data/const/object/minishLight.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081247F8:: @ 081247F8
.4byte sub_0809F840
.4byte sub_0809F868
data/const/object/minishSizedEntrance.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08122254:: @ 08122254
.4byte sub_08090EC0
.4byte sub_08090F00
gUnk_0812225C:: @ 0812225C
.incbin "minishSizedEntrance/gUnk_0812225C.bin"
data/const/object/object1D.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081208A0:: @ 081208A0
.4byte sub_080874F8
.4byte nullsub_117
gUnk_081208A8:: @ 081208A8
.incbin "object1D/gUnk_081208A8.bin"
.4byte gUnk_081208A8
.incbin "object1D/gUnk_081208A8_1.bin"
data/const/object/object31.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812119C:: @ 0812119C
.4byte sub_0808A9DC
.4byte nullsub_519
data/const/object/object49.s
-31
View File
@@ -1,31 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121E5C:: @ 08121E5C
.4byte sub_0808F0B8
.4byte sub_0808F1E0
.4byte sub_0808F2C0
.4byte sub_0808F370
.4byte sub_0808F0B8
.4byte sub_0808F3DC
.4byte sub_0808F3DC
.4byte sub_0808F3DC
.4byte sub_0808F3DC
.4byte sub_0808F498
.4byte sub_0808F554
gUnk_08121E88:: @ 08121E88
.4byte sub_0808F0D0
.4byte sub_0808F14C
.4byte sub_0808F170
.4byte sub_0808F1A4
gUnk_08121E98:: @ 08121E98
.4byte sub_0808F1F8
.4byte sub_0808F244
gUnk_08121EA0:: @ 08121EA0
.incbin "object49/gUnk_08121EA0.bin"
data/const/object/object86.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081237F8:: @ 081237F8
.4byte sub_08099DD0
.4byte sub_08099E10
.4byte sub_08099E58
.4byte sub_08099E8C
.4byte nullsub_534
data/const/object/objectAF.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081248C4:: @ 081248C4
.4byte sub_080A05A4
.4byte sub_080A05F4
.4byte sub_080A0624
data/const/object/palaceArchway.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081246EC:: @ 081246EC
.4byte sub_0809F2A0
.4byte nullsub_537
data/const/object/pinwheel.s
-25
View File
@@ -1,25 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08125050:: @ 08125050
.ifdef JP
.incbin "pinwheel/gUnk_08125050_JP.bin"
.else
.ifdef DEMO_JP
.incbin "pinwheel/gUnk_08125050_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "pinwheel/gUnk_08125050_2_EU.bin"
.else
.incbin "pinwheel/gUnk_08125050_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_0812505C:: @ 0812505C
.4byte sub_080A23DC
.4byte sub_080A2420
.4byte sub_080A243C
data/const/object/smoke.s
-16
View File
@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121060:: @ 08121060
.4byte sub_0808A40C
.4byte sub_0808A46C
gUnk_08121068:: @ 08121068
.incbin "smoke/gUnk_08121068.bin"
gUnk_08121070:: @ 08121070
.4byte sub_0808A484
.4byte sub_0808A4D0
data/const/object/swordsmanNewsletter.s
-15
View File
@@ -1,15 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081228A8:: @ 081228A8
.incbin "swordsmanNewsletter/gUnk_081228A8.bin"
gUnk_081228B0:: @ 081228B0
.4byte sub_080933D8
.4byte sub_080933FC
gUnk_081228B8:: @ 081228B8
.incbin "swordsmanNewsletter/gUnk_081228B8.bin"
data/const/object/thoughtBubble.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
ThoughtBubble_SFX:: @ 08122590
.incbin "thoughtBubble/ThoughtBubble_SFX.bin"
ThoughtBubble_Behaviors:: @ 08122598
.4byte ThoughtBubble_Init
.4byte ThoughtBubble_Update
data/const/object/well.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124C08:: @ 08124C08
.4byte sub_080A0EB0
.4byte sub_080A0EF0
data/const/object/windcrest.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08125010:: @ 08125010
.incbin "windcrest/gUnk_08125010.bin"
data/const/playerItem/playerItemFireRodProjectile.s
-13
View File
@@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08127270:: @ 08127270
.4byte sub_080A3084
.4byte sub_080A310C
gUnk_08127278:: @ 08127278
.incbin "playerItemFireRodProjectile/gUnk_08127278.bin"
data/const/playerItem/playerItemHeldObject.s
-26
View File
@@ -1,26 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081320A8:: @ 081320A8
.4byte sub_080ACF2C
.4byte sub_080ACFCC
.4byte sub_080AD040
.4byte sub_080AD274
gUnk_081320B8:: @ 081320B8
.incbin "playerItemHeldObject/gUnk_081320B8.bin"
gUnk_081320C4:: @ 081320C4
.incbin "playerItemHeldObject/gUnk_081320C4.bin"
gUnk_081320CC:: @ 081320CC
.incbin "playerItemHeldObject/gUnk_081320CC.bin"
gUnk_081320D4:: @ 081320D4
.incbin "playerItemHeldObject/gUnk_081320D4.bin"
gUnk_081320E4:: @ 081320E4
.incbin "playerItemHeldObject/gUnk_081320E4.bin"
data/const/playerItem/playerItemSword.s
-28
View File
@@ -1,28 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812905C:: @ 0812905C
.4byte sub_080A758C
.4byte sub_080A76CC
.4byte sub_080A7824
gUnk_08129068:: @ 08129068
.incbin "playerItemSword/gUnk_08129068.bin"
gUnk_0812906C:: @ 0812906C
.incbin "playerItemSword/gUnk_0812906C.bin"
gUnk_08129072:: @ 08129072
.incbin "playerItemSword/gUnk_08129072.bin"
gUnk_0812908E:: @ 0812908E
.incbin "playerItemSword/gUnk_0812908E.bin"
gUnk_08129096:: @ 08129096
.incbin "playerItemSword/gUnk_08129096.bin"
gUnk_081292E2:: @ 081292E2
.incbin "playerItemSword/gUnk_081292E2.bin"
include/functions.h
+1 -1
View File
@@ -41,7 +41,7 @@ extern void SetDirtTile(u32);
* @param basePosition the position the offsets in tileData are based on
* @param layer the tile layer
*/
extern void SetMultipleTiles(TileData* tileData, u32 basePosition, u32 layer);
extern void SetMultipleTiles(const TileData* tileData, u32 basePosition, u32 layer);
extern void TryLoadPrologueHyruleTown(void);
extern void UnloadGFXSlots(Entity*);
extern void UnloadOBJPalette(Entity*);
include/manager.h
+2 -2
View File
@@ -138,7 +138,7 @@ typedef struct {
} DiggingCaveEntrance;
typedef struct {
DiggingCaveEntrance* unk_00;
const DiggingCaveEntrance* unk_00;
u16 unk_04;
u16 unk_06;
u8 isDiggingCave;
@@ -148,7 +148,7 @@ typedef struct {
} struct_03004030;
extern struct_03004030 gUnk_03004030;
extern DiggingCaveEntrance* diggingCaveEntrances[];
extern const DiggingCaveEntrance* const diggingCaveEntrances[];
typedef struct {
Manager manager;
include/player.h
+2 -1
View File
@@ -403,6 +403,7 @@ u32 sub_0807AC54(Entity*);
void sub_080792D8(void);
u32 sub_08078F74(Entity*);
void sub_0807879C(Entity*);
void sub_08078D60(void);
void PlayerSetNormalAndCollide(void);
bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk);
void InitItemGetSequence(u32, u32, u32);
@@ -410,7 +411,7 @@ void sub_0807B7D8(u32, u32, u32);
void sub_08078850(Entity*, u32, u32, const void*);
void sub_08079D84(void);
u32 sub_0807953C(void);
void sub_0807BB68(s16*, u32, u32);
void sub_0807BB68(const s16*, u32, u32);
void sub_0807B9B8(u32, u32, u32);
void sub_0807B7D8(u32, u32, u32);
void RestorePrevTileEntity(u32, u32);
linker.ld
+63 -64
View File
@@ -122,8 +122,10 @@ SECTIONS {
. = 0x00034CF0; gUnk_02034CF0 = .;
. = 0x00034D30; gUnk_02034D30 = .;
. = 0x00034DF0; gUnk_02034DF0 = .;
. = 0x0003508E; gUnk_0203508E = .;
. = 0x000350E2; gUnk_020350E2 = .;
. = 0x000350F0; gUnk_020350F0 = .;
. = 0x0003510E; gUnk_0203510E = .;
. = 0x00035160; gUnk_02035160 = .;
. = 0x000354B0; gUnk_020354B0 = .;
. = 0x000354B4; gManagerCount = .;
@@ -1108,7 +1110,7 @@ SECTIONS {
. = ALIGN(4);
src/manager/manager1.o(.rodata);
src/manager/manager3.o(.rodata);
data/const/manager/manager4.o(.rodata);
src/manager/manager4.o(.rodata);
src/manager/manager5.o(.rodata);
src/manager/manager7.o(.rodata);
. = ALIGN(4);
@@ -1116,36 +1118,36 @@ SECTIONS {
src/manager/managerA.o(.rodata);
src/manager/managerB.o(.rodata);
src/manager/managerC.o(.rodata);
data/const/manager/managerD.o(.rodata);
src/manager/managerD.o(.rodata);
src/manager/managerF.o(.rodata);
src/manager/manager10.o(.rodata);
data/const/manager/manager12.o(.rodata);
data/const/manager/manager13.o(.rodata);
src/manager/manager12.o(.rodata);
src/manager/manager13.o(.rodata);
src/manager/manager14.o(.rodata);
data/const/manager/manager15.o(.rodata);
data/const/manager/manager17.o(.rodata);
data/const/manager/manager18.o(.rodata);
src/manager/manager15.o(.rodata);
src/manager/manager17.o(.rodata);
src/manager/manager18.o(.rodata);
data/const/manager/manager1A.o(.rodata);
data/const/manager/manager1B.o(.rodata);
data/const/manager/manager1C.o(.rodata);
data/const/manager/manager1D.o(.rodata);
src/manager/manager1B.o(.rodata);
src/manager/manager1C.o(.rodata);
src/manager/manager1D.o(.rodata);
src/manager/manager1E.o(.rodata);
data/const/manager/manager1F.o(.rodata);
src/manager/manager1F.o(.rodata);
src/manager/manager22.o(.rodata);
data/const/manager/manager23.o(.rodata);
data/const/manager/manager24.o(.rodata);
src/manager/manager23.o(.rodata);
src/manager/manager24.o(.rodata);
src/manager/manager26.o(.rodata);
src/manager/manager27.o(.rodata);
src/manager/manager28.o(.rodata);
data/const/manager/manager2B.o(.rodata);
data/const/manager/manager2E.o(.rodata);
data/const/manager/manager31.o(.rodata);
data/const/manager/manager32.o(.rodata);
data/const/manager/manager34.o(.rodata);
data/const/manager/manager35.o(.rodata);
data/const/manager/manager36.o(.rodata);
data/const/manager/manager37.o(.rodata);
data/const/manager/manager38.o(.rodata);
src/manager/manager2B.o(.rodata);
src/manager/manager2E.o(.rodata);
src/manager/manager31.o(.rodata);
src/manager/manager32.o(.rodata);
src/manager/manager34.o(.rodata);
src/manager/manager35.o(.rodata);
src/manager/manager36.o(.rodata);
src/manager/manager37.o(.rodata);
src/manager/manager38.o(.rodata);
data/const/manager/manager39.o(.rodata);
data/data_08108E6C.o(.rodata);
src/playerItem/playerItemSpiralBeam.o(.rodata);
@@ -1234,7 +1236,7 @@ SECTIONS {
data/animations/npc/melari.o(.rodata);
data/const/npc/bladeBrothers.o(.rodata);
data/animations/npc/bladeBrothers.o(.rodata);
data/const/npc/cow.o(.rodata);
src/npc/cow.o(.rodata);
data/animations/npc/cow.o(.rodata);
src/npc/goron.o(.rodata);
data/animations/npc/goron.o(.rodata);
@@ -1248,7 +1250,7 @@ SECTIONS {
data/animations/npc/syrup.o(.rodata);
src/npc/rem.o(.rodata);
data/animations/npc/rem.o(.rodata);
data/const/npc/townMinish.o(.rodata);
src/npc/townMinish.o(.rodata);
data/animations/npc/townMinish.o(.rodata);
src/npc/librari.o(.rodata);
data/animations/npc/librari.o(.rodata);
@@ -1275,7 +1277,7 @@ SECTIONS {
data/animations/npc/emma.o(.rodata);
src/npc/teachers.o(.rodata);
data/animations/npc/teachers.o(.rodata);
data/const/npc/windTribespeople.o(.rodata);
src/npc/windTribespeople.o(.rodata);
data/animations/npc/windTribespeople.o(.rodata);
src/npc/gregal.o(.rodata);
data/animations/npc/gregal.o(.rodata);
@@ -1352,17 +1354,17 @@ SECTIONS {
src/object/object12.o(.rodata);
src/object/railtrack.o(.rodata);
data/animations/object/railtrack.o(.rodata);
data/const/object/lilypadLarge.o(.rodata);
src/object/lilypadLarge.o(.rodata);
src/object/object15.o(.rodata);
src/object/floatingPlatform.o(.rodata);
src/object/object17.o(.rodata);
data/const/object/evilSpirit.o(.rodata);
data/animations/object/evilSpirit.o(.rodata);
data/const/object/houseDoorExterior.o(.rodata);
src/object/houseDoorExterior.o(.rodata);
src/object/rupee.o(.rodata);
src/object/greatFairy.o(.rodata);
data/animations/npc/greatFairy.o(.rodata);
data/const/object/object1D.o(.rodata);
src/object/object1D.o(.rodata);
src/object/object1E.o(.rodata);
data/animations/object/object1E.o(.rodata);
src/object/object1F.o(.rodata);
@@ -1384,12 +1386,12 @@ SECTIONS {
data/animations/object/object2A.o(.rodata);
src/object/beanstalk.o(.rodata);
data/animations/object/beanstalk.o(.rodata);
data/const/object/smoke.o(.rodata);
src/object/smoke.o(.rodata);
src/object/pushableRock.o(.rodata);
data/animations/object/pushableRock.o(.rodata);
src/object/hittableLever.o(.rodata);
src/object/object30.o(.rodata);
data/const/object/object31.o(.rodata);
src/object/frozenFlower.o(.rodata);
src/object/pullableMushroom.o(.rodata);
data/animations/object/pullableMushroom.o(.rodata);
src/object/bollard.o(.rodata);
@@ -1400,7 +1402,7 @@ SECTIONS {
data/animations/object/object35.o(.rodata);
src/object/object36.o(.rodata);
src/object/object37.o(.rodata);
data/const/object/jarPortal.o(.rodata);
src/object/jarPortal.o(.rodata);
data/animations/object/jarPortal.o(.rodata);
src/object/bossDoor.o(.rodata);
data/animations/object/bossDoor.o(.rodata);
@@ -1411,7 +1413,7 @@ SECTIONS {
src/object/macroPlayer.o(.rodata);
src/object/object3D.o(.rodata);
src/object/object3E.o(.rodata);
data/const/object/giantLeaf.o(.rodata);
src/object/giantLeaf.o(.rodata);
src/object/fairy.o(.rodata);
src/object/object42.o(.rodata);
src/object/object43.o(.rodata);
@@ -1422,17 +1424,14 @@ SECTIONS {
data/animations/object/object45.o(.rodata);
src/object/giantBookLadder.o(.rodata);
src/object/heartContainer.o(.rodata);
data/const/object/heartContainer.o(.rodata);
data/const/object/fileScreenObjects.o(.rodata);
src/object/fileScreenObjects.o(.rodata);
data/animations/object/fileScreenObjects.o(.rodata);
data/const/object/object49.o(.rodata);
data/const/object/backgroundCloud.o(.rodata);
src/object/object49.o(.rodata);
src/object/backgroundCloud.o(.rodata);
src/object/object4B.o(.rodata);
src/object/pushableFurniture.o(.rodata);
data/const/object/furniture.o(.rodata);
data/animations/object/furniture.o(.rodata);
src/object/furniture.o(.rodata);
data/const/object/minishSizedEntrance.o(.rodata);
src/object/minishSizedEntrance.o(.rodata);
data/animations/object/minishSizedEntrance.o(.rodata);
src/object/giantRock2.o(.rodata);
src/object/object53.o(.rodata);
@@ -1440,21 +1439,21 @@ SECTIONS {
data/animations/object/pullableLever.o(.rodata);
src/object/minecart.o(.rodata);
data/animations/object/minecart.o(.rodata);
data/const/object/thoughtBubble.o(.rodata);
src/object/thoughtBubble.o(.rodata);
data/animations/object/thoughtBubble.o(.rodata);
data/const/object/hiddenLadderDown.o(.rodata);
src/object/hiddenLadderDown.o(.rodata);
src/object/gentariCurtains.o(.rodata);
data/animations/object/gentariCurtains.o(.rodata);
src/object/lavaPlatform.o(.rodata);
data/animations/object/lavaPlatform.o(.rodata);
src/object/paper.o(.rodata);
src/object/object5B.o(.rodata);
data/const/object/mask.o(.rodata);
src/object/mask.o(.rodata);
src/object/houseDoorInterior.o(.rodata);
src/object/whirlwind.o(.rodata);
data/animations/object/whirlwind.o(.rodata);
src/object/objectBlockingStairs.o(.rodata);
data/const/object/swordsmanNewsletter.o(.rodata);
src/object/swordsmanNewsletter.o(.rodata);
src/object/object61.o(.rodata);
src/object/giantTwig.o(.rodata);
src/object/object63.o(.rodata);
@@ -1470,13 +1469,13 @@ SECTIONS {
data/animations/object/crenelBeanSprout.o(.rodata);
src/object/minecartDoor.o(.rodata);
src/object/objectOnPillar.o(.rodata);
data/const/object/mineralWaterSource.o(.rodata);
src/object/mineralWaterSource.o(.rodata);
src/object/object70.o(.rodata);
src/object/pushableGrave.o(.rodata);
src/object/stoneTablet.o(.rodata);
data/const/object/lilypadSmall.o(.rodata);
src/object/lilypadSmall.o(.rodata);
src/object/object74.o(.rodata);
data/const/object/bell.o(.rodata);
src/object/bell.o(.rodata);
data/animations/object/bell.o(.rodata);
src/object/macroDecorations.o(.rodata);
src/object/object79.o(.rodata);
@@ -1490,7 +1489,7 @@ SECTIONS {
data/animations/object/picoBloom.o(.rodata);
src/object/board.o(.rodata);
src/object/object81.o(.rodata);
data/const/object/bigVortex.o(.rodata);
src/object/bigVortex.o(.rodata);
data/animations/object/bigVortex.o(.rodata);
src/object/bigPushableLever.o(.rodata);
data/animations/object/bigPushableLever.o(.rodata);
@@ -1498,7 +1497,7 @@ SECTIONS {
data/animations/object/smallIceBlock.o(.rodata);
src/object/bigIceBlock.o(.rodata);
data/animations/object/bigIceBlock.o(.rodata);
data/const/object/object86.o(.rodata);
src/object/object86.o(.rodata);
data/animations/object/object86.o(.rodata);
src/object/octorokBossObject.o(.rodata);
src/object/macroBook.o(.rodata);
@@ -1507,12 +1506,12 @@ SECTIONS {
src/object/cabinFurniture.o(.rodata);
src/object/doubleBookshelf.o(.rodata);
src/object/book.o(.rodata);
data/const/object/fireplace.o(.rodata);
src/object/fireplace.o(.rodata);
src/object/object8E.o(.rodata);
src/object/frozenWaterElement.o(.rodata);
src/object/object90.o(.rodata);
src/object/frozenOctorok.o(.rodata);
data/const/object/bakerOven.o(.rodata);
src/object/bakerOven.o(.rodata);
data/animations/object/bakerOven.o(.rodata);
src/object/lamp.o(.rodata);
data/animations/object/lamp.o(.rodata);
@@ -1526,16 +1525,16 @@ SECTIONS {
src/object/object9B.o(.rodata);
data/animations/object/object9B.o(.rodata);
src/object/treeHidingPortal.o(.rodata);
data/const/object/lightableSwitch.o(.rodata);
src/object/lightableSwitch.o(.rodata);
src/object/fan.o(.rodata);
data/animations/object/fan.o(.rodata);
src/object/angryStatue.o(.rodata);
data/animations/object/angryStatue.o(.rodata);
data/const/object/palaceArchway.o(.rodata);
src/object/palaceArchway.o(.rodata);
src/object/objectA2.o(.rodata);
data/animations/object/objectA2.o(.rodata);
data/const/object/cloud.o(.rodata);
data/const/object/minishLight.o(.rodata);
src/object/cloud.o(.rodata);
src/object/minishLight.o(.rodata);
src/object/objectA6.o(.rodata);
data/animations/object/objectA6.o(.rodata);
src/object/objectA8.o(.rodata);
@@ -1545,32 +1544,32 @@ SECTIONS {
data/animations/object/objectAB.o(.rodata);
src/object/fourElements.o(.rodata);
src/object/objectAD.o(.rodata);
data/const/object/objectAF.o(.rodata);
src/object/objectAF.o(.rodata);
data/animations/object/objectAF.o(.rodata);
data/const/object/metalDoor.o(.rodata);
data/const/object/jailBars.o(.rodata);
src/object/metalDoor.o(.rodata);
src/object/jailBars.o(.rodata);
data/animations/object/jailBars.o(.rodata);
data/animations/object/objectB2.o(.rodata);
src/object/objectB3.o(.rodata);
data/animations/object/objectB3.o(.rodata);
src/object/objectB4.o(.rodata);
data/animations/object/objectB4.o(.rodata);
data/const/object/well.o(.rodata);
src/object/well.o(.rodata);
src/object/windTribeTeleporter.o(.rodata);
src/object/cuccoMinigame.o(.rodata);
src/object/gyorgBossObject.o(.rodata);
data/const/object/windcrest.o(.rodata);
src/object/windcrest.o(.rodata);
src/object/objectBD.o(.rodata);
data/const/object/pinwheel.o(.rodata);
src/object/pinwheel.o(.rodata);
data/animations/object/pinwheel.o(.rodata);
src/object/objectC1.o(.rodata);
src/objectDefinitions.o(.rodata);
src/playerItemDefinitions.o(.rodata);
data/data_08125104.o(.rodata);
data/const/playerItem/playerItemShield.o(.rodata);
data/const/playerItem/playerItemFireRodProjectile.o(.rodata);
src/playerItem/playerItemFireRodProjectile.o(.rodata);
#ifdef DEMO_USA
data/const/demo.o(.rodata);
src/demo.o(.rodata);
#endif
src/staffroll.o(.rodata);
data/data_08127280.o(.rodata);
@@ -1580,7 +1579,7 @@ SECTIONS {
data/data_08128A38.o(.rodata);
src/menu/pause_menu.o(.rodata);
data/data_08128BF4.o(.rodata);
data/const/playerItem/playerItemSword.o(.rodata);
src/playerItem/playerItemSword.o(.rodata);
data/projectile_functions.o(.rodata);
src/projectile/darkNutSwordSlash.o(.rodata);
src/projectile/rockProjectile.o(.rodata);
@@ -1640,7 +1639,7 @@ SECTIONS {
src/projectile/v3TennisBallProjectile.o(.rodata);
src/playerItem/playerItemGust.o(.rodata);
src/flagDebug.o(.rodata);
data/const/playerItem/playerItemHeldObject.o(.rodata);
src/playerItem/playerItemHeldObject.o(.rodata);
src/title.o(.rodata);
src/projectile.o(.rodata);
src/playerItem/playerItemGustJar.o(.rodata);
src/beanstalkSubtask.c
+1 -1
View File
@@ -499,7 +499,7 @@ void sub_0801AE44(s32 param_1) {
UpdateScrollVram();
}
void SetMultipleTiles(TileData* tileData, u32 basePosition, u32 layer) {
void SetMultipleTiles(const TileData* tileData, u32 basePosition, u32 layer) {
while (tileData->tile != -1) {
SetTile((u16)tileData->tile, basePosition + tileData->position, layer);
tileData++;
src/demo.c
+22 -5
View File
@@ -14,8 +14,10 @@
#include "screen.h"
#include "game.h"
extern void (*const demoFunctions[])(void);
void sub_080A30AC(void);
void sub_080A2E40(void);
void sub_080A2FD0(void);
void sub_080A2F8C(void);
extern u8 gUnk_02000004;
void sub_080A3198(u32, u32);
@@ -26,12 +28,17 @@ extern u8 gUnk_08A05751[];
// sprite_table
extern void gUnk_089FD1B4;
extern void gUnk_089FD2F4;
extern u16 gUnk_0203508E[];
extern u16 gUnk_0203510E[];
extern u16 gUnk_08127CC8[4];
extern void* gUnk_08127C98;
extern u8 gUnk_08A068BF[129];
void DemoTask(void) {
static void (*const demoFunctions[])(void) = {
sub_080A2E40,
sub_080A2FD0,
sub_080A2F8C,
};
FlushSprites();
demoFunctions[gMain.state]();
sub_080A30AC();
@@ -209,14 +216,24 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A30AC.inc", void sub_080A30AC(void)
END_NONMATCH
void sub_080A3198(u32 param_1, u32 param_2) {
static const Font gUnk_08127C98[] = {
{ gUnk_0203508E, (void*)0x0600d000, (void*)0x02000d00, 0, 0x1080, 0xd0, 1, 0, 0, 1, 9, 0, 0, 1, 1 },
{ gUnk_0203510E, (void*)0x0600d000, (void*)0x02000d00, 0, 0x80, 0xd0, 1, 0, 0, 1, 9, 0, 0, 1, 1 },
};
static const u16 gUnk_08127CC8[4] = {
0x71c,
0x720,
0x721,
0x0,
};
u16 r4 = gUnk_08127CC8[param_1];
if (gChooseFileState.unk_0x12 != r4) {
gChooseFileState.unk_0x12 = r4;
MemClear(gUnk_08127C98 - 0x1e, 0x180);
MemClear(gUnk_08127C98[0].dest - 0xf, 0x180);
if (r4 != 0) {
sub_0805F46C(r4, (Font*)&gUnk_08127C98); // TODO
sub_0805F46C(r4, gUnk_08127C98);
}
gScreen.bg0.updated = 1;
src/main.c
+2 -2
View File
@@ -279,8 +279,8 @@ u32 CheckRegionOnScreen(u32 x0, u32 y0, u32 x1, u32 y1) {
}
// Iterate over array of AABBs and check if any fit on screen
u16 CheckRegionsOnScreen(u16* arr) {
u16* i;
u16 CheckRegionsOnScreen(const u16* arr) {
const u16* i;
for (i = arr; *i != 0xff; i += 5) {
if (CheckRegionOnScreen(i[1], i[2], i[3], i[4]))
return *i;
src/manager/manager12.c
+41 -22
View File
@@ -13,20 +13,19 @@ typedef struct {
} Manager12;
void sub_08059A58(Manager12*);
void sub_08059A2C(Manager12*);
u32 CheckRegionsOnScreen(const u16* arr);
u32 CheckRegionsOnScreen(u16* arr);
extern u16 gUnk_081083DA;
extern u16 gUnk_081083F2;
extern u16 gUnk_08108398;
extern u16 gUnk_081083AE;
extern u16 gUnk_081083C4;
static const u16 gUnk_08108398[] = { 0x0, 0x0, 0x0, 0x3f0, 0x200, 0x1, 0x0, 0x280, 0x3f0, 0x140, 0xff };
static const u16 gUnk_081083AE[] = { 0x2, 0x0, 0x0, 0x180, 0x3c0, 0x3, 0x280, 0x0, 0x170, 0x3c0, 0xff };
static const u16 gUnk_081083C4[] = { 0x5, 0x130, 0x1b0, 0x190, 0x140, 0x4, 0x0, 0x0, 0x3f0, 0x3c0, 0xff };
static const u16 gUnk_081083DA[] = { 0x0, 0x0, 0x0, 0x190, 0x1d0, 0x1, 0x0, 0x2a0, 0x190, 0x120, 0xff, 0xff };
static const u16 gUnk_081083F2[] = { 0x5, 0x0, 0x1b0, 0x190, 0x140, 0x4, 0x0, 0x0, 0x190, 0x3c0, 0xff };
void sub_08059CC0(u32, u32);
void sub_08059B18(void);
bool32 sub_08059C8C(Manager12*, u32, u8*, u16*);
bool32 sub_08059C8C(Manager12*, u32, u8*, const u16*);
extern u32 gUnk_086E8460;
@@ -37,8 +36,28 @@ typedef struct {
u32 field_0xc;
} Unknown;
extern Unknown gUnk_08108468[];
extern Unknown gUnk_08108408[];
static const Unknown gUnk_08108408[] = {
#ifdef EU
{ 0x139860, 0x6000000, 0x13f860, 0x6008000 }, { 0x13c860, 0x6000000, 0x142860, 0x6008000 },
{ 0x13a860, 0x6001000, 0x140860, 0x6009000 }, { 0x13d860, 0x6001000, 0x143860, 0x6009000 },
{ 0x13b860, 0x6002000, 0x141860, 0x600a000 }, { 0x13e860, 0x6002000, 0x144860, 0x600a000 }
#else
{ 0x1395e0, 0x6000000, 0x13f5e0, 0x6008000 }, { 0x13c5e0, 0x6000000, 0x1425e0, 0x6008000 },
{ 0x13a5e0, 0x6001000, 0x1405e0, 0x6009000 }, { 0x13d5e0, 0x6001000, 0x1435e0, 0x6009000 },
{ 0x13b5e0, 0x6002000, 0x1415e0, 0x600a000 }, { 0x13e5e0, 0x6002000, 0x1445e0, 0x600a000 }
#endif
};
static const Unknown gUnk_08108468[] = {
#ifdef EU
{ 0x146060, 0x6000000, 0x14c060, 0x6008000 }, { 0x149060, 0x6000000, 0x14f060, 0x6008000 },
{ 0x147060, 0x6001000, 0x14d060, 0x6009000 }, { 0x14a060, 0x6001000, 0x150060, 0x6009000 },
{ 0x148060, 0x6002000, 0x14e060, 0x600a000 }, { 0x14b060, 0x6002000, 0x151060, 0x600a000 },
#else
{ 0x145de0, 0x6000000, 0x14bde0, 0x6008000 }, { 0x148de0, 0x6000000, 0x14ede0, 0x6008000 },
{ 0x146de0, 0x6001000, 0x14cde0, 0x6009000 }, { 0x149de0, 0x6001000, 0x14fde0, 0x6009000 },
{ 0x147de0, 0x6002000, 0x14dde0, 0x600a000 }, { 0x14ade0, 0x6002000, 0x150de0, 0x600a000 },
#endif
};
extern const u8 gGlobalGfxAndPalettes[];
void Manager12_Main(Manager12* this) {
@@ -65,23 +84,23 @@ void sub_08059A2C(Manager12* this) {
void sub_08059A58(Manager12* this) {
if (gRoomControls.area != AREA_FESTIVAL_TOWN) {
if (sub_08059C8C(this, 0, &this->field_0x20, &gUnk_08108398) != 0) {
if (sub_08059C8C(this, 0, &this->field_0x20, gUnk_08108398) != 0) {
sub_08059CC0(0, (u32)this->field_0x20);
}
if (sub_08059C8C(this, 1, &this->field_0x21, &gUnk_081083AE) != 0) {
if (sub_08059C8C(this, 1, &this->field_0x21, gUnk_081083AE) != 0) {
sub_08059CC0(1, this->field_0x21);
if (this->field_0x21 == 2) {
sub_08059B18();
}
}
if (sub_08059C8C(this, 2, &this->field_0x22, &gUnk_081083C4) != 0) {
if (sub_08059C8C(this, 2, &this->field_0x22, gUnk_081083C4) != 0) {
sub_08059CC0(2, (u32)this->field_0x22);
}
} else {
if (sub_08059C8C(this, 0, &this->field_0x20, &gUnk_081083DA) != 0) {
if (sub_08059C8C(this, 0, &this->field_0x20, gUnk_081083DA) != 0) {
sub_08059CC0(0, (u32)this->field_0x20);
}
if (sub_08059C8C(this, 2, &this->field_0x22, &gUnk_081083F2) != 0) {
if (sub_08059C8C(this, 2, &this->field_0x22, gUnk_081083F2) != 0) {
sub_08059CC0(2, (u32)this->field_0x22);
}
}
@@ -125,7 +144,7 @@ void sub_08059B18(void) {
}
}
bool32 sub_08059C8C(Manager12* this, u32 param_2, u8* param_3, u16* param_4) {
bool32 sub_08059C8C(Manager12* this, u32 param_2, u8* param_3, const u16* param_4) {
bool32 bVar2;
*param_3 = CheckRegionsOnScreen(param_4);
@@ -138,7 +157,7 @@ bool32 sub_08059C8C(Manager12* this, u32 param_2, u8* param_3, u16* param_4) {
}
void sub_08059CC0(u32 param_1, u32 param_2) {
Unknown* unknown;
const Unknown* unknown;
gRoomVars.unk_10[param_1] = param_2;
if (gRoomControls.area != AREA_FESTIVAL_TOWN) {
@@ -154,24 +173,24 @@ void TryLoadPrologueHyruleTown(void) {
u32 tmp;
if (gRoomControls.area != AREA_FESTIVAL_TOWN) {
tmp = CheckRegionsOnScreen(&gUnk_08108398);
tmp = CheckRegionsOnScreen(gUnk_08108398);
if (tmp != 0xff) {
sub_08059CC0(0, tmp);
}
tmp = CheckRegionsOnScreen(&gUnk_081083AE);
tmp = CheckRegionsOnScreen(gUnk_081083AE);
if ((tmp != 0xff) && (sub_08059CC0(1, tmp), tmp == 2)) {
sub_08059B18();
}
tmp = CheckRegionsOnScreen(&gUnk_081083C4);
tmp = CheckRegionsOnScreen(gUnk_081083C4);
if (tmp != 0xff) {
sub_08059CC0(2, tmp);
}
} else {
tmp = CheckRegionsOnScreen(&gUnk_081083DA);
tmp = CheckRegionsOnScreen(gUnk_081083DA);
if (tmp != 0xff) {
sub_08059CC0(0, tmp);
}
tmp = CheckRegionsOnScreen(&gUnk_081083F2);
tmp = CheckRegionsOnScreen(gUnk_081083F2);
if (tmp != 0xff) {
sub_08059CC0(2, tmp);
}
src/manager/manager13.c
+18 -4
View File
@@ -17,9 +17,6 @@ typedef struct {
u8 _padding;
} SpawnData;
extern SpawnData gUnk_081084C8[];
extern SpawnData gUnk_08108530[];
extern u32 CheckRectOnScreen(u16, u16, u32, u32);
/*
@@ -27,7 +24,24 @@ Keeps track in its bitfield of whether 0x10 x 0x10 rects at certain positions ar
Spawns OBJECT_1C objects that check this and unsets the value in the bitfield.
*/
void Manager13_Main(Manager13* this) {
SpawnData* spawnData;
static const SpawnData gUnk_081084C8[] = {
{ 0x48, 0x90, 0x0, 0x0, 0x2, 0x0 }, { 0x138, 0x30, 0x1, 0x1, 0x2, 0x0 },
{ 0x168, 0x90, 0x2, 0x2, 0x2, 0x0 }, { 0x2c8, 0x80, 0x3, 0x3, 0x2, 0x0 },
{ 0x388, 0x240, 0x4, 0x4, 0x2, 0x0 }, { 0x158, 0x1ed, 0x5, 0x5, 0x2, 0x0 },
{ 0x15a, 0x228, 0x6, 0x6, 0x2, 0x0 }, { 0x158, 0x26b, 0x7, 0x7, 0x2, 0x0 },
{ 0x198, 0x2b1, 0x8, 0x8, 0x2, 0x0 }, { 0x258, 0x2ac, 0x9, 0x9, 0x2, 0x0 },
{ 0x298, 0x21a, 0xa, 0xa, 0x2, 0x0 }, { 0x298, 0x1cb, 0xb, 0xb, 0x2, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
};
static const SpawnData gUnk_08108530[] = {
{ 0x8, 0x30, 0x1, 0x1, 0x2, 0x0 }, { 0x38, 0x90, 0x2, 0x2, 0x2, 0x0 },
{ 0x198, 0x80, 0x3, 0x2, 0x2, 0x0 }, { 0x28, 0x1ed, 0x5, 0x5, 0x2, 0x0 },
{ 0x2a, 0x228, 0x6, 0x6, 0x2, 0x0 }, { 0x28, 0x26b, 0x7, 0x7, 0x2, 0x0 },
{ 0x68, 0x2b1, 0x8, 0x8, 0x2, 0x0 }, { 0x128, 0x2ac, 0x9, 0x9, 0x2, 0x0 },
{ 0x168, 0x21a, 0xa, 0xa, 0x2, 0x0 }, { 0x168, 0x1cb, 0xb, 0xb, 0x2, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
};
const SpawnData* spawnData;
u32 type2;
if (this->manager.action == 0) {
src/manager/manager15.c
+57 -21
View File
@@ -27,15 +27,47 @@ typedef struct {
u16 unk_3e; // used
} Manager15;
extern void (*const gUnk_081085D8[])(Manager*);
void Manager15_Main(Manager* this) {
gUnk_081085D8[this->unk_0a](this);
}
static const u16 gUnk_081085B8[] = { 0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009,
0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009 };
void sub_0805A298(Manager15*);
void sub_0805A2E4(Manager15*);
void sub_0805A3D4(Manager15*);
void sub_0805A3D4(Manager15*);
void sub_0805A500(Manager15*);
void sub_0805A660(Manager15*);
void sub_0805A664(Manager15*);
void sub_0805A804(Manager15*);
void sub_0805A464(Manager15*);
void sub_0805A370(Manager15*);
void sub_0805A394(Manager15*);
void nullsub_496(Manager15*);
void sub_0805A89C(Manager15*);
void sub_0805A8EC(Manager15*);
void sub_0805A4B4(Manager15*);
void sub_0805A498(Manager15*);
void sub_0805A480(Manager15*);
void sub_0805A464(Manager15*);
void sub_0805AAF0(u32);
void sub_0805AA58(Manager15*);
void sub_0805A9CC(Manager15*);
void sub_0805A5FC(Manager15*);
void sub_0805A618(Manager15*);
void sub_0805A628(Manager15*);
void sub_0805A64C(Manager15*);
void sub_0805A65C(Manager15*);
void sub_0805A68C(Manager15*);
void sub_0805A7E4(Manager15*);
void sub_0805A76C(Manager15*);
void sub_0805A758(Manager15*);
void sub_0805A6E8(Manager15*);
void Manager15_Main(Manager* this) {
static void (*const gUnk_081085D8[])(Manager15*) = {
sub_0805A298, sub_0805A2E4, sub_0805A3D4, sub_0805A3D4, sub_0805A500, sub_0805A660, sub_0805A664, sub_0805A804,
};
gUnk_081085D8[this->unk_0a]((Manager15*)this);
}
void sub_0805A298(Manager15* this) {
if (this->manager.action == 0) {
@@ -51,9 +83,10 @@ void sub_0805A298(Manager15* this) {
sub_0805A8EC(this);
}
extern void (*const gUnk_081085F8[])(Manager15*);
void sub_0805A2E4(Manager15* this) {
static void (*const actionFuncs[])(Manager15*) = {
NULL, sub_0805A464, sub_0805A370, sub_0805A394, nullsub_496,
};
if (this->manager.action == 0) {
sub_0805A89C(this);
this->unk_23 = 1;
@@ -70,7 +103,7 @@ void sub_0805A2E4(Manager15* this) {
gScreen.lcd.displayControl |= DISPCNT_WIN1_ON | DISPCNT_BG3_ON;
}
} else {
gUnk_081085F8[this->manager.action](this);
actionFuncs[this->manager.action](this);
}
if (this->manager.next) {
sub_0805A8EC(this);
@@ -103,9 +136,10 @@ void sub_0805A394(Manager15* this) {
void nullsub_496(Manager15* this) {
}
extern void (*const gUnk_0810860C[])(Manager15*);
void sub_0805A3D4(Manager15* this) {
static void (*const gUnk_0810860C[])(Manager15*) = {
NULL, sub_0805A464, sub_0805A480, sub_0805A498, sub_0805A4B4,
};
if (this->manager.action == 0) {
sub_0805A89C(this);
if (this->manager.unk_0a == 3) {
@@ -170,11 +204,10 @@ void sub_0805A4CC(Manager15* this, u32 unk_0) {
}
}
extern void (*const gUnk_08108620[])(Manager15*);
void sub_0805AA58(Manager15*);
void sub_0805A9CC(Manager15*);
void sub_0805A500(Manager15* this) {
static void (*const actionFuncs[])(Manager15*) = {
NULL, sub_0805A5FC, sub_0805A618, sub_0805A628, sub_0805A64C, sub_0805A65C,
};
if (this->manager.action == 0) {
sub_0805A89C(this);
this->unk_28 = 0;
@@ -195,7 +228,7 @@ void sub_0805A500(Manager15* this) {
}
sub_0805AAF0(this->unk_23);
} else {
gUnk_08108620[this->manager.action](this);
actionFuncs[this->manager.action](this);
}
sub_0805AA58(this);
sub_0805A9CC(this);
@@ -245,10 +278,13 @@ void sub_0805A65C(Manager15* this) {
void sub_0805A660(Manager15* this) {
}
extern void (*const gUnk_08108638[])(Manager15*);
void sub_0805A68C(Manager15*);
void sub_0805A664(Manager15* this) {
static void (*const gUnk_08108638[])(Manager15*) = {
sub_0805A6E8,
sub_0805A758,
sub_0805A76C,
sub_0805A7E4,
};
gUnk_08108638[this->manager.action](this);
sub_0805A8EC(this);
sub_0805A68C(this);
@@ -451,7 +487,6 @@ void sub_0805A9CC(Manager15* this) {
}
extern struct { u8 unk_00[0x20]; } gUnk_085A97A0[];
extern u16 gUnk_081085B8[];
void sub_0805AA58(Manager15* this) {
if (--this->manager.unk_0e == 0) {
@@ -473,9 +508,10 @@ void sub_0805AAC8(Manager15* this) {
Manager15_Main(&this->manager);
}
extern u16 gUnk_08108648[];
void sub_0805AADC(u32 unk0) {
static const u16 gUnk_08108648[] = {
0x31, 0x32, 0x33, 0x34, 0x35, 0,
};
LoadGfxGroup(gUnk_08108648[unk0]);
}
src/manager/manager17.c
+6 -3
View File
@@ -15,12 +15,15 @@ typedef struct {
u16 field_0x3e;
} Manager17;
extern void (*const gUnk_08108654[])(Manager17*);
void sub_0805AD60(Manager17*);
void sub_0805AD80(Manager17*);
void Manager17_Main(Manager17* manager) {
gUnk_08108654[manager->manager.action](manager);
static void (*const actionFuncs[])(Manager17*) = {
sub_0805AD60,
sub_0805AD80,
};
actionFuncs[manager->manager.action](manager);
}
void sub_0805AD60(Manager17* manager) {
src/manager/manager18.c
+3 -1
View File
@@ -10,9 +10,11 @@ typedef struct {
void sub_0805AEDC(Manager18*);
void sub_0805AF3C(Manager18*);
extern u16 gUnk_0810865C[];
void Manager18_Main(Manager18* this) {
static const u16 gUnk_0810865C[] = {
0xf01, 0xe02, 0xe03, 0xe04, 0, 0,
};
if (this == NULL) {
if (gArea.onEnter != sub_0805AEDC) {
sub_0805AEDC(NULL);
src/manager/manager1B.c
+12 -6
View File
@@ -9,19 +9,24 @@ typedef struct {
u32 field_0x20;
} Manager1B;
extern u8 gUnk_08108C28[];
extern void (*const gUnk_08108C54[])(Manager1B*);
void sub_0805B4B4(Manager1B*);
void sub_0805B448(Manager1B*);
void sub_0805B474(Manager1B*);
void sub_0806D0F8(void); // in bigGoron?
extern u8 gUnk_08108C5C[];
extern u16 gUnk_08108C44[];
static const u8 gUnk_08108C28[] = { 0x14, 0x0, 0x0, 0x0, 0x15, 0x0, 0x0, 0x0, 0x14, 0x0, 0xd8, 0x0, 0x2f, 0x0,
0x70, 0x0, 0x4b, 0x0, 0x0, 0x0, 0x4e, 0x0, 0x0, 0x0, 0x4d, 0x1, 0x0, 0x0 };
static const u16 gUnk_08108C44[] = { 0, 0, -0x28, 0x70, 0, 0, 0, 0 };
void Manager1B_Main(Manager1B* this) {
static void (*const gUnk_08108C54[])(Manager1B*) = {
sub_0805B448,
sub_0805B474,
};
s32 iVar3;
u8* tmp;
const u8* tmp;
if (EntityHasDuplicateID((Entity*)this) != 0) {
DeleteThisEntity();
@@ -66,6 +71,7 @@ void sub_0805B4B4(Manager1B* this) {
}
void sub_0805B4D0(u32 param_1) {
static const u8 gUnk_08108C5C[] = { 0x14, 0x15, 0x14, 0x2f, 0x4b, 0x4e, 0x4d, 0 };
s32 iVar1;
u32 uVar2;
src/manager/manager1C.c
+10 -5
View File
@@ -3,13 +3,15 @@
#include "room.h"
#include "enemy.h"
extern void (*const gUnk_08108C64[])(Manager*);
extern u16 gUnk_08108C6C[];
extern s8 gUnk_08108C7C[];
void sub_0805B554(Manager*);
void sub_0805B55C(Manager*);
void Manager1C_Main(Manager* manager) {
gUnk_08108C64[manager->action](manager);
static void (*const actionFuncs[])(Manager*) = {
sub_0805B554,
sub_0805B55C,
};
actionFuncs[manager->action](manager);
}
// Initial setup
@@ -20,6 +22,9 @@ void sub_0805B554(Manager* manager) {
// Spawn water drops every 0xf frames
void sub_0805B55C(Manager* manager) {
static const s16 gUnk_08108C6C[] = { -0x64, -0x3c, -0x14, 0x14, 0x3c, 0x64, 0x8c, 0xb4 };
static const s8 gUnk_08108C7C[] = { -0x32, -0x19, 0x0, 0x19 };
if (--manager->unk_0e == 0) {
Entity* waterDrop;
manager->unk_0e = 0xf;
src/manager/manager1D.c
+8 -4
View File
@@ -2,15 +2,19 @@
#include "room.h"
#include "screen.h"
extern void (*const gUnk_08108C80[])(Manager*);
extern u16 gUnk_08108C88[];
void sub_0805B5E0(Manager*);
void sub_0805B638(Manager*);
void Manager1D_Main(Manager* this) {
gUnk_08108C80[this->action](this);
static void (*const actionFuncs[])(Manager*) = {
sub_0805B5E0,
sub_0805B638,
};
actionFuncs[this->action](this);
}
void sub_0805B5E0(Manager* this) {
static const u16 gUnk_08108C88[] = { 0x1e07, 0x1e07 };
this->action = 1;
gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
src/manager/manager1F.c
+8 -4
View File
@@ -13,14 +13,17 @@ typedef struct {
u8 field_0x3d;
u16 field_0x3e;
} Manager1F;
extern void (*const gUnk_08108C94[])(Manager1F*);
void sub_0805B778(Manager1F*);
extern u16 gUnk_08108C9C[];
void sub_0805B70C(Manager1F*);
void sub_0805B744(Manager1F*);
void Manager1F_Main(Manager1F* this) {
gUnk_08108C94[this->manager.action](this);
static void (*const actionFuncs[])(Manager1F*) = {
sub_0805B70C,
sub_0805B744,
};
actionFuncs[this->manager.action](this);
}
void sub_0805B70C(Manager1F* this) {
@@ -47,5 +50,6 @@ void sub_0805B744(Manager1F* this) {
}
void sub_0805B778(Manager1F* this) {
static const u16 gUnk_08108C9C[] = { 0x358, 0x359, 0x356, 0x35a, 0x35a, 0x357 };
SetTileType(gUnk_08108C9C[this->manager.unk_0a * 2 + this->manager.unk_0b], this->field_0x38, this->field_0x36);
}
src/manager/manager23.c
+11 -3
View File
@@ -6,8 +6,6 @@
#include "object.h"
#include "game.h"
extern void (*const gUnk_08108CCC[])(Manager*);
typedef struct {
Manager manager;
u16 field_0x20;
@@ -23,11 +21,21 @@ typedef struct {
void sub_0805BE94(Manager23*);
void sub_0805BEC4(Manager23*);
void sub_0805BC8C(Manager23*);
void sub_0805BCD4(Manager23*);
void sub_0805BD5C(Manager23*);
void sub_0805BDB4(Manager23*);
void sub_0805BE70(Manager23*, u32);
void Manager23_Main(Manager* this) {
gUnk_08108CCC[this->unk_0a](this);
static void (*const gUnk_08108CCC[])(Manager23*) = {
sub_0805BC8C,
sub_0805BCD4,
sub_0805BD5C,
sub_0805BDB4,
};
gUnk_08108CCC[this->unk_0a]((Manager23*)this);
}
void sub_0805BC8C(Manager23* this) {
src/manager/manager24.c
+26 -15
View File
@@ -5,21 +5,28 @@
#include "game.h"
#include "object.h"
extern void (*const gUnk_08108CDC[])(Manager24*);
u32 sub_0805BFC4(u32, u32);
void sub_0805C02C(Manager24*);
extern u32 sub_080B1AE0(u16, u8);
extern void (*const gUnk_08108CE8[])(u32, u32);
u32 sub_0805C608(void);
extern u8 gUnk_08108CFC[];
u32 getArchwayType(void);
void sub_0805BF30(Manager24*);
void sub_0805BF78(Manager24*);
void sub_0805BFA4(Manager24*);
void sub_0805C050(u32, u32);
void sub_0805C178(u32, u32);
void sub_0805C294(u32, u32);
void sub_0805C3B4(u32, u32);
void sub_0805C4E0(u32, u32);
void Manager24_Main(Manager24* manager) {
gUnk_08108CDC[manager->manager.action](manager);
static void (*const actionFuncs[])(Manager24*) = {
sub_0805BF30,
sub_0805BF78,
sub_0805BFA4,
};
actionFuncs[manager->manager.action](manager);
}
void sub_0805BF30(Manager24* manager) {
@@ -77,6 +84,9 @@ u32 sub_0805BFC4(u32 pos, u32 layer) {
}
void sub_0805C02C(Manager24* this) {
static void (*const gUnk_08108CE8[])(u32, u32) = {
sub_0805C050, sub_0805C178, sub_0805C294, sub_0805C3B4, sub_0805C4E0,
};
if (this->manager.unk_0a != 0xff) {
gUnk_08108CE8[this->manager.unk_0a](this->tile, this->field_0x35);
}
@@ -113,7 +123,7 @@ void sub_0805C050(u32 pos, u32 layer) {
if (AreaIsDungeon() == 0) {
return;
}
object = CreateObject(ARCHWAY, sub_0805C608(), 6);
object = CreateObject(ARCHWAY, getArchwayType(), 6);
if (object == NULL) {
return;
}
@@ -156,7 +166,7 @@ void sub_0805C178(u32 pos, u32 layer) {
if (AreaIsDungeon() == 0) {
return;
}
object = CreateObject(ARCHWAY, sub_0805C608(), 7);
object = CreateObject(ARCHWAY, getArchwayType(), 7);
if (object == NULL) {
return;
}
@@ -197,7 +207,7 @@ void sub_0805C294(u32 pos, u32 layer) {
if (AreaIsDungeon() == 0) {
return;
}
object = CreateObject(ARCHWAY, sub_0805C608(), 8);
object = CreateObject(ARCHWAY, getArchwayType(), 8);
if (object == NULL) {
return;
}
@@ -239,7 +249,7 @@ void sub_0805C3B4(u32 pos, u32 layer) {
return;
}
object = CreateObject(ARCHWAY, sub_0805C608(), 9);
object = CreateObject(ARCHWAY, getArchwayType(), 9);
if (object == NULL) {
return;
}
@@ -281,7 +291,7 @@ void sub_0805C4E0(u32 pos, u32 layer) {
return;
}
object = CreateObject(ARCHWAY, sub_0805C608(), 6);
object = CreateObject(ARCHWAY, getArchwayType(), 6);
if (object == NULL) {
return;
}
@@ -291,6 +301,7 @@ void sub_0805C4E0(u32 pos, u32 layer) {
}
}
u32 sub_0805C608(void) {
return gUnk_08108CFC[gArea.dungeon_idx];
u32 getArchwayType(void) {
static const u8 archwayTypes[] = { 0xd, 0xd, 0xd, 0x19, 0x1a, 0xd, 0x21, 0 };
return archwayTypes[gArea.dungeon_idx];
}
src/manager/manager2B.c
+8 -2
View File
@@ -24,11 +24,17 @@ typedef struct {
u16 field_0x3e;
} Manager2B;
extern void (*const gUnk_08108D30[])(Manager2B*);
void sub_0805D11C(Manager2B*);
void sub_0805D02C(Manager2B*);
void sub_0805D0C4(Manager2B*);
void sub_0805D0FC(Manager2B*);
void Manager2B_Main(Manager2B* this) {
static void (*const gUnk_08108D30[])(Manager2B*) = {
sub_0805D02C,
sub_0805D0C4,
sub_0805D0FC,
};
gUnk_08108D30[this->manager.action](this);
}
src/manager/manager2E.c
+24 -7
View File
@@ -15,19 +15,31 @@ typedef struct {
u16 field_0x3e;
} Manager2E;
extern void (*const gUnk_08108D3C[])(Manager2E*);
extern void (*const gUnk_08108D44[])(Manager2E*);
void sub_0805D2F4(Manager2E*);
extern void (*const gUnk_08108D50[])(Manager2E*);
void sub_0805D268(Manager2E*);
void sub_0805D32C(Manager2E*);
void sub_0805D280(Manager2E*);
void sub_0805D2C0(Manager2E*);
void sub_0805D2F4(Manager2E*);
void sub_0805D384(Manager2E*);
void sub_0805D36C(Manager2E*);
void sub_0805D344(Manager2E*);
void Manager2E_Main(Manager2E* this) {
static void (*const gUnk_08108D3C[])(Manager2E*) = {
sub_0805D268,
sub_0805D32C,
};
gUnk_08108D3C[this->manager.unk_0a](this);
}
void sub_0805D268(Manager2E* this) {
gUnk_08108D44[this->manager.action](this);
static void (*const actionFuncs[])(Manager2E*) = {
sub_0805D280,
sub_0805D2C0,
sub_0805D2F4,
};
actionFuncs[this->manager.action](this);
}
void sub_0805D280(Manager2E* this) {
@@ -70,7 +82,12 @@ void sub_0805D2F4(Manager2E* this) {
}
void sub_0805D32C(Manager2E* this) {
gUnk_08108D50[this->manager.action](this);
static void (*const actionFuncs[])(Manager2E*) = {
sub_0805D344,
sub_0805D36C,
sub_0805D384,
};
actionFuncs[this->manager.action](this);
}
void sub_0805D344(Manager2E* this) {
src/manager/manager31.c
+4 -3
View File
@@ -16,14 +16,15 @@ typedef struct {
u16 y;
} GoronShopSpawnData;
extern GoronShopSpawnData gUnk_08108D5C[3];
/*
Spawns the shop items for the kinstones for the goron merchant.
*/
void Manager31_Main(Manager31* this) {
static const GoronShopSpawnData gUnk_08108D5C[3] = { { 0x6e, 0x3, 0x210, 0x210 },
{ 0x71, 0x2, 0x220, 0x210 },
{ 0x73, 0x3, 0x230, 0x210 } };
s32 uVar2;
GoronShopSpawnData* spawnData;
const GoronShopSpawnData* spawnData;
s32 count;
if (this->manager.action == 0) {
src/manager/manager32.c
+12 -3
View File
@@ -13,18 +13,27 @@ typedef struct {
u32 field_0x28;
} Manager32;
extern void (*const gUnk_08108D7C[])(Manager32*);
void sub_0805D9D8(Manager32*);
void sub_0805D98C(Manager32*);
void sub_0805D900(Manager32*);
void sub_0805D860(Manager32*);
void sub_0805D7DC(Manager32*);
void sub_0805DA08(u32, u32, u32);
extern u8 gUnk_08108D74[];
static const u8 gUnk_08108D74[] = { 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x0 };
extern struct BgAffineDstData gUnk_02017AA0[];
extern u8 gUnk_03003DE4[0xC];
extern void sub_0805622C(struct BgAffineDstData*, u32, u32);
void Manager32_Main(Manager32* this) {
gUnk_08108D7C[this->manager.action](this);
static void (*const actionFuncs[])(Manager32*) = {
sub_0805D7DC,
sub_0805D860,
sub_0805D900,
sub_0805D98C,
};
actionFuncs[this->manager.action](this);
this->field_0x24 = gRoomTransition.frameCount << 4;
sub_0805D9D8(this);
sub_0805DA08(this->field_0x20, this->field_0x28, this->field_0x24);
src/manager/manager34.c
+9 -2
View File
@@ -8,15 +8,22 @@ typedef struct {
u16 field_0x20;
} Manager34;
extern void (*const gUnk_08108D8C[])(Manager34*);
void sub_0805DBF0(Manager34*);
void sub_0805DBB4(Manager34*);
void sub_0805DBCC(Manager34*);
void nullsub_498(Manager34*);
extern ScreenTransitionData gUnk_0813AC48;
void sub_0805DC70(void);
void Manager34_Main(Manager34* this) {
gUnk_08108D8C[this->manager.action](this);
static void (*const actionFuncs[])(Manager34*) = {
sub_0805DBB4,
sub_0805DBCC,
nullsub_498,
};
actionFuncs[this->manager.action](this);
sub_0805DBF0(this);
}
src/manager/manager35.c
+11 -2
View File
@@ -15,10 +15,19 @@ typedef struct {
u16 field_0x3e;
} Manager35;
extern void (*const gUnk_08108D98[])(Manager35*);
void sub_0805DC9C(Manager35*);
void sub_0805DCC8(Manager35*);
void sub_0805DD24(Manager35*);
void sub_0805DD68(Manager35*);
void Manager35_Main(Manager35* this) {
gUnk_08108D98[this->manager.action](this);
static void (*const actionFuncs[])(Manager35*) = {
sub_0805DC9C,
sub_0805DCC8,
sub_0805DD24,
sub_0805DD68,
};
actionFuncs[this->manager.action](this);
}
void sub_0805DC9C(Manager35* this) {
src/manager/manager36.c
+4 -3
View File
@@ -7,11 +7,12 @@ typedef struct {
u16 sound;
} Manager36_unk;
extern Manager36_unk gUnk_08108DA8[];
// Repeatedly plays the same sound with a fixed wait time
void Manager36_Main(Manager* manager) {
Manager36_unk* unk = &gUnk_08108DA8[manager->unk_0a];
static const Manager36_unk gUnk_08108DA8[] = {
{ 0x10, SFX_ELEMENT_INFUSE }, { 0x20, SFX_1C8 }, { 0x20, SFX_1C8 }, { 0x40, SFX_1A9 }, { 0x20, SFX_21F }
};
const Manager36_unk* unk = &gUnk_08108DA8[manager->unk_0a];
if (manager->action == 0) {
manager->action += 1;
manager->unk_0e = 0;
src/manager/manager37.c
+23 -9
View File
@@ -12,20 +12,30 @@
extern ScreenTransitionData gUnk_0813AC34;
extern void (*const gUnk_08108DBC[])(Manager*);
extern void (*const gUnk_08108DC4[])(Manager*);
extern void (*const gUnk_08108DD8[])(Manager*);
void sub_0805E094(void);
void sub_0805DE50(Manager*);
void sub_0805DFE8(Manager*);
void sub_0805DE68(Manager*);
void sub_0805DEB8(Manager*);
void sub_0805DF4C(Manager*);
void sub_0805DF98(Manager*);
void sub_0805DFCC(Manager*);
void sub_0805E078(Manager*);
void sub_0805E000(Manager*);
void Manager37_Main(Manager* this) {
static void (*const gUnk_08108DBC[])(Manager*) = {
sub_0805DE50,
sub_0805DFE8,
};
gUnk_08108DBC[this->unk_0a](this);
}
void sub_0805DE50(Manager* this) {
gUnk_08108DC4[this->action](this);
static void (*const actionFuncs[])(Manager*) = {
sub_0805DE68, sub_0805DEB8, sub_0805DF4C, sub_0805DF98, sub_0805DFCC,
};
actionFuncs[this->action](this);
}
void sub_0805DE68(Manager* this) {
@@ -95,7 +105,7 @@ void sub_0805DF98(Manager* this) {
}
}
void sub_0805DFCC(void) {
void sub_0805DFCC(Manager* this) {
if (gFadeControl.active == 0) {
ClearGlobalFlag(ZELDA_CHASE);
sub_0805E094();
@@ -103,7 +113,11 @@ void sub_0805DFCC(void) {
}
void sub_0805DFE8(Manager* this) {
gUnk_08108DD8[this->action](this);
static void (*const actionFuncs[])(Manager*) = {
sub_0805E000,
sub_0805E078,
};
actionFuncs[this->action](this);
}
void sub_0805E000(Manager* this) {
src/manager/manager38.c
+8 -3
View File
@@ -1,12 +1,17 @@
#include "entity.h"
#include "room.h"
extern void (*const gUnk_08108DE0[])(Entity*);
extern Entity* LoadRoomEntity(EntityData*);
void sub_0805E0C0(Entity*);
void sub_0805E0F4(Entity*);
void Manager38_Main(Entity* this) {
gUnk_08108DE0[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_0805E0C0,
sub_0805E0F4,
};
actionFuncs[this->action](this);
}
void sub_0805E0C0(Entity* this) {
src/manager/manager4.c
+82 -10
View File
@@ -6,18 +6,24 @@
#include "structures.h"
#include "functions.h"
extern void (*gUnk_08107C70[])(Manager*);
void Manager4_Main(Manager*);
void sub_0805786C(Manager*);
void sub_08057920(Manager*);
void Manager4_Main(Manager* this) {
gUnk_08107C70[this->action](this);
static void (*const actionFuncs[])(Manager*) = {
sub_0805786C,
sub_08057920,
};
actionFuncs[this->action](this);
}
extern void UpdateIsDiggingCave(void);
extern DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance*, int);
extern const DiggingCaveEntrance* sub_08057AA8(const DiggingCaveEntrance*, int);
void sub_0805786C(Manager* this) {
DiggingCaveEntrance* tmp;
const DiggingCaveEntrance* tmp;
u8 room;
u8 area;
u16 uVar = 0x81 << 7;
@@ -50,10 +56,10 @@ void sub_0805786C(Manager* this) {
this->action = 1;
}
extern u32 sub_0805795C(Manager*, DiggingCaveEntrance*);
extern u32 sub_0805795C(Manager*, const DiggingCaveEntrance*);
void sub_08057920(Manager* this) {
DiggingCaveEntrance* tmp;
const DiggingCaveEntrance* tmp;
u8 room;
room = gRoomControls.room;
for (tmp = diggingCaveEntrances[gRoomControls.area];
@@ -61,9 +67,9 @@ void sub_08057920(Manager* this) {
;
}
void sub_08057A18(Manager*, DiggingCaveEntrance*);
void sub_08057A18(Manager*, const DiggingCaveEntrance*);
u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
u32 sub_0805795C(Manager* this, const DiggingCaveEntrance* entr) {
u16 offsetX, offsetY, offsetX2, offsetY2;
u32 tmp, tmp2;
if (gUnk_03004030.isDiggingCave) {
@@ -91,7 +97,7 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
extern void sub_08080930(u32);
void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
void sub_08057A18(Manager* this, const DiggingCaveEntrance* entr) {
u16 tmp;
SetInitializationPriority();
gUnk_03004030.unk_0a = gUnk_03004030.unk_09;
@@ -118,10 +124,76 @@ void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
DeleteManager(this);
}
DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance* entr, int room) {
const DiggingCaveEntrance* sub_08057AA8(const DiggingCaveEntrance* entr, int room) {
for (; entr->unk_00 != 0xFFFF; entr++) {
if (entr->source_room == room)
return entr;
}
return 0;
}
static const DiggingCaveEntrance gUnk_08107C78[] = { { -1, 0, 0, 0, 0 } };
static const DiggingCaveEntrance gUnk_08107C80[] = { { 0x4e5, 0x0, 0x0, 0xc, 0x0, 0xce5 },
{ 0x3df, 0x0, 0x0, 0xc, 0x0, 0xbdf },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107C98[] = { { 0x2c3, 0x4, 0x4, 0x13, 0x0, 0x2c3 },
{ 0x163, 0x5, 0x10, 0x19, 0x1, 0x448 },
{ 0x385, 0x7, 0xa, 0x13, 0x3, 0x385 },
{ 0x390, 0x7, 0xa, 0x13, 0x3, 0x390 },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107CC0[] = { { 0x62d, 0x0, 0x2, 0xf, 0x0, 0xa2d },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107CD0[] = { { 0x143, 0x1, 0x6, 0x14, 0x0, 0x643 },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107CE0[] = { { 0x95a, 0x0, 0x8, 0x16, 0x0, 0x95a },
{ 0x9ce, 0x0, 0x8, 0x16, 0x0, 0x9ce },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107CF8[] = { { 0x670, 0x0, 0xc, 0x17, 0x0, 0x670 },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107D08[] = { { 0x15e, 0x0, 0xe, 0x19, 0x1, 0x46e },
{ 0x79e, 0x0, 0x12, 0x19, 0x0, 0x248 },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107D20[] = { { 0xce5, 0x0, 0x1, 0x0, 0x0, 0x4e5 },
{ 0xbdf, 0x0, 0x1, 0x0, 0x0, 0x3df },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107D38[] = { { 0xa2d, 0x0, 0x3, 0x2, 0x0, 0x62d },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107D48[] = { { 0x2c3, 0x0, 0x5, 0x3, 0x4, 0x2c3 },
{ 0x385, 0x3, 0xb, 0x3, 0x7, 0x385 },
{ 0x390, 0x3, 0xb, 0x3, 0x7, 0x390 },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107D68[] = { { 0x643, 0x0, 0x7, 0x6, 0x1, 0x143 },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107D78[] = { { 0x95a, 0x0, 0x9, 0xa, 0x0, 0x95a },
{ 0x9ce, 0x0, 0x9, 0xa, 0x0, 0x9ce },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107D90[] = { { 0x670, 0x0, 0xd, 0x4, 0x0, 0x670 },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance gUnk_08107DA0[] = { { 0x46e, 0x1, 0xf, 0xb, 0x0, 0x15e },
{ 0x448, 0x1, 0x11, 0x3, 0x5, 0x163 },
{ 0x248, 0x0, 0x13, 0xb, 0x0, 0x79e },
{ -0x1, 0x0, 0x0, 0x0, 0x0, 0x0 } };
static const DiggingCaveEntrance* const diggingCaveEntrances[] = {
gUnk_08107C80, gUnk_08107C78, gUnk_08107CC0, gUnk_08107C98, gUnk_08107CF8, gUnk_08107C78, gUnk_08107CD0,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107CE0, gUnk_08107D08, gUnk_08107D20, gUnk_08107C78,
gUnk_08107C78, gUnk_08107D38, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107D48, gUnk_08107D68,
gUnk_08107C78, gUnk_08107D78, gUnk_08107D90, gUnk_08107C78, gUnk_08107DA0, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78, gUnk_08107C78,
};
src/manager/managerD.c
+9 -2
View File
@@ -32,10 +32,17 @@ typedef struct {
u16 field_0x3e;
} ManagerD;
extern void (*const gUnk_08108308[])(ManagerD*);
void sub_08058DE8(ManagerD*);
void sub_08058E18(ManagerD*);
void sub_08058E34(ManagerD*);
void ManagerD_Main(ManagerD* this) {
gUnk_08108308[this->manager.action](this);
static void (*const actionFuncs[])(ManagerD*) = {
sub_08058DE8,
sub_08058E18,
sub_08058E34,
};
actionFuncs[this->manager.action](this);
}
void sub_08058DE8(ManagerD* this) {
src/npc/cow.c
+26 -9
View File
@@ -7,13 +7,21 @@
void sub_0806920C(Entity* ent);
void sub_0806924C(Entity* ent);
extern void (*gUnk_08111914[])(Entity*);
extern void (*gUnk_08111928[])(Entity*);
extern Dialog gUnk_08111938[];
void sub_08068FC0(Entity* ent);
void sub_08069018(Entity* ent);
void sub_08069068(Entity* ent);
void sub_08069124(Entity* ent);
void sub_080691E0(Entity* ent);
void sub_08069148(Entity* ent);
void sub_08069168(Entity* ent);
void sub_08069188(Entity* ent);
void sub_080691BC(Entity* ent);
void Cow(Entity* ent) {
gUnk_08111914[ent->action](ent);
static void (*const actionFuncs[])(Entity*) = {
sub_08068FC0, sub_08069018, sub_08069068, sub_08069124, sub_080691E0,
};
actionFuncs[ent->action](ent);
sub_0806ED78(ent);
sub_0806920C(ent);
}
@@ -127,8 +135,14 @@ void sub_08069068(Entity* ent) {
}
void sub_08069124(Entity* ent) {
static void (*const subActionFuncs[])(Entity*) = {
sub_08069148,
sub_08069168,
sub_08069188,
sub_080691BC,
};
UpdateAnimationSingleFrame(ent);
gUnk_08111928[ent->subAction](ent);
subActionFuncs[ent->subAction](ent);
sub_0806924C(ent);
}
@@ -152,7 +166,7 @@ void sub_08069188(Entity* ent) {
return;
ent->frame = 0;
if (((s8)--ent->subtimer) != 0)
if (--ent->subtimer != 0)
return;
ent->subAction = 3;
InitAnimationForceUpdate(ent, ent->animationState + 16);
@@ -175,11 +189,15 @@ void sub_080691E0(Entity* ent) {
// Show dialogue
void Cow_ShowDialogue(Entity* ent) {
static const Dialog gUnk_08111938[] = { { 0x0, 0x0, 6, 1, { 0x2018, 0x3f34 } },
{ 0x0, 0x0, 6, 1, { 0x2018, 0x3f35 } },
{ 0x0, 0x0, 6, 1, { 0x2018, 0x3f36 } },
{ 0x0, 0x0, 6, 1, { 0x2018, 0x3f37 } },
{ 0x0, 0x0, 6, 1, { 0x2018, 0x3f38 } } };
ShowNPCDialogue(ent, &gUnk_08111938[ent->type]);
}
void sub_0806920C(Entity* ent) {
// TODO: figure out what bitfield flag this is
u32 var0 = gPlayerState.flags & PL_MINISH;
u32 var1 = -var0 >> 0x1F;
@@ -198,7 +216,6 @@ void sub_0806920C(Entity* ent) {
void sub_0806924C(Entity* ent) {
s8 itype = ent->interactType;
if (itype != 0) {
// TODO: figure out what bitfield flag this is
if ((gPlayerState.flags & PL_MINISH) != 0) {
if (itype == 2) {
ent->action = 4;

Some files were not shown because too many files have changed in this diff Show More