mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-03 08:53:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

begin rem

Browse Source
This commit is contained in:
theo3
2020-06-15 21:19:18 -07:00
parent ebe4a20bf7
commit d92be5f9cc
38 changed files with 252 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/beedle.s
+2 -2
View File
@@ -44,7 +44,7 @@ sub_080632E0: @ 0x080632E0
push {r4, lr}
adds r4, r0, #0
ldr r1, _08063310 @ =gUnk_0810C8D4
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806330E
adds r0, r4, #0
@@ -205,7 +205,7 @@ sub_08063410: @ 0x08063410
cmp r5, #0
bne _08063442
ldr r1, _08063464 @ =gUnk_0810C8D4
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08063462
ldrb r0, [r4, #0xc]
asm/carpenter.s
+2 -2
View File
@@ -35,7 +35,7 @@ _0806717E:
ldr r0, _080671EC @ =gUnk_08110CA8
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08067224
movs r0, #1
@@ -247,7 +247,7 @@ sub_0806732C: @ 0x0806732C
ldr r0, _08067374 @ =gUnk_08110CA8
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806737E
ldrb r0, [r4, #0xc]
asm/castleMaid.s
+1 -1
View File
@@ -93,7 +93,7 @@ _0806458A:
ldr r0, _080645D0 @ =gUnk_0810F874
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806463C
ldrb r0, [r4, #0xc]
asm/code_0806FA6C.s
+2 -2
View File
@@ -515,8 +515,8 @@ _0806FDDC:
_0806FDEA:
pop {r4, pc}
thumb_func_start sub_0806FDEC
sub_0806FDEC: @ 0x0806FDEC
thumb_func_start LoadExtraSpriteData
LoadExtraSpriteData: @ 0x0806FDEC
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
asm/dog.s
+1 -1
View File
@@ -517,7 +517,7 @@ sub_08069EF0: @ 0x08069EF0
ldr r0, _08069F20 @ =gUnk_08111D58
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08069F28
movs r0, #1
asm/farmers.s
+2 -2
View File
@@ -21,7 +21,7 @@ sub_0806BBE4: @ 0x0806BBE4
ldr r0, _0806BC28 @ =gUnk_08113140
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806BC54
ldrb r0, [r4, #0xc]
@@ -174,7 +174,7 @@ sub_0806BCFC: @ 0x0806BCFC
ldr r0, _0806BD48 @ =gUnk_08113140
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806BD52
ldrb r0, [r4, #0xc]
asm/forestMinish.s
+2 -2
View File
@@ -25,7 +25,7 @@ _0805FFEC:
_0805FFF2:
ldr r1, _0806003C @ =gUnk_0810A348
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806008C
movs r2, #1
@@ -532,7 +532,7 @@ sub_080603B4: @ 0x080603B4
bne _080603F4
ldr r1, _080603F0 @ =gUnk_0810A348
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080603FA
ldrb r0, [r4, #0xc]
asm/gorman.s
+2 -2
View File
@@ -48,7 +48,7 @@ sub_080697C4: @ 0x080697C4
push {r4, lr}
adds r4, r0, #0
ldr r1, _080697E8 @ =gUnk_08111C3C
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080697E4
movs r0, #1
@@ -112,7 +112,7 @@ sub_08069838: @ 0x08069838
cmp r5, #0
bne _08069862
ldr r1, _08069884 @ =gUnk_08111C3C
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08069880
ldrb r0, [r4, #0xc]
asm/guardWithSpear.s
+2 -2
View File
@@ -67,7 +67,7 @@ sub_08063D44: @ 0x08063D44
ldr r0, _08063DA4 @ =gUnk_0810F524
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08063DC6
adds r0, r4, #0
@@ -228,7 +228,7 @@ sub_08063E90: @ 0x08063E90
ldr r0, _08063EC8 @ =gUnk_0810F524
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08063F1E
ldrb r0, [r4, #0xc]
asm/hurdyGurdyMan.s
+2 -2
View File
@@ -25,7 +25,7 @@ _0806E31C:
_0806E322:
ldr r1, _0806E348 @ =gUnk_081144F0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806E3E0
movs r0, #1
@@ -180,7 +180,7 @@ sub_0806E458: @ 0x0806E458
bne _0806E498
ldr r1, _0806E494 @ =gUnk_081144F0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806E49E
ldrb r0, [r4, #0xc]
asm/kid.s
+3 -3
View File
@@ -42,7 +42,7 @@ sub_080620F4: @ 0x080620F4
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806212A
movs r1, #0
@@ -158,7 +158,7 @@ _080621CE:
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
bne _080621E4
b _080622F2
@@ -1262,7 +1262,7 @@ sub_08062A60: @ 0x08062A60
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08062AB6
ldrb r0, [r4, #0xc]
asm/mama.s
+1 -1
View File
@@ -102,7 +102,7 @@ sub_0806C454: @ 0x0806C454
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806C470 @ =gUnk_08113754
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806C474
adds r0, r4, #0
asm/melari.s
+3 -3
View File
@@ -39,7 +39,7 @@ sub_08068708: @ 0x08068708
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806872C @ =gUnk_08111520
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08068728
movs r0, #1
@@ -116,7 +116,7 @@ _08068794:
_0806879A:
ldr r1, _080687CC @ =gUnk_08111520
adds r0, r5, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806887A
movs r2, #1
@@ -355,7 +355,7 @@ sub_0806897C: @ 0x0806897C
bne _080689B4
ldr r1, _080689B0 @ =gUnk_08111520
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080689BA
ldrb r0, [r4, #0xc]
asm/minishEzlo.s
+1 -1
View File
@@ -16,7 +16,7 @@ sub_08062F70: @ 0x08062F70
bne _08062FA0
ldr r1, _08062FE8 @ =gUnk_0810C48C
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08062FE4
ldrb r0, [r4, #0xc]
asm/mountainMinish.s
+3 -3
View File
@@ -39,7 +39,7 @@ sub_08067E60: @ 0x08067E60
push {r4, lr}
adds r4, r0, #0
ldr r1, _08067E84 @ =gUnk_08111358
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08067E80
movs r0, #1
@@ -136,7 +136,7 @@ _08067F0E:
_08067F10:
ldr r1, _08067F50 @ =gUnk_08111358
adds r0, r5, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
bne _08067F1E
b _080680F0
@@ -561,7 +561,7 @@ sub_08068270: @ 0x08068270
bne _080682A8
ldr r1, _080682A4 @ =gUnk_08111358
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080682AE
ldrb r0, [r4, #0xc]
asm/mutoh.s
+2 -2
View File
@@ -32,7 +32,7 @@ _08066FF8:
_08066FFE:
ldr r1, _0806702C @ =gUnk_08110C00
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806707C
movs r2, #1
@@ -176,7 +176,7 @@ sub_08067118: @ 0x08067118
bne _08067150
ldr r1, _0806714C @ =gUnk_08110C00
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08067156
ldrb r0, [r4, #0xc]
asm/non_matching/syrup/sub_0806A26C.inc
+43
View File
@@ -0,0 +1,43 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0xf
movs r1, #0x2f
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _0806A2AE
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA30
bl Random
adds r5, r0, #0
ldr r2, _0806A2B0 @ =gUnk_081121DC
movs r1, #7
ands r0, r1
adds r0, r0, r2
ldrb r0, [r0]
adds r3, r4, #0
adds r3, #0x62
strb r0, [r3]
lsrs r0, r5, #8
ands r0, r1
adds r0, r0, r2
ldrb r0, [r0]
subs r0, #8
adds r1, r4, #0
adds r1, #0x63
strb r0, [r1]
_0806A2AE:
pop {r4, r5, pc}
.align 2, 0
_0806A2B0: .4byte gUnk_081121DC
.syntax divided
asm/npc58.s
+1 -1
View File
@@ -15,7 +15,7 @@ sub_0806EAF4: @ 0x0806EAF4
bne _0806EB48
ldr r1, _0806EBA0 @ =gUnk_081146D0
adds r0, r6, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806EBA8
ldrb r0, [r6, #0xc]
asm/percy.s
+3 -3
View File
@@ -35,7 +35,7 @@ sub_0806B3CC: @ 0x0806B3CC
bne _0806B3F4
ldr r1, _0806B418 @ =gUnk_08112E1C
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806B414
movs r0, #1
@@ -84,7 +84,7 @@ _0806B430:
_0806B436:
ldr r1, _0806B46C @ =gUnk_08112E1C
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806B4EC
movs r2, #1
@@ -335,7 +335,7 @@ sub_0806B624: @ 0x0806B624
bne _0806B65C
ldr r1, _0806B658 @ =gUnk_08112E1C
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806B662
ldrb r0, [r4, #0xc]
asm/rem.s
-62
View File
@@ -6,68 +6,6 @@
.text
thumb_func_start sub_0806A358
sub_0806A358: @ 0x0806A358
push {lr}
ldr r2, _0806A36C @ =gUnk_08112260
ldrb r1, [r0, #0xa]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0806A36C: .4byte gUnk_08112260
thumb_func_start sub_0806A370
sub_0806A370: @ 0x0806A370
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806A3D0 @ =gUnk_08112278
ldrb r0, [r4, #0xc]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0806ED78
adds r0, r4, #0
adds r0, #0x58
ldrb r0, [r0]
cmp r0, #0xf
bne _0806A3CC
adds r4, #0x5a
ldrb r0, [r4]
cmp r0, #1
bne _0806A3BC
movs r0, #0
strb r0, [r4]
movs r0, #0x86
lsls r0, r0, #2
bl PlaySFX
_0806A3BC:
ldrb r0, [r4]
cmp r0, #2
bne _0806A3CC
movs r0, #0
strb r0, [r4]
ldr r0, _0806A3D4 @ =0x00000219
bl PlaySFX
_0806A3CC:
pop {r4, pc}
.align 2, 0
_0806A3D0: .4byte gUnk_08112278
_0806A3D4: .4byte 0x00000219
thumb_func_start sub_0806A3D8
sub_0806A3D8: @ 0x0806A3D8
push {r4, lr}
asm/sittingPerson.s
+2 -2
View File
@@ -31,7 +31,7 @@ sub_08063758: @ 0x08063758
ldr r0, _08063794 @ =gUnk_0810CB78
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080637B4
movs r2, #1
@@ -365,7 +365,7 @@ sub_080639E8: @ 0x080639E8
ldr r0, _08063A3C @ =gUnk_0810CB78
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08063A5C
ldrb r0, [r4, #0xc]
asm/smith.s
+3 -3
View File
@@ -159,7 +159,7 @@ sub_080660EC: @ 0x080660EC
push {r4, lr}
adds r4, r0, #0
ldr r1, _08066114 @ =gUnk_08110354
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08066112
movs r0, #1
@@ -237,7 +237,7 @@ sub_08066178: @ 0x08066178
push {r4, lr}
adds r4, r0, #0
ldr r1, _080661AC @ =gUnk_08110354
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080661A8
movs r2, #1
@@ -399,7 +399,7 @@ sub_08066298: @ 0x08066298
bne _080662D0
ldr r1, _080662CC @ =gUnk_08110354
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080662D6
ldrb r0, [r4, #0xc]
asm/sturgeon.s
+3 -3
View File
@@ -35,7 +35,7 @@ _08064ABC:
bne _08064AE4
ldr r1, _08064AE0 @ =gUnk_0810FA38
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08064B42
movs r0, #1
@@ -97,7 +97,7 @@ sub_08064B44: @ 0x08064B44
push {r4, lr}
adds r4, r0, #0
ldr r1, _08064B80 @ =gUnk_0810FA38
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08064B7E
adds r0, r4, #0
@@ -349,7 +349,7 @@ sub_08064D18: @ 0x08064D18
bne _08064D50
ldr r1, _08064D4C @ =gUnk_0810FA38
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08064D56
ldrb r0, [r4, #0xc]
asm/syrup.s
-115
View File
@@ -6,121 +6,6 @@
.text
thumb_func_start sub_0806A1D8
sub_0806A1D8: @ 0x0806A1D8
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806A1F4 @ =gUnk_081121D4
ldrb r0, [r4, #0xc]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_0806ED78
pop {r4, pc}
.align 2, 0
_0806A1F4: .4byte gUnk_081121D4
thumb_func_start sub_0806A1F8
sub_0806A1F8: @ 0x0806A1F8
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
ldr r1, _0806A22C @ =gUnk_081121C4
cmp r0, #0
bne _0806A206
ldr r1, _0806A230 @ =gUnk_081121B4
_0806A206:
adds r0, r4, #0
bl sub_0806FDEC
cmp r0, #0
beq _0806A22A
movs r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl sub_0805E3A0
adds r0, r4, #0
bl sub_0807DD50
adds r0, r4, #0
movs r1, #0
bl InitializeAnimation
_0806A22A:
pop {r4, pc}
.align 2, 0
_0806A22C: .4byte gUnk_081121C4
_0806A230: .4byte gUnk_081121B4
thumb_func_start sub_0806A234
sub_0806A234: @ 0x0806A234
push {r4, lr}
adds r4, r0, #0
movs r1, #0
bl sub_0807DD94
adds r0, r4, #0
adds r0, #0x82
ldrh r1, [r0]
movs r0, #4
ands r0, r1
cmp r0, #0
beq _0806A266
ldr r0, _0806A268 @ =gUnk_030010A0
ldr r0, [r0]
movs r1, #7
ands r0, r1
cmp r0, #0
bne _0806A25E
adds r0, r4, #0
bl sub_0806A26C
_0806A25E:
adds r0, r4, #0
movs r1, #2
bl sub_080042BA
_0806A266:
pop {r4, pc}
.align 2, 0
_0806A268: .4byte gUnk_030010A0
thumb_func_start sub_0806A26C
sub_0806A26C: @ 0x0806A26C
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0xf
movs r1, #0x2f
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _0806A2AE
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA30
bl Random
adds r5, r0, #0
ldr r2, _0806A2B0 @ =gUnk_081121DC
movs r1, #7
ands r0, r1
adds r0, r0, r2
ldrb r0, [r0]
adds r3, r4, #0
adds r3, #0x62
strb r0, [r3]
lsrs r0, r5, #8
ands r0, r1
adds r0, r0, r2
ldrb r0, [r0]
subs r0, #8
adds r1, r4, #0
adds r1, #0x63
strb r0, [r1]
_0806A2AE:
pop {r4, r5, pc}
.align 2, 0
_0806A2B0: .4byte gUnk_081121DC
thumb_func_start sub_0806A2B4
sub_0806A2B4: @ 0x0806A2B4
push {r4, r5, r6, lr}
asm/teachers.s
+2 -2
View File
@@ -29,7 +29,7 @@ _0806C5C2:
ldr r0, _0806C600 @ =gUnk_08113910
adds r1, r1, r0
adds r0, r5, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806C670
movs r2, #1
@@ -214,7 +214,7 @@ sub_0806C738: @ 0x0806C738
ldr r0, _0806C774 @ =gUnk_08113910
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806C77E
ldrb r0, [r4, #0xc]
asm/townMinish.s
+2 -2
View File
@@ -103,7 +103,7 @@ _0806ACE4:
ldr r0, _0806AD24 @ =gUnk_08112674
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
bne _0806ACF8
b _0806ADFA
@@ -714,7 +714,7 @@ sub_0806B184: @ 0x0806B184
ldr r0, _0806B1C0 @ =gUnk_08112674
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806B1CA
ldrb r0, [r4, #0xc]
asm/townsperson.s
+3 -3
View File
@@ -49,7 +49,7 @@ sub_08061BC8: @ 0x08061BC8
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08061BF8
movs r0, #2
@@ -199,7 +199,7 @@ sub_08061CEC: @ 0x08061CEC
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _08061D62
movs r2, #1
@@ -687,7 +687,7 @@ sub_08062088: @ 0x08062088
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _080620C2
ldrb r0, [r4, #0xc]
asm/windTribespeople.s
+2 -2
View File
@@ -29,7 +29,7 @@ sub_0806C798: @ 0x0806C798
ldr r0, _0806C7D0 @ =gUnk_08113A1C
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806C7CE
movs r2, #1
@@ -433,7 +433,7 @@ sub_0806CA94: @ 0x0806CA94
ldr r0, _0806CAD0 @ =gUnk_08113A1C
adds r1, r1, r0
adds r0, r4, #0
bl sub_0806FDEC
bl LoadExtraSpriteData
cmp r0, #0
beq _0806CADA
ldrb r0, [r4, #0xc]