falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename files

This commit is contained in:
theo3 2021-12-28 23:33:10 -08:00
parent 4d04c1c920
commit cbd0b7e6c9
65 changed files with 4442 additions and 4629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
asm/code_0801967C.s → asm/beanstalkSubtask.s
View File

196
asm/code_0801C1D4.s
View File

@ -1,196 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C1D4
sub_0801C1D4: @ 0x0801C1D4
push {r4, lr}
movs r4, #0
_0801C1D8:
lsls r1, r4, #5
ldr r0, _0801C200 @ =gUnk_0200AF34
adds r2, r1, r0
ldrb r1, [r2]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _0801C1F8
ldrb r0, [r2, #1]
lsls r0, r0, #4
ldr r1, _0801C204 @ =gUnk_080C8F8C
adds r0, r0, r1
ldr r1, [r0, #8]
adds r0, r2, #0
bl _call_via_r1
_0801C1F8:
adds r4, #1
cmp r4, #0x17
bls _0801C1D8
pop {r4, pc}
.align 2, 0
_0801C200: .4byte gUnk_0200AF34
_0801C204: .4byte gUnk_080C8F8C
thumb_func_start sub_0801C208
sub_0801C208: @ 0x0801C208
push {r4, r5, lr}
movs r5, #0
ldr r4, _0801C250 @ =gOamCmd
_0801C20E:
lsls r1, r5, #5
ldr r0, _0801C254 @ =gUnk_0200AF34
adds r3, r1, r0
ldrb r1, [r3]
movs r0, #3
ands r0, r1
cmp r0, #3
bne _0801C248
ldrh r0, [r3, #0xc]
strh r0, [r4]
ldrh r0, [r3, #0xe]
strh r0, [r4, #2]
ldrb r2, [r3, #1]
lsls r2, r2, #4
ldr r0, _0801C258 @ =gUnk_080C8F8C
adds r2, r2, r0
ldrh r0, [r2]
strh r0, [r4, #4]
ldrh r0, [r2, #2]
strh r0, [r4, #6]
ldrb r0, [r3, #0x18]
lsls r0, r0, #0xc
ldrh r1, [r3, #0x1a]
orrs r0, r1
strh r0, [r4, #8]
ldrh r0, [r2, #6]
ldrb r1, [r3, #0x10]
bl sub_080ADA14
_0801C248:
adds r5, #1
cmp r5, #0x17
bls _0801C20E
pop {r4, r5, pc}
.align 2, 0
_0801C250: .4byte gOamCmd
_0801C254: .4byte gUnk_0200AF34
_0801C258: .4byte gUnk_080C8F8C
thumb_func_start sub_0801C25C
sub_0801C25C: @ 0x0801C25C
push {r4, r5, r6, r7, lr}
movs r4, #0
ldr r5, _0801C2E4 @ =gUnk_0200AF34
adds r6, r5, #0
subs r6, #0x34
movs r7, #0xd
rsbs r7, r7, #0
ldr r3, _0801C2E8 @ =0x040000D4
_0801C26C:
lsls r0, r4, #5
adds r2, r0, r5
ldrb r1, [r2]
movs r0, #3
ands r0, r1
cmp r0, #3
bne _0801C2A8
lsls r0, r1, #0x1c
lsrs r0, r0, #0x1e
cmp r0, #1
bne _0801C2A8
adds r0, r7, #0
ands r0, r1
movs r1, #8
orrs r0, r1
strb r0, [r2]
ldr r0, [r2, #0x1c]
str r0, [r3]
ldrh r0, [r2, #0x1a]
lsls r0, r0, #5
ldr r1, _0801C2EC @ =0x06010000
adds r0, r0, r1
str r0, [r3, #4]
ldrb r0, [r2, #0x19]
lsls r0, r0, #3
movs r1, #0x84
lsls r1, r1, #0x18
orrs r0, r1
str r0, [r3, #8]
ldr r0, [r3, #8]
_0801C2A8:
adds r4, #1
cmp r4, #0x17
ble _0801C26C
adds r2, r6, #0
ldrb r3, [r2, #0x13]
movs r0, #0x13
ldrsb r0, [r2, r0]
cmp r0, #0
bge _0801C2C8
movs r1, #0x7f
ands r1, r3
strb r1, [r2, #0x13]
movs r0, #0x8d
lsls r0, r0, #1
bl sub_0801C2F0
_0801C2C8:
ldrb r2, [r6, #0x14]
movs r0, #0x14
ldrsb r0, [r6, r0]
cmp r0, #0
bge _0801C2E0
movs r1, #0x7f
ands r1, r2
strb r1, [r6, #0x14]
movs r0, #0x93
lsls r0, r0, #1
bl sub_0801C2F0
_0801C2E0:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801C2E4: .4byte gUnk_0200AF34
_0801C2E8: .4byte 0x040000D4
_0801C2EC: .4byte 0x06010000
thumb_func_start sub_0801C2F0
sub_0801C2F0: @ 0x0801C2F0
push {r4, r5, lr}
adds r4, r0, #0
adds r0, r1, #0
lsls r5, r4, #5
ldr r1, _0801C330 @ =0x06010000
adds r4, r5, r1
movs r1, #0xa
bl Div
cmp r0, #9
bls _0801C308
movs r0, #9
_0801C308:
ldr r2, _0801C334 @ =0x040000D4
lsls r0, r0, #5
ldr r3, _0801C338 @ =gUnk_085C4620
adds r0, r0, r3
str r0, [r2]
str r4, [r2, #4]
ldr r4, _0801C33C @ =0x84000008
str r4, [r2, #8]
ldr r0, [r2, #8]
adds r1, #0xa
lsls r1, r1, #5
adds r1, r1, r3
str r1, [r2]
ldr r1, _0801C340 @ =0x06010020
adds r0, r5, r1
str r0, [r2, #4]
str r4, [r2, #8]
ldr r0, [r2, #8]
pop {r4, r5, pc}
.align 2, 0
_0801C330: .4byte 0x06010000
_0801C334: .4byte 0x040000D4
_0801C338: .4byte gUnk_085C4620
_0801C33C: .4byte 0x84000008
_0801C340: .4byte 0x06010020

151
asm/code_0801C370.s
View File

@ -1,151 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C370
sub_0801C370: @ 0x0801C370
push {r4, r5, r6, lr}
cmp r0, #0
bne _0801C390
ldr r0, _0801C388 @ =gSave
adds r1, r0, #0
adds r1, #0xaa
ldrb r1, [r1]
lsrs r6, r1, #1
adds r0, #0xc0
ldrh r4, [r0]
ldr r5, _0801C38C @ =gUnk_0200AF00
b _0801C398
.align 2, 0
_0801C388: .4byte gSave
_0801C38C: .4byte gUnk_0200AF00
_0801C390:
ldr r0, _0801C470 @ =gUnk_0200AF00
ldrb r6, [r0, #3]
ldrh r4, [r0, #0xe]
adds r5, r0, #0
_0801C398:
movs r1, #0xcd
lsls r1, r1, #2
adds r0, r5, #0
bl MemClear
strb r6, [r5, #3]
strh r4, [r5, #0xe]
ldr r0, _0801C474 @ =gSave
adds r0, #0xab
ldrb r0, [r0]
lsrs r0, r0, #1
strb r0, [r5, #4]
movs r0, #0xc
bl LoadPaletteGroup
movs r0, #0x10
bl LoadGfxGroup
ldr r4, _0801C478 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
adds r0, r4, #0
bl MemClear
ldr r1, _0801C47C @ =gScreen
str r4, [r1, #0x10]
ldr r0, _0801C480 @ =0x00001F0C
strh r0, [r1, #8]
ldrh r2, [r1]
movs r3, #0x80
lsls r3, r3, #1
adds r0, r3, #0
orrs r0, r2
strh r0, [r1]
ldr r1, _0801C484 @ =gUnk_03000000
ldr r2, _0801C488 @ =0x00000427
adds r0, r1, r2
movs r2, #1
strb r2, [r0]
ldr r3, _0801C48C @ =0x00000426
adds r0, r1, r3
strb r2, [r0]
ldr r0, _0801C490 @ =0x0000042E
adds r1, r1, r0
strb r2, [r1]
movs r0, #0x7f
strb r0, [r5, #0x13]
strb r0, [r5, #0x14]
strb r0, [r5, #8]
bl sub_0801C6B0
bl sub_0801C4B0
bl sub_0801C85C
bl sub_0801C99C
movs r0, #0xd0
strh r0, [r5, #0x16]
movs r0, #0xb8
strh r0, [r5, #0x18]
movs r0, #0xd8
strh r0, [r5, #0x1a]
movs r0, #0x1c
strh r0, [r5, #0x1c]
strh r0, [r5, #0x1e]
movs r0, #0xe
strh r0, [r5, #0x20]
adds r0, r5, #0
adds r0, #0x34
movs r1, #0xc0
lsls r1, r1, #2
bl MemClear
movs r0, #5
movs r1, #9
bl sub_0801CA6C
movs r0, #3
movs r1, #0
bl sub_0801CA6C
movs r0, #4
movs r1, #0
bl sub_0801CA6C
movs r0, #2
movs r1, #0
bl sub_0801CA6C
movs r0, #1
movs r1, #0
bl sub_0801CA6C
movs r0, #0
movs r1, #0
bl sub_0801CA6C
movs r0, #7
movs r1, #0
bl sub_0801CA6C
movs r0, #6
movs r1, #0
bl sub_0801CA6C
pop {r4, r5, r6, pc}
.align 2, 0
_0801C470: .4byte gUnk_0200AF00
_0801C474: .4byte gSave
_0801C478: .4byte gBG0Buffer
_0801C47C: .4byte gScreen
_0801C480: .4byte 0x00001F0C
_0801C484: .4byte gUnk_03000000
_0801C488: .4byte 0x00000427
_0801C48C: .4byte 0x00000426
_0801C490: .4byte 0x0000042E
thumb_func_start RefreshUI
RefreshUI: @ 0x0801C494
ldr r1, _0801C49C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
bx lr
.align 2, 0
_0801C49C: .4byte gScreen
thumb_func_start RecoverUI
RecoverUI: @ 0x0801C4A0
ldr r1, _0801C4AC @ =gUnk_0200AF00
movs r0, #0
strb r0, [r1, #2]
strb r0, [r1, #0x10]
strb r0, [r1, #0xa]
bx lr
.align 2, 0
_0801C4AC: .4byte gUnk_0200AF00

112
asm/code_0801C5E0.s
View File

@ -1,112 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C5E0
sub_0801C5E0: @ 0x0801C5E0
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r7, _0801C650 @ =gUnk_085C4B20
cmp r2, #0
bne _0801C5F0
ldr r0, _0801C654 @ =0xFFFFFD80
adds r7, r7, r0
_0801C5F0:
ldr r0, _0801C658 @ =0x000003FF
ands r0, r4
lsls r6, r0, #5
ldr r0, _0801C65C @ =0x0600C000
adds r4, r6, r0
cmp r3, #2
beq _0801C620
cmp r3, #3
bne _0801C63C
adds r0, r5, #0
movs r1, #0x64
bl Div
adds r5, r1, #0
ldr r1, _0801C660 @ =0x040000D4
lsls r0, r0, #6
adds r0, r7, r0
str r0, [r1]
str r4, [r1, #4]
ldr r0, _0801C664 @ =0x84000010
str r0, [r1, #8]
ldr r0, [r1, #8]
ldr r0, _0801C668 @ =0x0600C040
adds r4, r6, r0
_0801C620:
adds r0, r5, #0
movs r1, #0xa
bl Div
adds r5, r1, #0
ldr r1, _0801C660 @ =0x040000D4
lsls r0, r0, #6
adds r0, r7, r0
str r0, [r1]
str r4, [r1, #4]
ldr r0, _0801C664 @ =0x84000010
str r0, [r1, #8]
ldr r0, [r1, #8]
adds r4, #0x40
_0801C63C:
ldr r1, _0801C660 @ =0x040000D4
lsls r0, r5, #6
adds r0, r7, r0
str r0, [r1]
str r4, [r1, #4]
ldr r0, _0801C664 @ =0x84000010
str r0, [r1, #8]
ldr r0, [r1, #8]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801C650: .4byte gUnk_085C4B20
_0801C654: .4byte 0xFFFFFD80
_0801C658: .4byte 0x000003FF
_0801C65C: .4byte 0x0600C000
_0801C660: .4byte 0x040000D4
_0801C664: .4byte 0x84000010
_0801C668: .4byte 0x0600C040
thumb_func_start sub_0801C66C
sub_0801C66C: @ 0x0801C66C
push {lr}
ldr r1, _0801C6A4 @ =gUnk_0200AF00
ldrb r0, [r1, #2]
cmp r0, #0
beq _0801C6A2
movs r0, #0
strb r0, [r1, #2]
ldrb r0, [r1, #4]
movs r2, #1
cmp r0, #0x28
bls _0801C684
movs r2, #2
_0801C684:
ldr r0, _0801C6A8 @ =gUnk_02034CF0
ldr r3, _0801C6AC @ =gScreen
movs r1, #0
_0801C68A:
str r1, [r0]
str r1, [r0, #4]
str r1, [r0, #8]
str r1, [r0, #0xc]
str r1, [r0, #0x10]
str r1, [r0, #0x14]
adds r0, #0x40
subs r2, #1
cmp r2, #0
bgt _0801C68A
movs r0, #1
strh r0, [r3, #0xe]
_0801C6A2:
pop {pc}
.align 2, 0
_0801C6A4: .4byte gUnk_0200AF00
_0801C6A8: .4byte gUnk_02034CF0
_0801C6AC: .4byte gScreen

869
asm/code_0801C85C.s
View File

@ -1,869 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C85C
sub_0801C85C: @ 0x0801C85C
push {r4, r5, r6, lr}
movs r2, #0
ldr r5, _0801C884 @ =gUnk_0200AF00
ldrb r1, [r5, #1]
movs r0, #0x20
ands r0, r1
cmp r0, #0
bne _0801C878
ldr r0, _0801C888 @ =gPlayerState
adds r0, #0xa0
ldrb r1, [r0]
rsbs r0, r1, #0
orrs r0, r1
lsrs r2, r0, #0x1f
_0801C878:
cmp r2, #0
bne _0801C88C
bl sub_0801C824
b _0801C984
.align 2, 0
_0801C884: .4byte gUnk_0200AF00
_0801C888: .4byte gPlayerState
_0801C88C:
ldrb r0, [r5, #4]
ldr r4, _0801C92C @ =gUnk_02034D30
cmp r0, #0x28
bls _0801C896
adds r4, #0x40
_0801C896:
ldr r0, _0801C930 @ =gPlayerState
adds r0, #0xa4
movs r1, #0
ldrsh r0, [r0, r1]
adds r0, #0x13
movs r1, #0x14
bl Div
adds r1, r0, #0
cmp r1, #0x28
bls _0801C8AE
movs r1, #0x28
_0801C8AE:
ldrb r0, [r5, #6]
cmp r0, #0
beq _0801C8BA
ldrb r0, [r5, #7]
cmp r0, r1
beq _0801C910
_0801C8BA:
movs r6, #1
strb r6, [r5, #6]
strb r1, [r5, #7]
adds r0, r1, #0
movs r1, #4
bl Div
adds r3, r0, #0
adds r5, r1, #0
ldr r1, _0801C934 @ =0x0000F016
adds r0, r1, #0
strh r0, [r4]
ldr r1, _0801C938 @ =0x0000F416
adds r0, r1, #0
strh r0, [r4, #0x16]
ldr r2, _0801C93C @ =0x040000D4
movs r0, #0xa
subs r0, r0, r3
lsls r0, r0, #1
ldr r1, _0801C940 @ =gUnk_080C8F54
adds r0, r0, r1
str r0, [r2]
adds r0, r4, #2
str r0, [r2, #4]
ldr r0, _0801C944 @ =0x8000000A
str r0, [r2, #8]
ldr r0, [r2, #8]
cmp r5, #0
beq _0801C90C
lsls r2, r3, #1
adds r2, r2, r4
adds r0, r5, #0
adds r0, #0x17
ldr r3, _0801C948 @ =0x000003FF
adds r1, r3, #0
ands r0, r1
movs r3, #0xf0
lsls r3, r3, #8
adds r1, r3, #0
orrs r0, r1
strh r0, [r2, #2]
_0801C90C:
ldr r0, _0801C94C @ =gScreen
strh r6, [r0, #0xe]
_0801C910:
ldr r0, _0801C930 @ =gPlayerState
adds r0, #0xa0
ldrb r0, [r0]
cmp r0, #5
bgt _0801C962
cmp r0, #4
blt _0801C962
ldr r2, _0801C950 @ =gUnk_0200AF00
ldrb r1, [r2, #9]
adds r4, r2, #0
cmp r0, #4
bne _0801C954
adds r0, r1, #2
b _0801C956
.align 2, 0
_0801C92C: .4byte gUnk_02034D30
_0801C930: .4byte gPlayerState
_0801C934: .4byte 0x0000F016
_0801C938: .4byte 0x0000F416
_0801C93C: .4byte 0x040000D4
_0801C940: .4byte gUnk_080C8F54
_0801C944: .4byte 0x8000000A
_0801C948: .4byte 0x000003FF
_0801C94C: .4byte gScreen
_0801C950: .4byte gUnk_0200AF00
_0801C954:
adds r0, r1, #1
_0801C956:
strb r0, [r2, #9]
ldrb r0, [r4, #9]
lsrs r3, r0, #4
movs r0, #3
ands r3, r0
b _0801C966
_0801C962:
movs r3, #0
ldr r4, _0801C988 @ =gUnk_0200AF00
_0801C966:
ldrb r0, [r4, #8]
cmp r3, r0
beq _0801C984
strb r3, [r4, #8]
ldr r4, _0801C98C @ =0x0600C2C0
ldr r1, _0801C990 @ =0x040000D4
ldr r2, _0801C994 @ =gUnk_080C8F7C
lsls r0, r3, #2
adds r0, r0, r2
ldr r0, [r0]
str r0, [r1]
str r4, [r1, #4]
ldr r0, _0801C998 @ =0x84000030
str r0, [r1, #8]
ldr r0, [r1, #8]
_0801C984:
pop {r4, r5, r6, pc}
.align 2, 0
_0801C988: .4byte gUnk_0200AF00
_0801C98C: .4byte 0x0600C2C0
_0801C990: .4byte 0x040000D4
_0801C994: .4byte gUnk_080C8F7C
_0801C998: .4byte 0x84000030
thumb_func_start sub_0801C99C
sub_0801C99C: @ 0x0801C99C
push {r4, r5, lr}
ldr r4, _0801C9E0 @ =gUnk_0200AF00
ldrb r1, [r4, #1]
movs r0, #0x80
ands r0, r1
cmp r0, #0
bne _0801C9B2
bl sub_08052724
cmp r0, #0
bne _0801C9EC
_0801C9B2:
ldrb r0, [r4, #0x10]
cmp r0, #0
beq _0801CA50
movs r0, #0
strb r0, [r4, #0x10]
ldr r2, _0801C9E4 @ =gUnk_020350E2
strh r0, [r2]
strh r0, [r2, #2]
strh r0, [r2, #4]
strh r0, [r2, #6]
adds r1, r2, #0
adds r1, #0x40
strh r0, [r1]
adds r1, #2
strh r0, [r1]
adds r1, #2
strh r0, [r1]
adds r1, #2
strh r0, [r1]
ldr r1, _0801C9E8 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
b _0801CA50
.align 2, 0
_0801C9E0: .4byte gUnk_0200AF00
_0801C9E4: .4byte gUnk_020350E2
_0801C9E8: .4byte gScreen
_0801C9EC:
ldrb r0, [r4, #0x10]
cmp r0, #0
bne _0801CA1E
ldr r2, _0801CA54 @ =gUnk_020350E2
adds r1, r2, #0
adds r1, #0x40
ldr r3, _0801CA58 @ =0x0000F01C
strh r3, [r2]
adds r0, r3, #1
strh r0, [r2, #2]
adds r0, r3, #2
strh r0, [r1]
adds r0, r3, #3
strh r0, [r1, #2]
adds r3, #0x5a
strh r3, [r2, #4]
adds r0, r3, #1
strh r0, [r1, #4]
adds r0, r3, #2
strh r0, [r2, #6]
adds r0, r3, #3
strh r0, [r1, #6]
ldr r1, _0801CA5C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_0801CA1E:
ldr r0, _0801CA60 @ =gSave
ldr r3, _0801CA64 @ =gArea
ldrb r1, [r3, #3]
ldr r5, _0801CA68 @ =0x0000045C
adds r2, r0, r5
adds r1, r1, r2
ldrb r0, [r4, #0x12]
ldrb r1, [r1]
cmp r0, r1
bne _0801CA38
ldrb r0, [r4, #0x10]
cmp r0, #0
bne _0801CA50
_0801CA38:
movs r0, #2
strb r0, [r4, #0x10]
ldrb r0, [r3, #3]
adds r0, r0, r2
ldrb r0, [r0]
strb r0, [r4, #0x12]
ldrb r1, [r4, #0x12]
movs r0, #0x76
movs r2, #0
movs r3, #2
bl sub_0801C5E0
_0801CA50:
pop {r4, r5, pc}
.align 2, 0
_0801CA54: .4byte gUnk_020350E2
_0801CA58: .4byte 0x0000F01C
_0801CA5C: .4byte gScreen
_0801CA60: .4byte gSave
_0801CA64: .4byte gArea
_0801CA68: .4byte 0x0000045C
thumb_func_start sub_0801CA6C
sub_0801CA6C: @ 0x0801CA6C
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r6, r1, #0
movs r3, #0
ldr r7, _0801CAA8 @ =gUnk_0200AF34
movs r0, #1
mov ip, r0
ldr r1, _0801CAAC @ =gUnk_080C8F8C
lsls r0, r5, #4
adds r4, r0, r1
_0801CA80:
lsls r0, r3, #5
adds r1, r0, r7
ldrb r2, [r1]
movs r0, #1
ands r0, r2
cmp r0, #0
bne _0801CAB0
strb r5, [r1, #1]
strb r6, [r1, #2]
movs r0, #0xff
strb r0, [r1, #0x10]
mov r0, ip
orrs r0, r2
strb r0, [r1]
ldrh r0, [r4, #4]
strh r0, [r1, #0x1a]
ldrb r0, [r4, #0xc]
strb r0, [r1, #3]
b _0801CAB6
.align 2, 0
_0801CAA8: .4byte gUnk_0200AF34
_0801CAAC: .4byte gUnk_080C8F8C
_0801CAB0:
adds r3, #1
cmp r3, #0x17
bls _0801CA80
_0801CAB6:
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0801CAB8
sub_0801CAB8: @ 0x0801CAB8
push {lr}
str r1, [r0, #0x14]
ldrb r2, [r1, #1]
strb r2, [r0, #0x11]
ldrb r2, [r1, #2]
strb r2, [r0, #0x12]
ldrb r2, [r1, #3]
strb r2, [r0, #0x13]
ldrb r1, [r1]
bl sub_0801CAFC
pop {pc}
thumb_func_start sub_0801CAD0
sub_0801CAD0: @ 0x0801CAD0
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0x11]
subs r0, #1
strb r0, [r2, #0x11]
lsls r0, r0, #0x18
cmp r0, #0
bne _0801CAF8
ldr r1, [r2, #0x14]
movs r0, #3
ldrsb r0, [r1, r0]
cmp r0, #0
bge _0801CAF0
ldrb r0, [r1, #4]
lsls r0, r0, #2
subs r1, r1, r0
_0801CAF0:
adds r1, #4
adds r0, r2, #0
bl sub_0801CAB8
_0801CAF8:
pop {pc}
.align 2, 0
thumb_func_start sub_0801CAFC
sub_0801CAFC: @ 0x0801CAFC
push {lr}
adds r2, r0, #0
adds r3, r1, #0
ldrb r0, [r2, #1]
lsls r0, r0, #4
ldr r1, _0801CB1C @ =gUnk_080C8F8C
adds r1, r0, r1
ldrb r0, [r2, #0x10]
cmp r3, r0
beq _0801CB18
strb r3, [r2, #0x10]
adds r0, r2, #0
bl sub_0801CB20
_0801CB18:
pop {pc}
.align 2, 0
_0801CB1C: .4byte gUnk_080C8F8C
thumb_func_start sub_0801CB20
sub_0801CB20: @ 0x0801CB20
push {lr}
adds r3, r0, #0
ldrb r0, [r1, #0xe]
cmp r0, #0
bne _0801CB76
ldrh r1, [r1, #6]
lsls r1, r1, #4
ldr r0, _0801CB54 @ =gSpritePtrs
adds r1, r1, r0
ldrb r0, [r3, #0x10]
lsls r0, r0, #2
ldr r2, [r1, #4]
adds r2, r2, r0
ldrh r0, [r2, #2]
lsls r0, r0, #5
ldr r1, [r1, #8]
adds r1, r1, r0
ldrb r2, [r2]
cmp r2, #0
bne _0801CB58
ldrb r1, [r3]
movs r0, #0xd
rsbs r0, r0, #0
ands r0, r1
strb r0, [r3]
b _0801CB74
.align 2, 0
_0801CB54: .4byte gSpritePtrs
_0801CB58:
ldrb r0, [r3, #0x19]
cmp r0, r2
bne _0801CB64
ldr r0, [r3, #0x1c]
cmp r0, r1
beq _0801CB74
_0801CB64:
str r1, [r3, #0x1c]
ldrb r0, [r3]
movs r1, #0xd
rsbs r1, r1, #0
ands r1, r0
movs r0, #4
orrs r1, r0
strb r1, [r3]
_0801CB74:
strb r2, [r3, #0x19]
_0801CB76:
pop {pc}
thumb_func_start sub_0801CB78
sub_0801CB78: @ 0x0801CB78
push {lr}
ldr r2, _0801CB8C @ =gUnk_080C903C
ldrb r1, [r0, #4]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0801CB8C: .4byte gUnk_080C903C
thumb_func_start sub_0801CB90
sub_0801CB90: @ 0x0801CB90
push {lr}
ldr r3, _0801CBC4 @ =gUnk_0200AF00
ldrb r1, [r0, #1]
lsls r1, r1, #1
adds r2, r3, #0
adds r2, #0x16
adds r1, r1, r2
ldrh r1, [r1]
strh r1, [r0, #0xc]
ldrb r1, [r0, #1]
lsls r1, r1, #1
adds r3, #0x1c
adds r1, r1, r3
ldrh r1, [r1]
subs r1, #0x20
strh r1, [r0, #0xe]
movs r1, #1
strb r1, [r0, #4]
ldrb r1, [r0]
movs r2, #2
orrs r1, r2
strb r1, [r0]
ldrb r1, [r0, #1]
bl sub_0801CAFC
pop {pc}
.align 2, 0
_0801CBC4: .4byte gUnk_0200AF00
thumb_func_start sub_0801CBC8
sub_0801CBC8: @ 0x0801CBC8
push {r4, r5, r6, lr}
adds r5, r0, #0
ldrb r0, [r5, #2]
movs r6, #8
cmp r0, #0
bne _0801CC10
movs r6, #4
cmp r0, #0
bne _0801CC10
ldr r3, _0801CC08 @ =gUnk_0200AF00
ldrb r0, [r3, #1]
ldrb r2, [r5, #1]
asrs r0, r2
movs r1, #1
ands r0, r1
cmp r0, #0
bne _0801CBF6
ldr r0, _0801CC0C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
beq _0801CC10
_0801CBF6:
lsls r0, r2, #1
adds r1, r3, #0
adds r1, #0x1c
adds r0, r0, r1
movs r1, #0
ldrsh r0, [r0, r1]
adds r1, r0, #0
subs r1, #0x28
b _0801CC1E
.align 2, 0
_0801CC08: .4byte gUnk_0200AF00
_0801CC0C: .4byte gMessage
_0801CC10:
ldr r1, _0801CC7C @ =gUnk_0200AF00
ldrb r0, [r5, #1]
lsls r0, r0, #1
adds r1, #0x1c
adds r0, r0, r1
movs r2, #0
ldrsh r1, [r0, r2]
_0801CC1E:
movs r2, #0xe
ldrsh r0, [r5, r2]
subs r4, r1, r0
adds r1, r4, #0
cmp r4, #0
bge _0801CC2C
rsbs r4, r4, #0
_0801CC2C:
cmp r6, r4
bgt _0801CC32
adds r4, r6, #0
_0801CC32:
adds r0, r1, #0
bl sub_08000E44
muls r4, r0, r4
cmp r4, #0
beq _0801CC44
ldrh r0, [r5, #0xe]
adds r0, r0, r4
strh r0, [r5, #0xe]
_0801CC44:
ldr r0, _0801CC7C @ =gUnk_0200AF00
ldrb r1, [r5, #1]
lsls r1, r1, #1
adds r0, #0x16
adds r1, r1, r0
movs r0, #0
ldrsh r1, [r1, r0]
movs r2, #0xc
ldrsh r0, [r5, r2]
subs r4, r1, r0
adds r1, r4, #0
cmp r4, #0
bge _0801CC60
rsbs r4, r4, #0
_0801CC60:
cmp r6, r4
bgt _0801CC66
adds r4, r6, #0
_0801CC66:
adds r0, r1, #0
bl sub_08000E44
muls r4, r0, r4
cmp r4, #0
beq _0801CC78
ldrh r0, [r5, #0xc]
adds r0, r0, r4
strh r0, [r5, #0xc]
_0801CC78:
pop {r4, r5, r6, pc}
.align 2, 0
_0801CC7C: .4byte gUnk_0200AF00
thumb_func_start sub_0801CC80
sub_0801CC80: @ 0x0801CC80
push {r4, r5, lr}
ldrb r1, [r0, #1]
movs r0, #3
eors r1, r0
rsbs r0, r1, #0
orrs r0, r1
lsrs r0, r0, #0x1f
ldr r5, _0801CCAC @ =gSave
adds r1, r5, #0
adds r1, #0xb4
adds r0, r0, r1
ldrb r4, [r0]
adds r0, r4, #0
bl ItemIsBottle
cmp r0, #0
beq _0801CCA8
adds r0, r5, r4
adds r0, #0x9a
ldrb r4, [r0]
_0801CCA8:
adds r0, r4, #0
pop {r4, r5, pc}
.align 2, 0
_0801CCAC: .4byte gSave
thumb_func_start sub_0801CCB0
sub_0801CCB0: @ 0x0801CCB0
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r1, [r4]
movs r0, #3
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4]
adds r0, r4, #0
bl sub_0801CC80
adds r1, r0, #0
cmp r1, #0
beq _0801CD90
ldrb r0, [r4, #8]
cmp r0, r1
beq _0801CCE0
strb r1, [r4, #8]
ldr r0, _0801CD1C @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r4, #0
bl sub_0801CAB8
_0801CCE0:
ldrb r0, [r4, #1]
movs r1, #3
eors r0, r1
rsbs r1, r0, #0
orrs r1, r0
lsrs r6, r1, #0x1f
ldr r3, _0801CD20 @ =gUnk_0200AF13
cmp r6, #0
beq _0801CCF4
adds r3, #1
_0801CCF4:
ldrb r0, [r4, #8]
cmp r0, #7
blt _0801CD60
cmp r0, #8
ble _0801CD28
cmp r0, #0xa
bgt _0801CD60
ldr r1, _0801CD24 @ =gSave
adds r0, r1, #0
adds r0, #0xad
ldrb r2, [r0]
ldrb r0, [r3]
adds r5, r1, #0
cmp r0, r2
beq _0801CD4C
adds r0, r2, #0
adds r0, #0x80
strb r0, [r3]
b _0801CD4C
.align 2, 0
_0801CD1C: .4byte gSpriteAnimations_322
_0801CD20: .4byte gUnk_0200AF13
_0801CD24: .4byte gSave
_0801CD28:
ldr r5, _0801CD44 @ =gSave
adds r0, r5, #0
adds r0, #0xac
ldrb r2, [r0]
ldrb r0, [r3]
cmp r0, r2
beq _0801CD3C
adds r0, r2, #0
adds r0, #0x80
strb r0, [r3]
_0801CD3C:
ldr r1, _0801CD48 @ =gBombBagSizes
adds r0, r5, #0
adds r0, #0xae
b _0801CD52
.align 2, 0
_0801CD44: .4byte gSave
_0801CD48: .4byte gBombBagSizes
_0801CD4C:
ldr r1, _0801CD5C @ =gQuiverSizes
adds r0, r5, #0
adds r0, #0xaf
_0801CD52:
ldrb r0, [r0]
adds r0, r0, r1
ldrb r0, [r0]
b _0801CD64
.align 2, 0
_0801CD5C: .4byte gQuiverSizes
_0801CD60:
movs r0, #1
movs r2, #0
_0801CD64:
movs r1, #3
cmp r0, r2
bhi _0801CD6C
movs r1, #4
_0801CD6C:
strb r1, [r4, #0x18]
adds r0, r6, #0
bl sub_0801CE24
adds r1, r0, #0
cmp r1, #0
beq _0801CD90
ldrh r0, [r1, #0xc]
strh r0, [r4, #0xc]
ldrh r0, [r1, #0xe]
strh r0, [r4, #0xe]
ldrb r0, [r4]
movs r1, #2
orrs r0, r1
strb r0, [r4]
adds r0, r4, #0
bl sub_0801CAD0
_0801CD90:
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_0801CD94
sub_0801CD94: @ 0x0801CD94
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #2]
ldr r1, _0801CDC0 @ =gUnk_0200AF00
cmp r0, #9
bne _0801CDD4
adds r0, r1, #0
adds r0, #0x2f
ldrb r2, [r0]
cmp r2, #0
bne _0801CDCE
ldr r0, _0801CDC4 @ =gArea
ldrb r0, [r0, #0x18]
cmp r0, #2
beq _0801CDC8
cmp r0, #3
beq _0801CDCC
adds r0, r1, #0
adds r0, #0x2c
ldrb r2, [r0]
b _0801CDCE
.align 2, 0
_0801CDC0: .4byte gUnk_0200AF00
_0801CDC4: .4byte gArea
_0801CDC8:
movs r2, #0xb
b _0801CDCE
_0801CDCC:
movs r2, #0xa
_0801CDCE:
adds r0, r1, #0
adds r0, #0x32
strb r2, [r0]
_0801CDD4:
adds r0, r1, #0
adds r0, #0x30
ldrb r1, [r4, #3]
adds r0, r0, r1
ldrb r2, [r0]
ldrb r1, [r4]
movs r0, #3
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4]
cmp r2, #0
beq _0801CE1E
ldr r1, _0801CE20 @ =gUnk_080C9044
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
adds r0, r0, r1
ldrb r0, [r0]
adds r2, r2, r0
adds r0, r4, #0
adds r1, r2, #0
bl sub_0801CAFC
ldrb r0, [r4, #3]
bl sub_0801CE24
adds r1, r0, #0
cmp r1, #0
beq _0801CE1E
ldrh r0, [r1, #0xc]
strh r0, [r4, #0xc]
ldrh r0, [r1, #0xe]
strh r0, [r4, #0xe]
ldrb r0, [r4]
movs r1, #2
orrs r0, r1
strb r0, [r4]
_0801CE1E:
pop {r4, pc}
.align 2, 0
_0801CE20: .4byte gUnk_080C9044
thumb_func_start sub_0801CE24
sub_0801CE24: @ 0x0801CE24
push {r4, r5, r6, lr}
adds r5, r0, #0
movs r4, #0
movs r6, #1
ldr r3, _0801CE44 @ =gUnk_0200AF34
adds r2, r3, #0
_0801CE30:
ldrb r1, [r2]
adds r0, r6, #0
ands r0, r1
cmp r0, #0
beq _0801CE48
ldrb r0, [r2, #1]
cmp r5, r0
bne _0801CE48
adds r0, r3, #0
b _0801CE54
.align 2, 0
_0801CE44: .4byte gUnk_0200AF34
_0801CE48:
adds r2, #0x20
adds r3, #0x20
adds r4, #1
cmp r4, #0x17
bls _0801CE30
movs r0, #0
_0801CE54:
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_0801CE58
sub_0801CE58: @ 0x0801CE58
push {r4, lr}
adds r3, r0, #0
ldrb r0, [r3]
movs r4, #3
rsbs r4, r4, #0
ands r4, r0
strb r4, [r3]
ldr r2, _0801CEB8 @ =gUnk_0200AF00
ldrb r1, [r2, #1]
movs r0, #0x10
ands r0, r1
cmp r0, #0
bne _0801CEB4
ldr r0, _0801CEBC @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
bne _0801CEB4
ldrb r2, [r2, #3]
cmp r2, #0
beq _0801CEB4
movs r0, #2
adds r1, r4, #0
orrs r1, r0
strb r1, [r3]
adds r0, r2, #3
lsrs r0, r0, #2
lsls r0, r0, #3
adds r1, r0, #3
movs r4, #0xc
cmp r2, #0x28
bls _0801CE9E
movs r4, #0x14
subs r1, #0x50
_0801CE9E:
strh r1, [r3, #0xc]
strh r4, [r3, #0xe]
movs r1, #3
ands r1, r2
cmp r1, #0
bne _0801CEAC
movs r1, #4
_0801CEAC:
adds r1, #0x71
adds r0, r3, #0
bl sub_0801CAFC
_0801CEB4:
pop {r4, pc}
.align 2, 0
_0801CEB8: .4byte gUnk_0200AF00
_0801CEBC: .4byte gMessage

25
asm/code_08056418.s
View File

@ -1,25 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08057044
sub_08057044: @ 0x08057044
push {r4, r5, lr}
sub sp, #8
adds r5, r1, #0
adds r4, r2, #0
mov r1, sp
bl sub_08056FEC
ldr r2, [sp]
movs r1, #3
subs r1, r1, r0
lsls r1, r1, #3
lsls r2, r1
orrs r2, r4
str r2, [r5]
add sp, #8
pop {r4, r5, pc}

1197
asm/code_0805EC04.s
View File

File diff suppressed because it is too large Load Diff

157
asm/code_080AD90C.s
View File

@ -1,157 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start FlushSprites
FlushSprites: @ 0x080AD90C
ldr r1, _080AD914 @ =gUnk_03000000
movs r0, #0
strb r0, [r1, #3]
bx lr
.align 2, 0
_080AD914: .4byte gUnk_03000000
thumb_func_start sub_080AD918
sub_080AD918: @ 0x080AD918
push {r4, lr}
ldr r1, _080AD948 @ =gMain
ldrb r0, [r1, #0xb]
adds r2, r0, #0
cmp r2, #0
bne _080AD958
ldr r1, _080AD94C @ =gUnk_03000000
movs r3, #0xa4
lsls r3, r3, #3
adds r0, r1, r3
strb r2, [r0]
ldr r3, _080AD950 @ =0x00000664
adds r0, r1, r3
strb r2, [r0]
movs r3, #0xf5
lsls r3, r3, #3
adds r0, r1, r3
strb r2, [r0]
ldr r3, _080AD954 @ =0x000008EC
adds r0, r1, r3
strb r2, [r0]
adds r4, r1, #0
b _080AD95E
.align 2, 0
_080AD948: .4byte gMain
_080AD94C: .4byte gUnk_03000000
_080AD950: .4byte 0x00000664
_080AD954: .4byte 0x000008EC
_080AD958:
subs r0, #1
strb r0, [r1, #0xb]
ldr r4, _080AD9A8 @ =gUnk_03000000
_080AD95E:
ldrb r1, [r4, #3]
movs r0, #0x80
subs r2, r0, r1
cmp r2, #0
ble _080AD980
lsls r1, r1, #3
adds r0, r4, #0
adds r0, #0x20
adds r1, r1, r0
movs r3, #0xa8
lsls r3, r3, #2
adds r0, r3, #0
_080AD976:
strh r0, [r1]
adds r1, #8
subs r2, #1
cmp r2, #0
bne _080AD976
_080AD980:
adds r1, r4, #0
ldr r0, _080AD9AC @ =0x00000427
adds r2, r1, r0
ldrb r0, [r2]
cmp r0, #0
beq _080AD9A0
movs r0, #0
strb r0, [r2]
movs r2, #0x84
lsls r2, r2, #3
adds r0, r1, r2
adds r1, #0x26
movs r2, #0x20
movs r3, #8
bl ObjAffineSet
_080AD9A0:
movs r0, #1
strb r0, [r4]
pop {r4, pc}
.align 2, 0
_080AD9A8: .4byte gUnk_03000000
_080AD9AC: .4byte 0x00000427
thumb_func_start sub_080AD9B0
sub_080AD9B0: @ 0x080AD9B0
push {lr}
ldr r2, _080AD9F4 @ =gUnk_03000000
ldr r0, _080AD9F8 @ =gScreenTransition
adds r0, #0x2f
ldrb r0, [r0]
movs r1, #0
cmp r0, #0
beq _080AD9C2
movs r1, #0xf
_080AD9C2:
strb r1, [r2, #0xe]
ldr r1, _080AD9FC @ =gRoomControls
adds r0, r1, #0
adds r0, #0x24
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
ldrh r3, [r1, #0xa]
adds r0, r0, r3
strh r0, [r2, #4]
adds r0, r1, #0
adds r0, #0x25
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
ldrh r1, [r1, #0xc]
adds r0, r0, r1
strh r0, [r2, #6]
ldrb r0, [r2, #1]
adds r0, #1
strb r0, [r2, #1]
ldr r0, _080ADA00 @ =gUnk_03006164
bl _call_via_r0
pop {pc}
.align 2, 0
_080AD9F4: .4byte gUnk_03000000
_080AD9F8: .4byte gScreenTransition
_080AD9FC: .4byte gRoomControls
_080ADA00: .4byte gUnk_03006164
thumb_func_start sub_080ADA04
sub_080ADA04: @ 0x080ADA04
push {lr}
ldr r2, _080ADA10 @ =gUnk_0300659C
bl _call_via_r2
pop {pc}
.align 2, 0
_080ADA10: .4byte gUnk_0300659C
thumb_func_start sub_080ADA14
sub_080ADA14: @ 0x080ADA14
push {r4, lr}
adds r3, r0, #0
adds r2, r1, #0
ldr r4, _080ADA28 @ =gUnk_03006580
ldr r0, _080ADA2C @ =gOamCmd
adds r1, r3, #0
bl _call_via_r4
pop {r4, pc}
.align 2, 0
_080ADA28: .4byte gUnk_03006580
_080ADA2C: .4byte gOamCmd

0
asm/code_0806FA6C.s → asm/coord.s
View File

204
asm/drawHealth.s
View File

@ -1,204 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C6B0
sub_0801C6B0: @ 0x0801C6B0
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r2, _0801C6CC @ =gUnk_0200AF00
ldrb r1, [r2, #1]
movs r0, #0x10
ands r0, r1
cmp r0, #0
beq _0801C6D0
bl sub_0801C824
bl sub_0801C66C
b _0801C802
.align 2, 0
_0801C6CC: .4byte gUnk_0200AF00
_0801C6D0:
ldr r5, _0801C6F8 @ =gSave
adds r0, r5, #0
adds r0, #0xab
ldrb r0, [r0]
lsrs r4, r0, #1
ldrb r0, [r2, #4]
cmp r4, r0
beq _0801C6EA
strb r4, [r2, #4]
bl sub_0801C824
bl sub_0801C66C
_0801C6EA:
adds r1, r5, #0
adds r1, #0xaa
ldrb r0, [r1]
cmp r0, #1
beq _0801C6FC
lsrs r1, r0, #1
b _0801C6FE
.align 2, 0
_0801C6F8: .4byte gSave
_0801C6FC:
movs r1, #1
_0801C6FE:
cmp r1, r4
ble _0801C704
adds r1, r4, #0
_0801C704:
movs r4, #0
ldr r0, _0801C748 @ =gUnk_0200AF00
ldrb r2, [r0, #3]
adds r7, r0, #0
cmp r1, r2
beq _0801C718
movs r4, #1
cmp r1, r2
ble _0801C718
movs r4, #2
_0801C718:
cmp r4, #1
beq _0801C750
cmp r4, #2
bne _0801C756
ldrb r0, [r7, #5]
adds r1, r0, #1
strb r1, [r7, #5]
lsls r0, r0, #0x18
lsrs r1, r0, #0x18
movs r0, #1
ands r0, r1
cmp r0, #0
bne _0801C74C
movs r0, #7
ands r1, r0
cmp r1, #0
bne _0801C740
movs r0, #0x71
bl SoundReq
_0801C740:
ldrb r0, [r7, #3]
adds r0, #1
strb r0, [r7, #3]
b _0801C75A
.align 2, 0
_0801C748: .4byte gUnk_0200AF00
_0801C74C:
movs r4, #0
b _0801C75A
_0801C750:
ldrb r0, [r7, #3]
subs r0, #1
strb r0, [r7, #3]
_0801C756:
movs r0, #0
strb r0, [r7, #5]
_0801C75A:
ldrb r0, [r7, #2]
cmp r0, #0
beq _0801C764
cmp r4, #0
beq _0801C802
_0801C764:
movs r0, #2
strb r0, [r7, #2]
ldrb r0, [r7, #3]
lsrs r3, r0, #2
cmp r3, #0xa
ble _0801C77A
movs r1, #0xa
mov r8, r1
adds r6, r3, #0
subs r6, #0xa
b _0801C77E
_0801C77A:
mov r8, r3
movs r6, #0
_0801C77E:
ldrb r0, [r7, #4]
lsrs r4, r0, #2
adds r1, r4, #0
cmp r4, #0xa
ble _0801C78A
movs r4, #0xa
_0801C78A:
adds r2, r1, #0
subs r2, #0xa
ldr r0, _0801C808 @ =gUnk_080C8F2C
mov ip, r0
cmp r2, #0
ble _0801C7B8
ldr r5, _0801C80C @ =gUnk_02034D30
ldr r1, _0801C810 @ =0x0000F010
adds r0, r1, #0
strh r0, [r5]
ldr r1, _0801C814 @ =0x040000D4
movs r0, #0xa
subs r0, r0, r6
lsls r0, r0, #1
add r0, ip
str r0, [r1]
adds r0, r5, #2
str r0, [r1, #4]
movs r0, #0x80
lsls r0, r0, #0x18
orrs r2, r0
str r2, [r1, #8]
ldr r0, [r1, #8]
_0801C7B8:
ldr r5, _0801C818 @ =gUnk_02034CF0
ldr r2, _0801C810 @ =0x0000F010
adds r0, r2, #0
strh r0, [r5]
ldr r1, _0801C814 @ =0x040000D4
movs r0, #0xa
mov r2, r8
subs r0, r0, r2
lsls r0, r0, #1
add r0, ip
str r0, [r1]
adds r0, r5, #2
str r0, [r1, #4]
movs r0, #0x80
lsls r0, r0, #0x18
orrs r4, r0
str r4, [r1, #8]
ldr r0, [r1, #8]
ldrb r0, [r7, #3]
movs r1, #3
ands r1, r0
cmp r1, #0
beq _0801C7FC
cmp r3, #9
ble _0801C7EE
subs r3, #0xa
adds r5, #0x40
_0801C7EE:
lsls r0, r3, #1
adds r0, r0, r5
adds r1, #0x11
ldr r3, _0801C81C @ =0xFFFFF000
adds r2, r3, #0
orrs r1, r2
strh r1, [r0, #2]
_0801C7FC:
ldr r1, _0801C820 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_0801C802:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801C808: .4byte gUnk_080C8F2C
_0801C80C: .4byte gUnk_02034D30
_0801C810: .4byte 0x0000F010
_0801C814: .4byte 0x040000D4
_0801C818: .4byte gUnk_02034CF0
_0801C81C: .4byte 0xFFFFF000
_0801C820: .4byte gScreen

160
asm/drawRupees.s
View File

@ -1,160 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C4B0
sub_0801C4B0: @ 0x0801C4B0
push {r4, r5, r6, lr}
ldr r2, _0801C4F0 @ =gUnk_0200AF00
ldrb r1, [r2, #1]
movs r0, #0x40
ands r0, r1
adds r6, r2, #0
cmp r0, #0
beq _0801C4FC
ldrb r0, [r6, #0xa]
cmp r0, #0
bne _0801C4C8
b _0801C5D0
_0801C4C8:
movs r0, #0
strb r0, [r6, #0xa]
ldr r3, _0801C4F4 @ =gUnk_02035160
strh r0, [r3]
strh r0, [r3, #2]
strh r0, [r3, #4]
strh r0, [r3, #6]
strh r0, [r3, #8]
adds r4, r3, #0
adds r4, #0x40
strh r0, [r4]
strh r0, [r4, #2]
strh r0, [r4, #4]
strh r0, [r4, #6]
strh r0, [r4, #8]
ldr r1, _0801C4F8 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
b _0801C5D0
.align 2, 0
_0801C4F0: .4byte gUnk_0200AF00
_0801C4F4: .4byte gUnk_02035160
_0801C4F8: .4byte gScreen
_0801C4FC:
ldrb r0, [r6, #0xa]
cmp r0, #0
bne _0801C560
movs r0, #2
strb r0, [r6, #0xa]
ldr r3, _0801C54C @ =gUnk_02035160
adds r4, r3, #0
adds r4, #0x40
ldr r1, _0801C550 @ =gWalletSizes
ldr r2, _0801C554 @ =gSave
adds r0, r2, #0
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #2
adds r0, r0, r1
ldrh r1, [r0, #2]
strh r1, [r3]
adds r0, r1, #1
strh r0, [r3, #2]
adds r0, r1, #2
strh r0, [r4]
adds r0, r1, #3
strh r0, [r4, #2]
ldr r1, _0801C558 @ =0x0000F070
strh r1, [r3, #4]
adds r0, r1, #1
strh r0, [r4, #4]
adds r0, r1, #2
strh r0, [r3, #6]
adds r0, r1, #3
strh r0, [r4, #6]
adds r0, r1, #4
strh r0, [r3, #8]
adds r0, r1, #5
strh r0, [r4, #8]
ldr r1, _0801C55C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
movs r4, #1
b _0801C564
.align 2, 0
_0801C54C: .4byte gUnk_02035160
_0801C550: .4byte gWalletSizes
_0801C554: .4byte gSave
_0801C558: .4byte 0x0000F070
_0801C55C: .4byte gScreen
_0801C560:
movs r4, #0
ldr r2, _0801C580 @ =gSave
_0801C564:
adds r5, r6, #0
adds r0, r2, #0
adds r0, #0xc0
ldrh r1, [r5, #0xe]
adds r3, r1, #0
ldrh r0, [r0]
cmp r3, r0
beq _0801C58A
cmp r3, r0
bhs _0801C584
adds r0, r1, #1
strh r0, [r5, #0xe]
b _0801C588
.align 2, 0
_0801C580: .4byte gSave
_0801C584:
subs r0, r1, #1
strh r0, [r6, #0xe]
_0801C588:
movs r4, #2
_0801C58A:
cmp r4, #1
beq _0801C5A4
cmp r4, #2
bne _0801C5CC
ldr r0, _0801C5D4 @ =gUnk_0200AF00
ldrb r0, [r0, #0xc]
movs r1, #3
ands r0, r1
cmp r0, #0
bne _0801C5A4
movs r0, #0x6f
bl SoundReq
_0801C5A4:
ldr r4, _0801C5D4 @ =gUnk_0200AF00
ldrh r3, [r4, #0xe]
movs r2, #0
ldr r1, _0801C5D8 @ =gWalletSizes
ldr r0, _0801C5DC @ =gSave
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #2
adds r0, r0, r1
ldrh r0, [r0]
cmp r0, r3
bhi _0801C5BE
movs r2, #1
_0801C5BE:
movs r0, #0x70
adds r1, r3, #0
movs r3, #3
bl sub_0801C5E0
ldrb r0, [r4, #0xc]
adds r4, r0, #1
_0801C5CC:
ldr r0, _0801C5D4 @ =gUnk_0200AF00
strb r4, [r0, #0xc]
_0801C5D0:
pop {r4, r5, r6, pc}
.align 2, 0
_0801C5D4: .4byte gUnk_0200AF00
_0801C5D8: .4byte gWalletSizes
_0801C5DC: .4byte gSave

26
asm/drawUI.s
View File

@ -1,26 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C344
sub_0801C344: @ 0x0801C344
push {r4, r5, lr}
ldr r4, _0801C36C @ =gUnk_0200AF00
ldrb r1, [r4, #1]
ldrb r0, [r4]
bics r0, r1
movs r5, #0
strb r0, [r4]
bl sub_0801C6B0
bl sub_0801C85C
bl sub_0801C4B0
bl sub_0801C99C
strb r5, [r4]
bl sub_0801C1D4
pop {r4, r5, pc}
.align 2, 0
_0801C36C: .4byte gUnk_0200AF00

0
asm/code_080011C4.s → asm/enemy.s
View File

0
asm/code_0804A720.s → asm/enemyUtils.s
View File

0
asm/code_0804AA84.s → asm/enterPortalSubtask.s
View File

0
asm/code_08018500.s → asm/kinstone.s
View File

0
asm/libagbsyscall.s → asm/lib/libagbsyscall.s
View File

0
asm/libgcc.s → asm/lib/libgcc.s
View File

0
asm/m4a_asm.s → asm/lib/m4a_asm.s
View File

1079
asm/code_080ADD30.s → asm/movement.s
View File

File diff suppressed because it is too large Load Diff

22
asm/code_0807059C.s → asm/non_matching/playerItemPacciCane/sub_080705AC.inc
View File

@ -1,23 +1,4 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0807059C
sub_0807059C: @ 0x0807059C
push {lr}
ldr r0, _080705A8 @ =gUnk_02034490
movs r1, #0x18
bl MemClear
pop {pc}
.align 2, 0
_080705A8: .4byte gUnk_02034490
thumb_func_start sub_080705AC
sub_080705AC: @ 0x080705AC
.syntax unified
push {lr}
ldr r0, _08070614 @ =gInput
ldrh r1, [r0, #2]
@ -110,3 +91,4 @@ _08070678:
movs r0, #1
_0807067E:
pop {pc}
.syntax divided

11
asm/sub_080AD8F0.s → asm/non_matching/vram/sub_080AD8F0.inc
View File

@ -1,12 +1,4 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD8F0
sub_080AD8F0: @ 0x080AD8F0
.syntax unified
ldr r2, _080AD908 @ =gFrameObjLists
lsls r0, r0, #2
adds r0, r0, r2
@ -20,3 +12,4 @@ sub_080AD8F0: @ 0x080AD8F0
bx lr
.align 2, 0
_080AD908: .4byte gFrameObjLists
.syntax divided

76
asm/non_matching/vram/sub_080AD918.inc Normal file
View File

@ -0,0 +1,76 @@
.syntax unified
push {r4, lr}
ldr r1, _080AD948 @ =gMain
ldrb r0, [r1, #0xb]
adds r2, r0, #0
cmp r2, #0
bne _080AD958
ldr r1, _080AD94C @ =gUnk_03000000
movs r3, #0xa4
lsls r3, r3, #3
adds r0, r1, r3
strb r2, [r0]
ldr r3, _080AD950 @ =0x00000664
adds r0, r1, r3
strb r2, [r0]
movs r3, #0xf5
lsls r3, r3, #3
adds r0, r1, r3
strb r2, [r0]
ldr r3, _080AD954 @ =0x000008EC
adds r0, r1, r3
strb r2, [r0]
adds r4, r1, #0
b _080AD95E
.align 2, 0
_080AD948: .4byte gMain
_080AD94C: .4byte gUnk_03000000
_080AD950: .4byte 0x00000664
_080AD954: .4byte 0x000008EC
_080AD958:
subs r0, #1
strb r0, [r1, #0xb]
ldr r4, _080AD9A8 @ =gUnk_03000000
_080AD95E:
ldrb r1, [r4, #3]
movs r0, #0x80
subs r2, r0, r1
cmp r2, #0
ble _080AD980
lsls r1, r1, #3
adds r0, r4, #0
adds r0, #0x20
adds r1, r1, r0
movs r3, #0xa8
lsls r3, r3, #2
adds r0, r3, #0
_080AD976:
strh r0, [r1]
adds r1, #8
subs r2, #1
cmp r2, #0
bne _080AD976
_080AD980:
adds r1, r4, #0
ldr r0, _080AD9AC @ =0x00000427
adds r2, r1, r0
ldrb r0, [r2]
cmp r0, #0
beq _080AD9A0
movs r0, #0
strb r0, [r2]
movs r2, #0x84
lsls r2, r2, #3
adds r0, r1, r2
adds r1, #0x26
movs r2, #0x20
movs r3, #8
bl ObjAffineSet
_080AD9A0:
movs r0, #1
strb r0, [r4]
pop {r4, pc}
.align 2, 0
_080AD9A8: .4byte gUnk_03000000
_080AD9AC: .4byte 0x00000427
.syntax divided

0
asm/code_080A29BC.s → asm/objectUtils.s
View File

0
asm/code_0800857C.s → asm/player.s
View File

0
asm/code_08077698.s → asm/playerUtils.s
View File

0
asm/code_08016984.s → asm/script.s
View File

0
asm/code_0807F0D8.s → asm/scroll.s
View File

0
asm/code_080A3480.s → asm/staffroll.s
View File

38
asm/sub_0801C824.s
View File

@ -1,38 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801C824
sub_0801C824: @ 0x0801C824
push {lr}
ldr r1, _0801C850 @ =gUnk_0200AF00
ldrb r0, [r1, #6]
cmp r0, #0
beq _0801C84E
movs r2, #0
strb r2, [r1, #6]
ldrb r0, [r1, #4]
ldr r1, _0801C854 @ =gUnk_02034D30
cmp r0, #0x28
bls _0801C83C
adds r1, #0x40
_0801C83C:
str r2, [r1]
str r2, [r1, #4]
str r2, [r1, #8]
str r2, [r1, #0xc]
str r2, [r1, #0x10]
str r2, [r1, #0x14]
ldr r1, _0801C858 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_0801C84E:
pop {pc}
.align 2, 0
_0801C850: .4byte gUnk_0200AF00
_0801C854: .4byte gUnk_02034D30
_0801C858: .4byte gScreen

31
asm/sub_0804AA30.s
View File

@ -1,31 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0804AA30
sub_0804AA30: @ 0x0804AA30
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r5, r1, #0
adds r6, r4, #0
adds r6, #0x41
ldrb r1, [r6]
movs r0, #0x7f
ands r0, r1
strb r0, [r6]
adds r0, r4, #0
bl GetNextFunction
ldrb r2, [r6]
movs r1, #0x80
orrs r1, r2
strb r1, [r6]
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
pop {r4, r5, r6, pc}
.align 2, 0

106
asm/sub_080A276C.s
View File

@ -1,106 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080A276C
sub_080A276C: @ 0x080A276C
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r5, r0, #0
adds r4, r1, #0
adds r7, r2, #0
bl sub_0805E744
adds r6, r0, #0
cmp r6, #0
beq _080A2820
movs r0, #0xc1
strb r0, [r6, #9]
movs r0, #6
mov r8, r0
mov r1, r8
strb r1, [r6, #8]
strb r4, [r6, #0xa]
strb r7, [r6, #0xb]
str r5, [r6, #0x50]
adds r0, r6, #0
movs r1, #6
bl AppendEntityToList
adds r0, r6, #0
movs r1, #6
bl PrependEntityToList
ldr r4, _080A2828 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r6, #0
bl CopyPosition
ldr r0, _080A282C @ =gPriorityHandler
mov r1, r8
strb r1, [r0]
ldr r1, _080A2830 @ =gUnk_02034490
movs r0, #1
strb r0, [r1]
ldrb r0, [r4, #0x10]
adds r1, r6, #0
adds r1, #0x69
strb r0, [r1]
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x1e
lsrs r0, r0, #0x1e
subs r1, #1
strb r0, [r1]
adds r0, r4, #0
adds r0, #0x3d
ldrb r0, [r0]
adds r1, #2
strb r0, [r1]
ldr r1, _080A2834 @ =gPlayerState
ldrb r0, [r1, #7]
adds r2, r6, #0
adds r2, #0x6b
strb r0, [r2]
ldrb r2, [r1, #0xb]
adds r0, r6, #0
adds r0, #0x6c
strb r2, [r0]
ldrb r0, [r1, #0xa]
adds r2, r6, #0
adds r2, #0x6d
strb r0, [r2]
adds r0, r1, #0
adds r0, #0x27
ldrb r0, [r0]
adds r2, #1
strb r0, [r2]
ldrb r0, [r1, #0x1a]
adds r2, #1
strb r0, [r2]
ldr r0, [r1, #0x30]
str r0, [r6, #0x70]
adds r1, #0x8a
ldrb r1, [r1]
adds r0, r6, #0
adds r0, #0x74
strb r1, [r0]
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x10]
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4, #0x18]
_080A2820:
adds r0, r6, #0
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A2828: .4byte gPlayerEntity
_080A282C: .4byte gPriorityHandler
_080A2830: .4byte gUnk_02034490
_080A2834: .4byte gPlayerState

0
asm/code_080A3BD0.s → asm/subtask.s
View File

0
asm/code_080A5574.s → asm/subtask2.s
View File

1203
asm/text.s Normal file
View File

File diff suppressed because it is too large Load Diff

1708
asm/ui.s Normal file
View File

File diff suppressed because it is too large Load Diff

0
asm/code_0801D79C.s → asm/utils.s
View File

0
asm/code_08000108.s → asm/veneer.s
View File

1083
asm/vram.s Normal file
View File

File diff suppressed because it is too large Load Diff

17
include/main.h
View File

@ -8,20 +8,6 @@
#define NUM_SAVE_SLOTS 3
#define MAX_BRIGHTNESS 3
typedef struct { // 0x03001000
u8 field_0x0;
u8 field_0x1;
u8 field_0x2;
u8 field_0x3;
u8 field_0x4;
u16 field_0x6;
u8 field_0x8;
u8 field_0x9;
u8 field_0xa;
u8 field_0xb;
u32 spritePriority;
} MainStruct;
typedef enum {
LANGUAGE_JP,
LANGUAGE_EN,
@ -64,7 +50,8 @@ typedef struct {
u8 pauseFrames;
u8 pauseCount;
u8 pauseInterval;
u16 ticks;
u8 pad;
union SplitHWord ticks;
} Main;
typedef struct {

5
include/room.h
View File

@ -46,7 +46,10 @@ typedef struct {
/*0x18*/ u16 filler2[3];
/*0x1E*/ u16 width;
/*0x20*/ u16 height;
/*0x22*/ u8 filler3[6];
/*0x22*/ u8 filler3[2];
/*0x24*/ s8 aff_x;
/*0x25*/ s8 aff_y;
/*0x26*/ u8 filler26[2];
/*0x28*/ union SplitWord bg3OffsetX;
/*0x2C*/ union SplitWord bg3OffsetY;
/*0x30*/ Entity* cameraTarget;

4
include/save.h
View File

@ -42,8 +42,8 @@ typedef struct {
/*0x088*/ PlayerWorldStatus saved_status;
/*0x0A8*/ Stats stats;
/*0x0D0*/ u8 fillerD0[0x71];
/*0x141*/ u8 unk141[0x1c1 - 0x141];
/*0x1C1*/ u8 unk1C1[0x45c - 0x1c1];
/*0x141*/ u8 unk141[128];
/*0x1C1*/ u8 unk1C1[667];
/*0x45C*/ u8 unk45C[0x10];
/*0x46C*/ u8 unk46C[0x20];
/*0x48C*/ u32 unk48C[8];

28
include/structures.h
View File

@ -110,7 +110,7 @@ typedef struct {
u16 a;
u16 b;
} indices;
void (*func)(Entity*);
void (*func)(Entity* e);
} data;
} Dialog;
@ -148,4 +148,30 @@ typedef struct {
void* unk8;
} WStruct;
typedef struct {
u16 unk0;
u16 unk2;
u16 unk4;
u8 unk6;
u8 unk7;
} OAMObj;
typedef struct {
u8 field_0x0;
u8 field_0x1;
u8 spritesOffset;
u8 updated;
u16 _4;
u16 _6;
u8 _0[0x18];
struct OamData oam[0x80];
OAMObj unk[0x100];
u8 fill[10];
u8 _426;
u8 _427;
u8 _428[6];
u8 _42e;
} OAMSettings;
extern OAMSettings gUnk_03000000;
#endif

97
linker.ld
View File

@ -312,26 +312,25 @@ SECTIONS {
/* handwritten assembly */
asm/crt0.o(.text);
asm/code_08000108.o(.text);
asm/veneer.o(.text);
data/data_08000360.o(.rodata);
asm/code_08000E44.o(.text);
asm/libgcc.o(.text);
asm/lib/libgcc.o(.text);
asm/code_08000F10.o(.text);
data/data_08000F54.o(.rodata);
asm/code_080011C4.o(.text);
asm/enemy.o(.text);
data/gfx/sprite_ptrs.o(.rodata);
asm/code_08003FC4.o(.text);
asm/code_080043E8.o(.text);
data/gfx/link_animations.o(.rodata);
asm/code_08007CAC.o(.text);
data/data_08007DF4.o(.rodata);
asm/code_0800857C.o(.text);
asm/player.o(.text);
/* scripts */
data/scripts.o(.text);
asm/code_08016984.o(.text);
asm/script.o(.text);
asm/projectileUpdate.o(.text);
/* C source compiled with interworking */
src/interrupts.o(.text);
src/playerItem.o(.text);
@ -340,29 +339,22 @@ SECTIONS {
src/npc.o(.text);
src/collision.o(.text);
/* C source compiled without interworking */
asm/code_08018500.o(.text);
src/code_08018C58.o(.text);
asm/kinstone.o(.text);
src/kinstone.o(.text);
src/playerItem/playerItem11.o(.text);
src/playerItem/playerItemBow.o(.text);
src/playerItem/playerItemSwordBeam.o(.text);
asm/code_0801967C.o(.text);
asm/beanstalkSubtask.o(.text);
src/playerItem/playerItemBomb.o(.text);
src/playerItem/playerItem3.o(.text);
src/playerItem/playerItemC.o(.text);
src/playerItem/playerItemSwordSpin.o(.text);
src/playerItem/playerItemCellOverwriteSet.o(.text);
asm/code_0801C1D4.o(.text);
asm/drawUI.o(.text);
asm/code_0801C370.o(.text);
asm/drawRupees.o(.text);
asm/code_0801C5E0.o(.text);
asm/drawHealth.o(.text);
asm/sub_0801C824.o(.text);
asm/code_0801C85C.o(.text);
src/ezloNag.o(.text);
asm/code_0801CEC0.o(.text);
asm/ui.o(.text);
src/ui.o(.text);
asm/code_0801CEC0.o(.text); /* utils.c */
src/utils.o(.text);
asm/code_0801D79C.o(.text);
asm/utils.o(.text);
/* enemies */
src/enemy/octorok.o(.text);
src/enemy/chuchu.o(.text);
@ -473,14 +465,13 @@ SECTIONS {
src/enemy/treeItem.o(.text);
asm/enemy/enemy66.o(.text);
/* END enemies */
src/code_08049CD4.o(.text);
src/code_08049CD4.o(.text); /* enemyUtils.c */
asm/code_08049D30.o(.text);
src/enemyUtils.o(.text);
asm/code_0804A720.o(.text);
asm/sub_0804AA30.o(.text);
asm/enemyUtils.o(.text);
src/createEnemy.o(.text);
src/code_0804AA84.o(.text);
asm/code_0804AA84.o(.text);
src/enterPortalSubtask.o(.text);
asm/enterPortalSubtask.o(.text);
src/room.o(.text);
src/roomInit.o(.text);
src/fade.o(.text);
@ -491,13 +482,12 @@ SECTIONS {
asm/modBombs.o(.text);
asm/modArrows.o(.text);
src/code_0805436C.o(.text);
asm/code_0805436C.o(.text);
asm/code_0805436C.o(.text); /* game.c */
src/playerItem/playerItemLantern.o(.text);
asm/code_08054C04.o(.text);
asm/code_08054C04.o(.text); /* subtask */
src/sub_08055E08.o(.text);
src/main.o(.text);
src/message.o(.text);
asm/code_08056418.o(.text);
src/manager/manager1.o(.text);
src/manager/manager2.o(.text);
src/manager/manager3.o(.text);
@ -557,8 +547,9 @@ SECTIONS {
src/manager/manager39.o(.text);
src/entity.o(.text);
src/code_0805EC04.o(.text);
asm/code_0805EC04.o(.text);
src/code_0805F9A0.o(.text);
asm/code_0805EC04.o(.text); /* objaffine? */
asm/text.o(.text);
src/text.o(.text);
src/debugScreen.o(.text);
src/playerItem/playerItem14.o(.text);
/* npcs */
@ -651,11 +642,10 @@ SECTIONS {
src/npc/npc58.o(.text);
/* END npcs */
src/npcUtils.o(.text);
src/coord.o(.text);
asm/code_0806FA6C.o(.text);
src/coord.o(.text); /* physics? */
asm/coord.o(.text);
src/playerItem/playerItem12.o(.text);
src/playerItem/playerItemPacciCane.o(.text);
asm/code_0807059C.o(.text);
src/player.o(.text);
src/item.o(.text);
src/item/itemDebug.o(.text);
@ -673,7 +663,7 @@ SECTIONS {
src/item/itemGustJar.o(.text);
src/item/itemMoleMitts.o(.text);
src/item/itemJarEmpty.o(.text);
asm/code_08077698.o(.text);
asm/playerUtils.o(.text);
asm/respawnPlayer.o(.text);
src/code_08077B98.o(.text);
asm/code_08077B98.o(.text);
@ -683,14 +673,14 @@ SECTIONS {
asm/code_0807B9B8.o(.text);
src/sub_0807CA18.o(.text);
asm/getInventoryValue.o(.text);
asm/code_0807CAA0.o(.text);
asm/code_0807CAA0.o(.text); /* playerUtils.c */
src/flags.o(.text);
src/save.o(.text);
src/scroll.o(.text);
src/screenTilemap.o(.text);
src/script.o(.text);
asm/code_0807F0D8.o(.text);
src/code_0808091C.o(.text);
asm/code_0808091C.o(.text);
asm/scroll.o(.text);
src/scroll.o(.text);
asm/code_0808091C.o(.text); /* scroll.c */
/* objects */
src/object/itemOnGround.o(.text);
asm/object/deathFx.o(.text);
@ -754,7 +744,7 @@ SECTIONS {
asm/object/bossDoor.o(.text);
asm/object/object3A.o(.text);
asm/object/macroMushroomStalks.o(.text);
asm/object/object75.o(.text); /* 75 and 76 are mislocated in base game */
asm/object/object75.o(.text); /* 75 and 76 are mislocated in object table */
asm/object/object76.o(.text);
asm/object/code_0808C964.o(.text);
asm/object/macroPlayer.o(.text);
@ -895,20 +885,19 @@ SECTIONS {
asm/object/enemyItem.o(.text);
asm/object/objectC1.o(.text);
/* END objects */
asm/sub_080A276C.o(.text);
src/objectUtils.o(.text);
asm/code_080A29BC.o(.text);
asm/objectUtils.o(.text);
src/playerItem/playerItemShield.o(.text);
src/playerItem/playerItem15.o(.text);
#ifdef DEMO_USA
src/demoScreen.o(.text);
#endif
src/sound.o(.text);
asm/code_080A3480.o(.text);
src/sub_080A3B84.o(.text);
asm/code_080A3BD0.o(.text);
src/sub_080A554C.o(.text);
asm/code_080A5574.o(.text);
asm/staffroll.o(.text);
src/subtask.o(.text);
asm/subtask.o(.text);
src/subtask2.o(.text);
asm/subtask2.o(.text); /* subtask.c */
src/playerItem/playerItemSword.o(.text);
src/playerItemUtils.o(.text);
src/projectileUtils.o(.text);
@ -951,15 +940,15 @@ SECTIONS {
src/projectile/v3TennisBallProjectile.o(.text);
src/playerItem/playerItem10.o(.text);
src/playerItem/playerItem13.o(.text);
src/intro.o(.text);
asm/sub_080AD8F0.o(.text);
asm/code_080AD90C.o(.text);
src/title.o(.text);
src/affine.o(.text);
src/playerItem/playerItemGustJar.o(.text);
asm/code_080ADD30.o(.text);
asm/vram.o(.text);
asm/movement.o(.text);
/* library functions */
asm/m4a_asm.o(.text);
asm/lib/m4a_asm.o(.text);
src/gba/m4a.o(.text);
asm/libagbsyscall.o(.text);
asm/lib/libagbsyscall.o(.text);
src/eeprom.o(.text);
*libc.a:memcpy.o(.text);
/* handwritten assembly in arm mode */
@ -1717,7 +1706,7 @@ SECTIONS {
src/playerItem/playerItem10.o(.rodata);
src/flagDebug.o(.rodata);
data/const/playerItem/playerItem13.o(.rodata);
src/intro.o(.rodata);
src/title.o(.rodata);
#ifdef DEMO_JP
data/data_081320FC.o(.rodata);
#endif

72
src/affine.c Normal file
View File

@ -0,0 +1,72 @@
#include "global.h"
#include "structures.h"
#include "main.h"
#include "room.h"
#include "screen.h"
extern u32 gFrameObjLists[];
extern void gUnk_03006164(void);
extern void gUnk_0300659C(OAMCommand*, void*);
extern void gUnk_03006580(OAMCommand*, u32, u32);
// regalloc
NONMATCH("asm/non_matching/vram/sub_080AD8F0.inc", void* sub_080AD8F0(u32 sprite, u32 frame)) {
u32 x = gFrameObjLists[sprite];
u8* y = (u8*)&gFrameObjLists[frame];
u32 tmp = *(u32*)&y[x];
return (u8*)gFrameObjLists + tmp;
}
END_NONMATCH
void FlushSprites(void) {
gUnk_03000000.updated = 0;
}
NONMATCH("asm/non_matching/vram/sub_080AD918.inc", void sub_080AD918(void)) {
s32 rem;
u16* d;
if (gMain.ticks.HALF.LO == 0) {
gUnk_03000000.unk[0x20].unk0 = gMain.ticks.HALF.LO;
gUnk_03000000.unk[0x48].unk4 = gMain.ticks.HALF.LO;
gUnk_03000000.unk[0x71].unk0 = gMain.ticks.HALF.LO;
gUnk_03000000.unk[0x99].unk4 = gMain.ticks.HALF.LO;
} else {
gMain.ticks.HALF.LO--;
}
rem = 0x80 - gUnk_03000000.updated;
for (d = (u16*)&gUnk_03000000.oam[0x80 + gUnk_03000000.updated]; rem > 0; rem--) {
*d = 0x2A0;
(u8*)d += 6;
}
if (gUnk_03000000.unk[0].unk7) {
gUnk_03000000.unk[0].unk7 = 0;
ObjAffineSet((struct ObjAffineSrcData*)gUnk_03000000.unk, &gUnk_03000000.oam[0].affineParam, 32, 8);
}
gUnk_03000000.field_0x0 = 1;
}
END_NONMATCH
void sub_080AD9B0(void) {
void (*fn)(void);
gUnk_03000000._0[6] = gScreenTransition.field_0x2c[3] ? 15 : 0;
gUnk_03000000._4 = gRoomControls.aff_x + gRoomControls.roomScrollX;
gUnk_03000000._6 = gRoomControls.aff_y + gRoomControls.roomScrollY;
gUnk_03000000.field_0x1++;
fn = &gUnk_03006164;
fn();
}
void sub_080ADA04(OAMCommand* cmd, void* dst) {
void (*fn)(OAMCommand*, void*) = gUnk_0300659C;
fn(cmd, dst);
}
void sub_080ADA14(u32 a1, u32 a2) {
void (*fn)(OAMCommand*, u32, u32) = gUnk_03006580;
fn(&gOamCmd, a1, a2);
}

21
src/code_0805EC04.c
View File

@ -1,25 +1,10 @@
#include "entity.h"
#include "player.h"
typedef struct {
u16 unk0;
u16 unk2;
u16 unk4;
u8 unk6;
u8 unk7;
} VStruct;
typedef struct {
u8 _0[0x20];
struct OamData oam[0x80];
VStruct unk[0x100];
} UStruct;
extern UStruct gUnk_03000000;
#include "structures.h"
bool32 sub_0805EC04(Entity* this) {
u32 i = 1;
UStruct* temp = &gUnk_03000000;
OAMSettings* temp = &gUnk_03000000;
u32 j = 1;
for (; i < 0x20; i++) {
if (temp->unk[i].unk6 == 0) {
@ -34,7 +19,7 @@ bool32 sub_0805EC04(Entity* this) {
void sub_0805EC60(Entity* this) {
u8 temp;
UStruct* temp2;
OAMSettings* temp2;
if (this->spriteRendering.b0 != 0) {
this->spriteRendering.b0 = 0;

131
src/code_0808091C.c
View File

@ -1,131 +0,0 @@
#include "global.h"
#include "entity.h"
#include "structures.h"
#include "functions.h"
#include "game.h"
extern void sub_08080BC4(void);
extern u32 gUnk_0200B650;
extern u32 gUnk_02025EB0;
extern u8 gUpdateVisibleTiles;
void sub_080808D8(void) {
gScreenTransition.transitionType = TRANSITION_DEFAULT;
}
void sub_080808E4(void) {
if (sub_08052638(gScreenTransition.player_status.area_next)) {
gScreenTransition.transitionType = TRANSITION_DEFAULT;
} else {
gScreenTransition.transitionType = TRANSITION_FADE_BLACK;
}
}
void sub_08080904(void) {
gScreenTransition.transitionType = TRANSITION_CUT;
}
void sub_08080910(void) {
gScreenTransition.transitionType = TRANSITION_CUT;
}
void sub_0808091C(ScreenTransitionData* param_1, u32 param_2) {
DoExitTransition(param_1);
gScreenTransition.transitionType = param_2;
}
void sub_08080930(void)
{
gRoomControls.unk3 = 5;
gRoomControls.unk4 = 0;
gRoomControls.unk2 = 2;
gRoomControls.unk_10 = 0;
SetInitializationPriority();
}
u32* GetLayerByIndex(u32 param_1) {
if (param_1 == 2) {
return &gUnk_0200B650;
} else {
return &gUnk_02025EB0;
}
}
void InitScreenShake(u32 time, u32 magnitude) {
gRoomControls.screenShakeTime = time;
gRoomControls.screenShakeMagnitude = magnitude & 7;
}
void sub_08080974(u32 arg0, u32 arg1) {
u32 var0, var1;
RoomControls* roomControls = &gRoomControls;
var0 = roomControls->roomOriginX;
if (arg0 <= var0 + 120) {
roomControls->roomScrollX = var0;
} else {
var0 += roomControls->width;
var1 = var0 - 120;
if (arg0 < var1) {
var1 = arg0;
}
roomControls->roomScrollX = var1 - 120;
}
var0 = roomControls->roomOriginY;
if (arg1 <= var0 + 80) {
roomControls->roomScrollY = var0;
} else {
var0 += roomControls->height;
var1 = var0 - 80;
if (arg1 < var1) {
var1 = arg1;
}
roomControls->roomScrollY = var1 - 80;
}
sub_080809D4();
gUpdateVisibleTiles = 1;
}
void sub_080809D4(void) {
register Entity* target asm("r4");
int x, y;
int var1, var0;
RoomControls* roomControls = &gRoomControls;
roomControls->scroll_flags &= ~4;
target = roomControls->cameraTarget;
x = target->x.HALF.HI;
var0 = roomControls->roomOriginX;
if (x <= var0 + 120) {
roomControls->roomScrollX = var0;
} else {
var0 += roomControls->width;
var1 = var0 - 120;
if (x < var1) {
var1 = (u16)target->x.HALF.HI;
}
roomControls->roomScrollX = var1 - 120;
}
target = roomControls->cameraTarget;
y = target->y.HALF.HI;
var0 = roomControls->roomOriginY;
if (y <= var0 + 80) {
roomControls->roomScrollY = var0;
} else {
var0 += roomControls->height;
var1 = var0 - 80;
if (y < var1) {
var1 = (u16)target->y.HALF.HI;
}
roomControls->roomScrollY = var1 - 80;
}
sub_08080BC4();
gUpdateVisibleTiles = 1;
}

11
src/createEnemy.c
View File

@ -1,5 +1,12 @@
#include "global.h"
#include "entity.h"
#include "enemy.h"
void sub_0804AA30(Entity* entity, void (*fntable[])()) {
u32 idx;
entity->bitfield &= ~0x80;
idx = GetNextFunction(entity);
entity->bitfield |= 0x80;
fntable[idx](entity);
}
Entity* CreateEnemy(u32 subtype, u32 form) {
Entity* enemy;

0
src/code_0804AA84.c → src/enterPortalSubtask.c
View File

7
src/entity.c
View File

@ -220,7 +220,6 @@ void UpdateManagers() {
}
void EraseAllEntities() {
extern u8 gUnk_03000000[];
DeleteAllEntities();
MemClear(&gPriorityHandler, 12);
MemClear(&gPlayerEntity, 10880);
@ -228,9 +227,9 @@ void EraseAllEntities() {
sub_0805E98C();
gEntCount = 0;
gManagerCount = 0;
gUnk_03000000[0x427] = 1;
gUnk_03000000[0x426] = 1;
gUnk_03000000[0x42e] = 1;
gUnk_03000000.unk[0].unk7 = 1;
gUnk_03000000.unk[0].unk6 = 1;
gUnk_03000000.unk[1].unk6 = 1;
}
ASM_FUNC("./asm/getEmptyEntity.s", Entity* GetEmptyEntity());

8
src/fade.c
View File

@ -1,15 +1,9 @@
#include "global.h"
#include "structures.h"
#include "functions.h"
#include "screen.h"
#include "utils.h"
typedef struct {
u8 field_0x0;
u8 field_0x1;
u8 spritesOffset;
} struct_03000000;
extern struct_03000000 gUnk_03000000;
static u32 sub_080501C0(FadeControl* ctl);
static u32 sub_08050230(FadeControl* ctl);
static u32 sub_080502A4(FadeControl* ctl);

10
src/interrupts.c
View File

@ -42,12 +42,6 @@ extern void sub_08077FEC(u32);
void gIntrMain(void);
struct {
u8 update;
u8 _0[0x1c];
struct OamData oam[0x80];
} extern gUnk_03000000;
struct {
u8 ready;
u16* src;
@ -105,8 +99,8 @@ void sub_08016BF8(void) {
}
void UpdateDisplayControls(void) {
if (gUnk_03000000.update && (gScreen.lcd.displayControl & DISPCNT_OBJ_ON)) {
gUnk_03000000.update = 0;
if (gUnk_03000000.field_0x0 && (gScreen.lcd.displayControl & DISPCNT_OBJ_ON)) {
gUnk_03000000.field_0x0 = 0;
DmaCopy32(3, &gUnk_03000000.oam, OAM, OAM_SIZE);
}
sub_08016CA8(&gScreen.bg0);

0
src/code_08018C58.c → src/kinstone.c
View File

2
src/main.c
View File

@ -80,7 +80,7 @@ void AgbMain(void) {
}
}
gMain.ticks++;
gMain.ticks.HWORD++;
sScreenHandlers[gMain.screen]();
MessageMain();
FadeMain();

2
src/manager/manager14.c
View File

@ -179,7 +179,7 @@ void sub_0805A1D8(Manager14* this) {
gScreen.bg3.yOffset = gRoomControls.bg3OffsetY.HALF.HI;
if (gScreen.lcd.displayControl & DISPCNT_BG3_ON) {
sub_0805A114(6, this->unk_20 >> 1);
if (this->unk_22 == 0 && (gMain.ticks & 0x1F) == 0) {
if (this->unk_22 == 0 && (gMain.ticks.HWORD & 0x1F) == 0) {
this->unk_24++;
this->unk_24 &= 3;
gScreen.controls.alphaBlend = gUnk_0810859A[this->unk_24];

8
src/message.c
View File

@ -807,3 +807,11 @@ NONMATCH("asm/non_matching/textbox/sub_08056FEC.inc", u32 sub_08056FEC(u32 this,
return iVar4;
}
END_NONMATCH
void sub_08057044(u32 a1, u32* a2, u32 a3) {
u32 z[2];
u32 tmp = sub_08056FEC(a1, (u8*)z);
u32 first = z[0];
first <<= 8 * (3 - tmp);
*a2 = first | a3;
}

30
src/objectUtils.c
View File

@ -10,6 +10,36 @@ extern const Hitbox* const gObjectHitboxes[];
u32 LoadObjectSprite(Entity* this, s32 type, const ObjectDefinition* definition);
extern const ObjectDefinition gObjectDefinitions[];
extern Entity* sub_0805E744(void);
Entity* sub_080A276C(Entity* parent, u32 type, u32 type2) {
Entity* e = sub_0805E744();
if (e != NULL) {
e->id = 0xC1;
e->kind = 6;
e->type = type;
e->type2 = type2;
e->parent = parent;
AppendEntityToList(e, 6);
PrependEntityToList(e, 6);
CopyPosition(&gPlayerEntity, e);
gPriorityHandler.sys_priority = 6;
gUnk_02034490[0] = 1;
e->field_0x68.HALF.HI = gPlayerEntity.flags;
e->field_0x68.HALF.LO = gPlayerEntity.spriteSettings.draw;
e->field_0x6a.HALF.LO = gPlayerEntity.iframes;
e->field_0x6a.HALF.HI = gPlayerState.field_0x7;
e->field_0x6c.HALF.LO = gPlayerState.keepFacing;
e->field_0x6c.HALF.HI = gPlayerState.field_0xa;
e->field_0x6e.HALF.LO = gPlayerState.field_0x27[0];
e->field_0x6e.HALF.HI = gPlayerState.field_0x1a[0];
e->field_0x70.WORD = gPlayerState.flags;
e->field_0x74.HALF.LO = gPlayerState.field_0x82[8];
gPlayerEntity.flags &= ~ENT_COLLIDE;
gPlayerEntity.spriteSettings.draw = 0;
}
return e;
}
void ObjectInit(Entity* this) {
const ObjectDefinition* definition = &gObjectDefinitions[this->id];

29
src/playerItem/playerItemPacciCane.c
View File

@ -1,10 +1,16 @@
#include "entity.h"
#include "sound.h"
#include "functions.h"
#include "utils.h"
#include "message.h"
#include "save.h"
extern void (*const gUnk_0811B9D8[])(Entity*);
void sub_080704FC(Entity*);
extern void sub_080A4D88(void);
extern u8 gUnk_02034490[0x18];
void PlayerItemPacciCane(Entity* this) {
gUnk_0811B9D8[this->action](this);
@ -19,3 +25,26 @@ void sub_080704D4(Entity* this) {
}
ASM_FUNC("asm/non_matching/playerItemPacciCane/sub_080704FC.inc", void sub_080704FC(Entity* this))
void sub_0807059C() {
MemClear(gUnk_02034490, sizeof(gUnk_02034490));
}
NONMATCH("asm/non_matching/playerItemPacciCane/sub_080705AC.inc", u32 sub_080705AC(void)) {
if (!((gInput.newKeys & 8) == 0 || gFadeControl.active || gUnk_02034490[0] || (gMessage.doTextBox & 0x7F) != 0 ||
!gSave.stats.health || !gSave.fillerD0[34] || gPlayerState.controlMode || gPriorityHandler.priority_timer)) {
u32 tmp = gPlayerState.framestate ? gPlayerState.framestate : gPlayerState.framestate_last;
switch (tmp) {
case 18:
case 19:
case 21:
case 22:
case 28:
return 0;
}
sub_080A4D88();
return 1;
}
return 0;
}
END_NONMATCH

7
src/screenTilemap.c Normal file
View File

@ -0,0 +1,7 @@
#include "global.h"
ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D280.inc", void sub_0807D280(u32 unk_1, u32 unk_2))
ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D46C.inc", void sub_0807D46C(u32 unk_1, u32 unk_2))
ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D6D8.inc", void sub_0807D6D8(u32 unk_1, u32 unk_2))

127
src/scroll.c
View File

@ -1,7 +1,128 @@
#include "global.h"
#include "entity.h"
#include "structures.h"
#include "functions.h"
#include "game.h"
ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D280.inc", void sub_0807D280(u32 unk_1, u32 unk_2))
extern void sub_08080BC4(void);
ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D46C.inc", void sub_0807D46C(u32 unk_1, u32 unk_2))
extern u32 gUnk_0200B650;
extern u32 gUnk_02025EB0;
extern u8 gUpdateVisibleTiles;
ASM_FUNC("asm/non_matching/code_0807CC3C/sub_0807D6D8.inc", void sub_0807D6D8(u32 unk_1, u32 unk_2))
void sub_080808D8(void) {
gScreenTransition.transitionType = TRANSITION_DEFAULT;
}
void sub_080808E4(void) {
if (sub_08052638(gScreenTransition.player_status.area_next)) {
gScreenTransition.transitionType = TRANSITION_DEFAULT;
} else {
gScreenTransition.transitionType = TRANSITION_FADE_BLACK;
}
}
void sub_08080904(void) {
gScreenTransition.transitionType = TRANSITION_CUT;
}
void sub_08080910(void) {
gScreenTransition.transitionType = TRANSITION_CUT;
}
void sub_0808091C(ScreenTransitionData* param_1, u32 param_2) {
DoExitTransition(param_1);
gScreenTransition.transitionType = param_2;
}
void sub_08080930(void) {
gRoomControls.unk3 = 5;
gRoomControls.unk4 = 0;
gRoomControls.unk2 = 2;
gRoomControls.unk_10 = 0;
SetInitializationPriority();
}
u32* GetLayerByIndex(u32 param_1) {
if (param_1 == 2) {
return &gUnk_0200B650;
} else {
return &gUnk_02025EB0;
}
}
void InitScreenShake(u32 time, u32 magnitude) {
gRoomControls.screenShakeTime = time;
gRoomControls.screenShakeMagnitude = magnitude & 7;
}
void sub_08080974(u32 arg0, u32 arg1) {
u32 var0, var1;
RoomControls* roomControls = &gRoomControls;
var0 = roomControls->roomOriginX;
if (arg0 <= var0 + 120) {
roomControls->roomScrollX = var0;
} else {
var0 += roomControls->width;
var1 = var0 - 120;
if (arg0 < var1) {
var1 = arg0;
}
roomControls->roomScrollX = var1 - 120;
}
var0 = roomControls->roomOriginY;
if (arg1 <= var0 + 80) {
roomControls->roomScrollY = var0;
} else {
var0 += roomControls->height;
var1 = var0 - 80;
if (arg1 < var1) {
var1 = arg1;
}
roomControls->roomScrollY = var1 - 80;
}
sub_080809D4();
gUpdateVisibleTiles = 1;
}
void sub_080809D4(void) {
register Entity* target asm("r4");
int x, y;
int var1, var0;
RoomControls* roomControls = &gRoomControls;
roomControls->scroll_flags &= ~4;
target = roomControls->cameraTarget;
x = target->x.HALF.HI;
var0 = roomControls->roomOriginX;
if (x <= var0 + 120) {
roomControls->roomScrollX = var0;
} else {
var0 += roomControls->width;
var1 = var0 - 120;
if (x < var1) {
var1 = (u16)target->x.HALF.HI;
}
roomControls->roomScrollX = var1 - 120;
}
target = roomControls->cameraTarget;
y = target->y.HALF.HI;
var0 = roomControls->roomOriginY;
if (y <= var0 + 80) {
roomControls->roomScrollY = var0;
} else {
var0 += roomControls->height;
var1 = var0 - 80;
if (y < var1) {
var1 = (u16)target->y.HALF.HI;
}
roomControls->roomScrollY = var1 - 80;
}
sub_08080BC4();
gUpdateVisibleTiles = 1;
}

0
src/sub_080A3B84.c → src/subtask.c
View File

0
src/sub_080A554C.c → src/subtask2.c
View File

1
src/code_0805F9A0.c → src/text.c
View File

@ -141,7 +141,6 @@ void sub_0805F918(u32 idx, u32 idx2, void* dest) {
}
u32 sub_0805F9A0(u32 r0) {
if (gSaveHeader->gameLanguage == 0) {
u16* val = &gUnk_081092D4;
u32 i = 0;

0
src/intro.c → src/title.c
View File

0
src/ezloNag.c → src/ui.c
View File