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

smallPesto

This commit is contained in:
theo3 2020-06-15 00:11:43 -07:00
parent 4d8721d19a
commit 8604daff6a
143 changed files with 240 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/acroBandits.s
View File

@ -37,7 +37,7 @@ _08031898: .4byte gUnk_080012C8
_0803189C:
ldr r4, _080318C0 @ =gUnk_080CE56C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/bird.s
View File

@ -296,7 +296,7 @@ _0809D14C:
movs r0, #0x17
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
ldr r0, _0809D174 @ =gUnk_02002A40
ldr r1, [r0, #0x40]
movs r2, #0x80

2
asm/bombPeahat.s
View File

@ -31,7 +31,7 @@ _0802A82C: .4byte gUnk_080012C8
_0802A830:
ldr r4, _0802A848 @ =gUnk_080CD0F0
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/bombarossa.s
View File

@ -12,7 +12,7 @@ Bombarossa: @ 0x080333B8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080333D0 @ =gUnk_080CEB38
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/book.s
View File

@ -303,7 +303,7 @@ _0809B5D0:
adds r0, #0x39
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
bl DeleteThisEntity
_0809B5EA:
pop {r4, pc}

6
asm/businessScrub.s
View File

@ -573,7 +573,7 @@ _08028D5C:
_08028D70:
ldrb r0, [r6, #8]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #6
strb r0, [r5, #0xc]
movs r0, #4
@ -593,14 +593,14 @@ _08028D9C:
ldrb r0, [r6, #8]
ldrb r1, [r6, #9]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #4
b _08028DB6
_08028DAA:
ldrb r0, [r6, #8]
ldrb r1, [r6, #9]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #8
_08028DB6:
strb r0, [r5, #0xe]

2
asm/chaser.s
View File

@ -27,7 +27,7 @@ _0802B4F8: .4byte gUnk_080012C8
_0802B4FC:
ldr r4, _0802B514 @ =gUnk_080CD27C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/chestSpawner.s
View File

@ -368,7 +368,7 @@ _08084086:
ldrb r0, [r1, #2]
ldrb r1, [r1, #3]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
b _080840A4
_0808409C:
adds r1, #8

2
asm/chuchu.s
View File

@ -81,7 +81,7 @@ _0801EE9E:
strb r4, [r0]
ldr r4, _0801EED0 @ =gUnk_080CA21C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/chuchuBoss.s
View File

@ -12,7 +12,7 @@ ChuchuBoss: @ 0x08025CA0
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08025CB8 @ =gUnk_080CC19C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

6
asm/code_080011C4.s
View File

@ -139,7 +139,7 @@ EnemyFunctionHandler: @ 0x0800129E
b _080012BA
_080012B2:
adds r0, r4, #0
bl sub_0800279C
bl GetNextFunction
adds r1, r5, #0
_080012BA:
lsls r0, r0, #2
@ -1153,8 +1153,8 @@ gUnk_0800275C::
.byte 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x00, 0x06, 0x06, 0x06
.byte 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06
thumb_func_start sub_0800279C
sub_0800279C: @ 0x0800279C
thumb_func_start GetNextFunction
GetNextFunction: @ 0x0800279C
movs r1, #0x3a
ldrb r3, [r0, r1]
movs r2, #4

62
asm/code_080A5574.s
View File

@ -4886,8 +4886,8 @@ _080A7BCE:
.align 2, 0
_080A7BFC: .4byte gLinkState
thumb_func_start sub_080A7C00
sub_080A7C00: @ 0x080A7C00
thumb_func_start CreateItemEntity
CreateItemEntity: @ 0x080A7C00
push {r4, lr}
bl GiveItemWithCutscene
adds r4, r0, #0
@ -4999,13 +4999,13 @@ _080A7CB0:
ldrb r0, [r4, #2]
ldrb r1, [r4, #3]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
b _080A7CDC
_080A7CD2:
movs r0, #0x60
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
_080A7CDC:
movs r0, #0x74
adds r1, r5, #0
@ -5484,7 +5484,7 @@ sub_080A8030: @ 0x080A8030
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A8048 @ =gUnk_081295D0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -5670,7 +5670,7 @@ sub_080A8190: @ 0x080A8190
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A81A8 @ =gUnk_0812960C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -5860,7 +5860,7 @@ sub_080A82F8: @ 0x080A82F8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A8310 @ =gUnk_08129650
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -6039,7 +6039,7 @@ sub_080A843C: @ 0x080A843C
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A8454 @ =gUnk_081296F0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -6368,7 +6368,7 @@ sub_080A86BC: @ 0x080A86BC
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A86D4 @ =gUnk_08129718
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -6508,7 +6508,7 @@ sub_080A87C8: @ 0x080A87C8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A87E0 @ =gUnk_08129740
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -6869,7 +6869,7 @@ _080A8A64:
sub_080A8A68: @ 0x080A8A68
push {r4, lr}
adds r4, r0, #0
bl sub_0800279C
bl GetNextFunction
cmp r0, #0
beq _080A8A78
bl DeleteThisEntity
@ -7028,7 +7028,7 @@ _080A8B94:
sub_080A8B98: @ 0x080A8B98
push {r4, lr}
adds r4, r0, #0
bl sub_0800279C
bl GetNextFunction
cmp r0, #0
beq _080A8BA8
bl DeleteThisEntity
@ -7173,7 +7173,7 @@ _080A8CA8:
sub_080A8CAC: @ 0x080A8CAC
push {r4, lr}
adds r4, r0, #0
bl sub_0800279C
bl GetNextFunction
cmp r0, #0
beq _080A8CBC
bl DeleteThisEntity
@ -7319,7 +7319,7 @@ sub_080A8DC0: @ 0x080A8DC0
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A8DD8 @ =gUnk_08129954
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -7988,7 +7988,7 @@ sub_080A9300: @ 0x080A9300
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A9318 @ =gUnk_081299D0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -8378,7 +8378,7 @@ sub_080A95DC: @ 0x080A95DC
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A95F4 @ =gUnk_08129ABC
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -8909,7 +8909,7 @@ sub_080A9A00: @ 0x080A9A00
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A9A18 @ =gUnk_08129AE0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -9311,7 +9311,7 @@ sub_080A9CA8: @ 0x080A9CA8
_080A9CB8:
ldr r4, _080A9CD0 @ =gUnk_08129B58
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -9440,7 +9440,7 @@ sub_080A9DA4: @ 0x080A9DA4
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080A9DBC @ =gUnk_08129BEC
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -9554,7 +9554,7 @@ _080A9E60:
_080A9E78:
ldr r4, _080A9E90 @ =gUnk_08129C7C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -10276,7 +10276,7 @@ sub_080AA400: @ 0x080AA400
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080AA418 @ =gUnk_08129FB8
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -10612,7 +10612,7 @@ sub_080AA68C: @ 0x080AA68C
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080AA6A4 @ =gUnk_0812A014
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -11188,7 +11188,7 @@ sub_080AAAE8: @ 0x080AAAE8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080AAB00 @ =gUnk_0812A3C0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -11331,7 +11331,7 @@ sub_080AABF0: @ 0x080AABF0
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080AAC08 @ =gUnk_0812A418
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -12236,7 +12236,7 @@ sub_080AB2A8: @ 0x080AB2A8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080AB2C0 @ =gUnk_0812A4C8
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -12548,7 +12548,7 @@ sub_080AB510: @ 0x080AB510
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080AB528 @ =gUnk_0812A58C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -13437,7 +13437,7 @@ sub_080ABB8C: @ 0x080ABB8C
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080ABBA4 @ =gUnk_0812A7D4
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -13903,7 +13903,7 @@ sub_080ABF24: @ 0x080ABF24
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080ABF3C @ =gUnk_0812A84C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -13973,7 +13973,7 @@ sub_080ABFB0: @ 0x080ABFB0
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080ABFC8 @ =gUnk_0812A954
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -15180,7 +15180,7 @@ sub_080AC8A8: @ 0x080AC8A8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080AC8C0 @ =gUnk_0812A9D8
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@ -15382,7 +15382,7 @@ sub_080ACA34: @ 0x080ACA34
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080ACA4C @ =gUnk_0812AA5C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/crow.s
View File

@ -12,7 +12,7 @@ Crow: @ 0x080327F4
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0803280C @ =gUnk_080CE978
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/cuccoAggr.s
View File

@ -27,7 +27,7 @@ _08038CC4: .4byte gUnk_080012C8
_08038CC8:
ldr r4, _08038CF4 @ =gUnk_080CF778
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/cuccoChickAggr.s
View File

@ -12,7 +12,7 @@ CuccoChickAggr: @ 0x08022918
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08022930 @ =gUnk_080CBB64
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/doorMimic.s
View File

@ -12,7 +12,7 @@ DoorMimic: @ 0x08021FA8
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _08021FD4 @ =gUnk_080CB734
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

2
asm/dust.s
View File

@ -12,7 +12,7 @@ Dust: @ 0x08044118
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08044130 @ =gUnk_080D1588
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/enemy50.s
View File

@ -33,7 +33,7 @@ _08040B4E:
_08040B5C:
ldr r4, _08040B80 @ =gUnk_080D0DC4
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/enemy62.s
View File

@ -19,7 +19,7 @@ Enemy62: @ 0x08048D98
_08048DA8:
ldr r4, _08048E00 @ =gUnk_080D22D8
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/figurineDevice.s
View File

@ -1352,7 +1352,7 @@ _080885E8:
movs r0, #0x3e
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #0x59
bl SetGlobalFlag
_0808860A:

2
asm/flyingPot.s
View File

@ -27,7 +27,7 @@ _0803706C: .4byte gUnk_080012C8
_08037070:
ldr r4, _08037088 @ =gUnk_080CF244
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/flyingSkull.s
View File

@ -27,7 +27,7 @@ _08039BC0: .4byte gUnk_080012C8
_08039BC4:
ldr r4, _08039BDC @ =gUnk_080CFB84
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/ghini.s
View File

@ -12,7 +12,7 @@ Ghini: @ 0x0803EFDC
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0803F004 @ =gUnk_080D0924
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

2
asm/gleerok.s
View File

@ -12,7 +12,7 @@ Gleerok: @ 0x0802D018
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0802D030 @ =gUnk_080CD748
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/gyorgChild.s
View File

@ -30,7 +30,7 @@ GyorgChild: @ 0x08048640
_08048664:
ldr r4, _08048680 @ =gUnk_080D1E6C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/gyorgFemaleEye.s
View File

@ -19,7 +19,7 @@ GyorgFemaleEye: @ 0x08048988
_08048998:
ldr r4, _080489B0 @ =gUnk_080D1F64
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/heartContainer.s
View File

@ -143,7 +143,7 @@ sub_0808E764: @ 0x0808E764
movs r0, #0x62
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
bl DeleteThisEntity
_0808E79A:
pop {r4, pc}

2
asm/itemOnGround.s
View File

@ -1337,7 +1337,7 @@ _08081438:
ldrb r0, [r4, #0xa]
ldrb r1, [r4, #0xb]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #1
_0808144C:
pop {r4, pc}

2
asm/keese.s
View File

@ -12,7 +12,7 @@ Keese: @ 0x08021D64
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08021D7C @ =gUnk_080CB69C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/lakituCloud.s
View File

@ -12,7 +12,7 @@ LakituCloud: @ 0x0803CCB8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0803CCD0 @ =gUnk_080D0418
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/madderpillar.s
View File

@ -25,7 +25,7 @@ sub_08029870: @ 0x08029870
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08029888 @ =gUnk_080CCD60
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/mazaalBracelet.s
View File

@ -12,7 +12,7 @@ MazaalBracelet: @ 0x0803A154
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0803A16C @ =gUnk_080CFC14
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/mazaalHead.s
View File

@ -12,7 +12,7 @@ MazaalHead: @ 0x08033ED4
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08033EEC @ =gUnk_080CEC88
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/mazaalMacro.s
View File

@ -12,7 +12,7 @@ MazaalMacro: @ 0x08034C60
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08034C78 @ =gUnk_080CEE90
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

43
asm/object1C.s
View File

@ -1,43 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Object1C
Object1C: @ 0x080874A0
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _080874AE
movs r0, #1
strb r0, [r4, #0xc]
_080874AE:
adds r0, r4, #0
adds r0, #0x80
movs r1, #0
ldrsh r0, [r0, r1]
adds r1, r4, #0
adds r1, #0x82
movs r2, #0
ldrsh r1, [r1, r2]
movs r2, #0x10
movs r3, #0x10
bl CheckRectOnScreen
cmp r0, #0
bne _080874DC
ldr r2, [r4, #0x50]
movs r1, #1
ldrb r4, [r4, #0xb]
lsls r1, r4
ldr r0, [r2, #0x20]
bics r0, r1
str r0, [r2, #0x20]
bl DeleteThisEntity
_080874DC:
pop {r4, pc}
.align 2, 0

32
asm/object1D.s
View File

@ -1,32 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Object1D
Object1D: @ 0x080874E0
push {lr}
ldr r2, _080874F4 @ =gUnk_081208A0
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_080874F4: .4byte gUnk_081208A0
thumb_func_start sub_080874F8
sub_080874F8: @ 0x080874F8
push {lr}
bl DeleteThisEntity
pop {pc}
thumb_func_start nullsub_117
nullsub_117: @ 0x08087500
bx lr
.align 2, 0

2
asm/object30.s
View File

@ -151,7 +151,7 @@ _0808A954:
ldrb r1, [r4, #0xb]
movs r0, #0x5c
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
bl DeleteThisEntity
_0808A962:
pop {r4, pc}

4
asm/object6A.s
View File

@ -812,7 +812,7 @@ _08095040:
movs r0, #0x1c
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #0x5b
bl SetGlobalFlag
movs r0, #0x3c
@ -897,7 +897,7 @@ _080950F0:
movs r0, #0x5b
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
bl DeleteThisEntity
_0809510A:
ldrb r4, [r5, #0xa]

2
asm/object96.s
View File

@ -195,7 +195,7 @@ _0809D8E8:
ldrb r0, [r6, #0xd]
ldrb r1, [r5, #0xb]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
ldrh r0, [r6, #0x1c]
cmp r0, #0
beq _0809D906

80
asm/objectA8.s
View File

@ -6,86 +6,6 @@
.text
thumb_func_start ObjectA8
ObjectA8: @ 0x0809F9DC
push {r4, lr}
adds r4, r0, #0
adds r0, #0x41
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _0809FA9A
movs r0, #0x7f
ands r0, r1
cmp r0, #0x1f
bhi _0809FA9A
lsls r0, r0, #2
ldr r1, _0809FA00 @ =_0809FA04
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0809FA00: .4byte _0809FA04
_0809FA04: @ jump table
.4byte _0809FA84 @ case 0
.4byte _0809FA84 @ case 1
.4byte _0809FA9A @ case 2
.4byte _0809FA9A @ case 3
.4byte _0809FA84 @ case 4
.4byte _0809FA84 @ case 5
.4byte _0809FA84 @ case 6
.4byte _0809FA9A @ case 7
.4byte _0809FA84 @ case 8
.4byte _0809FA84 @ case 9
.4byte _0809FA84 @ case 10
.4byte _0809FA84 @ case 11
.4byte _0809FA84 @ case 12
.4byte _0809FA9A @ case 13
.4byte _0809FA9A @ case 14
.4byte _0809FA9A @ case 15
.4byte _0809FA9A @ case 16
.4byte _0809FA9A @ case 17
.4byte _0809FA9A @ case 18
.4byte _0809FA9A @ case 19
.4byte _0809FA9A @ case 20
.4byte _0809FA9A @ case 21
.4byte _0809FA9A @ case 22
.4byte _0809FA9A @ case 23
.4byte _0809FA9A @ case 24
.4byte _0809FA9A @ case 25
.4byte _0809FA9A @ case 26
.4byte _0809FA9A @ case 27
.4byte _0809FA9A @ case 28
.4byte _0809FA9A @ case 29
.4byte _0809FA84 @ case 30
.4byte _0809FA84 @ case 31
_0809FA84:
movs r0, #5
strb r0, [r4, #0xc]
ldr r0, _0809FAB4 @ =gLinkEntity
str r0, [r4, #0x54]
ldrb r0, [r4, #0xa]
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl DeleteThisEntity
_0809FA9A:
ldr r0, _0809FAB8 @ =gUnk_08124824
ldrb r1, [r4, #0xc]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_08080CB4
pop {r4, pc}
.align 2, 0
_0809FAB4: .4byte gLinkEntity
_0809FAB8: .4byte gUnk_08124824
thumb_func_start sub_0809FABC
sub_0809FABC: @ 0x0809FABC
push {lr}

2
asm/octorokBoss.s
View File

@ -12,7 +12,7 @@ OctorokBoss: @ 0x080351BC
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080351D4 @ =gUnk_080CF040
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/octorokGolden.s
View File

@ -26,7 +26,7 @@ _08037C58: .4byte gUnk_080012C8
_08037C5C:
ldr r4, _08037C80 @ =gUnk_080CF46C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/pesto.s
View File

@ -12,7 +12,7 @@ Pesto: @ 0x08023F28
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08023F40 @ =gUnk_080CBEC4
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/ropeGolden.s
View File

@ -27,7 +27,7 @@ _080381CC: .4byte gUnk_080012C8
_080381D0:
ldr r4, _080381F4 @ =gUnk_080CF4C8
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/rupeeLike.s
View File

@ -33,7 +33,7 @@ _080292C4:
_080292CE:
ldr r4, _080292F4 @ =gUnk_080CCC00
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/sluggula.s
View File

@ -44,7 +44,7 @@ _08023BD4: .4byte gUnk_080012C8
_08023BD8:
ldr r4, _08023BFC @ =gUnk_080CBDD4
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

103
asm/smallPesto.s
View File

@ -6,109 +6,6 @@
.text
thumb_func_start SmallPesto
SmallPesto: @ 0x08031664
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0803167C @ =gUnk_080CE530
bl sub_0800279C
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
adds r0, r5, #0
bl _call_via_r1
pop {r4, r5, pc}
.align 2, 0
_0803167C: .4byte gUnk_080CE530
thumb_func_start sub_08031680
sub_08031680: @ 0x08031680
push {lr}
ldr r2, _08031694 @ =gUnk_080CE548
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_08031694: .4byte gUnk_080CE548
thumb_func_start nullsub_152
nullsub_152: @ 0x08031698
bx lr
.align 2, 0
thumb_func_start sub_0803169C
sub_0803169C: @ 0x0803169C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
adds r0, r4, #0
bl sub_0806F520
cmp r0, #0
bne _080316C4
movs r2, #1
strb r2, [r4, #0xc]
strb r0, [r4, #0xd]
ldrb r1, [r4, #0x10]
movs r0, #0x80
orrs r0, r1
strb r0, [r4, #0x10]
movs r0, #0x40
strh r0, [r4, #0x24]
strb r2, [r4, #0xf]
b _080316D4
_080316C4:
ldr r0, _080316D8 @ =gUnk_080CE554
ldrb r1, [r4, #0xd]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r4, #0
bl _call_via_r1
_080316D4:
pop {r4, pc}
.align 2, 0
_080316D8: .4byte gUnk_080CE554
thumb_func_start sub_080316DC
sub_080316DC: @ 0x080316DC
movs r1, #1
strb r1, [r0, #0xd]
movs r1, #0x3c
strb r1, [r0, #0x1d]
bx lr
.align 2, 0
thumb_func_start sub_080316E8
sub_080316E8: @ 0x080316E8
push {lr}
bl sub_0806F4E8
pop {pc}
thumb_func_start sub_080316F0
sub_080316F0: @ 0x080316F0
push {r4, lr}
adds r4, r0, #0
bl sub_0806F3E4
cmp r0, #0
beq _08031702
adds r0, r4, #0
bl sub_0804A7D4
_08031702:
pop {r4, pc}
thumb_func_start sub_08031704
sub_08031704: @ 0x08031704
push {r4, lr}
adds r4, r0, #0
bl sub_0804A720
adds r0, r4, #0
bl sub_080317F8
pop {r4, pc}
thumb_func_start sub_08031714
sub_08031714: @ 0x08031714
push {r4, lr}

2
asm/spark.s
View File

@ -12,7 +12,7 @@ Spark: @ 0x0802B2AC
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0802B2C4 @ =gUnk_080CD234
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/stockwell.s
View File

@ -334,7 +334,7 @@ sub_080652B0: @ 0x080652B0
movs r0, #0x36
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
_080652DA:
pop {pc}
.align 2, 0

2
asm/sub_0804AA30.s
View File

@ -17,7 +17,7 @@ sub_0804AA30: @ 0x0804AA30
ands r0, r1
strb r0, [r6]
adds r0, r4, #0
bl sub_0800279C
bl GetNextFunction
ldrb r2, [r6]
movs r1, #0x80
orrs r1, r2

2
asm/takkuri.s
View File

@ -12,7 +12,7 @@ Takkuri: @ 0x0803BB7C
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0803BB94 @ =gUnk_080CFF3C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/vaatiArm.s
View File

@ -12,7 +12,7 @@ VaatiArm: @ 0x08042554
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0804256C @ =gUnk_080D1230
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/vaatiEyesMacro.s
View File

@ -12,7 +12,7 @@ VaatiEyesMacro: @ 0x0802EC6C
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0802EC94 @ =gUnk_080CDE34
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

2
asm/vaatiProjectile.s
View File

@ -26,7 +26,7 @@ VaatiProjectile: @ 0x0803E08C
_0803E0AA:
ldr r4, _0803E0C0 @ =gUnk_080D0648
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]

2
asm/wallMaster.s
View File

@ -12,7 +12,7 @@ WallMaster: @ 0x0802A408
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0802A430 @ =gUnk_080CD07C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

2
asm/wallMaster2.s
View File

@ -12,7 +12,7 @@ WallMaster2: @ 0x0802CC3C
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0802CC64 @ =gUnk_080CD6FC
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

2
asm/wizzrobeFire.s
View File

@ -12,7 +12,7 @@ WizzrobeFire: @ 0x0802FB30
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0802FB58 @ =gUnk_080CDFC4
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

2
asm/wizzrobeIce.s
View File

@ -12,7 +12,7 @@ WizzrobeIce: @ 0x0802FDD4
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0802FDFC @ =gUnk_080CE074
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

2
asm/wizzrobeWind.s
View File

@ -12,7 +12,7 @@ WizzrobeWind: @ 0x0802F4A0
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0802F4C8 @ =gUnk_080CDF50
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]

BIN
data/ddump Executable file
View File

Binary file not shown.

2
data/gfx.ddscript Normal file
View File

@ -0,0 +1,2 @@
$data :
.data $data

2
data/ptr_array.ddscript Executable file
View File

@ -0,0 +1,2 @@
$ptr :4 int:4 checkptr:1
.4byte $*ptr

6
linker.ld
View File

@ -364,6 +364,7 @@ SECTIONS {
asm/armos.o(.text);
asm/eyegore.o(.text);
asm/rope.o(.text);
src/smallPesto.o(.text);
asm/smallPesto.o(.text);
asm/acroBandits.o(.text);
src/bladeTrap.o(.text);
@ -613,8 +614,8 @@ SECTIONS {
src/object1A.o(.text);
src/greatFairy.o(.text);
asm/greatFairy.o(.text);
asm/object1C.o(.text);
asm/object1D.o(.text);
src/object1C.o(.text);
src/object1D.o(.text);
asm/object1E.o(.text);
asm/object1F.o(.text);
asm/object20.o(.text);
@ -754,6 +755,7 @@ SECTIONS {
asm/objectA5.o(.text);
asm/objectA6.o(.text);
asm/objectA7.o(.text);
src/objectA8.o(.text);
asm/objectA8.o(.text);
asm/objectA9.o(.text);
asm/waterfallOpening.o(.text);

19
src/object1C.c Normal file
View File

@ -0,0 +1,19 @@
#include "global.h"
#include "entity.h"
extern u32 CheckRectOnScreen(s16, s16, u32, u32);
extern void DeleteThisEntity();
void Object1C(Entity *this)
{
s32 iVar1;
if (this->action == 0) {
this->action = 1;
}
iVar1 = CheckRectOnScreen(this->field_0x80, this->field_0x82, 0x10, 0x10);
if (iVar1 == 0) {
this->parent->field_0x20 &= ~(1 << this->entityType.parameter2);
DeleteThisEntity();
}
}

18
src/object1D.c Normal file
View File

@ -0,0 +1,18 @@
#include "global.h"
#include "entity.h"
void DeleteThisEntity();
extern void (*gUnk_081208A0[])(Entity*);
void Object1D(Entity *this)
{
gUnk_081208A0[this->action](this);
}
void sub_080874F8(Entity* this)
{
DeleteThisEntity();
}
void nullsub_117(){}

36
src/objectA8.c Normal file
View File

@ -0,0 +1,36 @@
#include "global.h"
#include "entity.h"
extern void CreateItemEntity(u32, u32, u32);
extern void DeleteThisEntity();
extern void sub_08080CB4(Entity*);
extern void (*gUnk_08124824[])(Entity*);
extern Entity gLinkEntity;
void ObjectA8(Entity *this)
{
if ((this->bitfield & 0x80) != 0) {
switch(this->bitfield & 0x7f) {
case 0:
case 1:
case 4:
case 5:
case 6:
case 8:
case 9:
case 10:
case 0xb:
case 0xc:
case 0x1e:
case 0x1f:
this->action = 5;
this->attachedEntity = &gLinkEntity;
CreateItemEntity((this->entityType).parameter1, 0, 0);
DeleteThisEntity();
}
}
gUnk_08124824[this->action](this);
sub_08080CB4(this);
}

69
src/smallPesto.c Normal file
View File

@ -0,0 +1,69 @@
#include "global.h"
#include "entity.h"
extern u32 GetNextFunction(Entity*);
extern u32 sub_08004274(Entity*);
extern u32 sub_0806F520(Entity*);
extern void sub_0806F4E8(Entity*);
extern u32 sub_0806F3E4();
extern void sub_0804A7D4(Entity*);
extern void sub_0804A720(Entity*);
extern void sub_080317F8(Entity*);
extern void (*gUnk_080CE530[])(Entity*);
extern void (*gUnk_080CE548[])(Entity*);
extern void (*gUnk_080CE554[])(Entity*);
void SmallPesto(Entity *this)
{
gUnk_080CE530[GetNextFunction(this)](this);
}
void sub_08031680(Entity *this)
{
gUnk_080CE548[this->action](this);
}
void nullsub_152(){}
void sub_0803169C(Entity *this)
{
s32 iVar1;
sub_08004274(this);
iVar1 = sub_0806F520(this);
if (iVar1 == 0) {
this->action = 1;
this->previousActionFlag = 0;
this->flags = this->flags | 0x80;
this->nonPlanarMovement = 0x40;
this->field_0xf = 1;
}
else {
gUnk_080CE554[this->previousActionFlag](this);
}
}
void sub_080316DC(Entity *this)
{
this->previousActionFlag = 1;
this->filler[1] = 0x3c;
}
void sub_080316E8(Entity *this)
{
sub_0806F4E8(this);
}
void sub_080316F0(Entity *this)
{
if (sub_0806F3E4()) {
sub_0804A7D4(this);
}
}
void sub_08031704(Entity *this)
{
sub_0804A720(this);
sub_080317F8(this);
}

0
tools/aif2pcm/.gitignore vendored Normal file → Executable file
View File

0
tools/aif2pcm/LICENSE Normal file → Executable file
View File

0
tools/aif2pcm/Makefile Normal file → Executable file
View File

0
tools/aif2pcm/extended.c Normal file → Executable file
View File

0
tools/aif2pcm/main.c Normal file → Executable file
View File

0
tools/bin2c/.gitignore vendored Normal file → Executable file
View File

0
tools/bin2c/LICENSE Normal file → Executable file
View File

0
tools/bin2c/Makefile Normal file → Executable file
View File

0
tools/bin2c/bin2c.c Normal file → Executable file
View File

0
tools/gbafix/.gitignore vendored Normal file → Executable file
View File

0
tools/gbafix/COPYING Normal file → Executable file
View File

0
tools/gbafix/Makefile Normal file → Executable file
View File

0
tools/gbafix/elf.h Normal file → Executable file
View File

0
tools/gbafix/gbafix.c Normal file → Executable file
View File

0
tools/gbagfx/.gitignore vendored Normal file → Executable file
View File

0
tools/gbagfx/LICENSE Normal file → Executable file
View File

0
tools/gbagfx/Makefile Normal file → Executable file
View File

0
tools/gbagfx/convert_png.c Normal file → Executable file
View File

0
tools/gbagfx/convert_png.h Normal file → Executable file
View File

0
tools/gbagfx/font.c Normal file → Executable file
View File

0
tools/gbagfx/font.h Normal file → Executable file
View File

0
tools/gbagfx/gfx.c Normal file → Executable file
View File

0
tools/gbagfx/gfx.h Normal file → Executable file
View File

0
tools/gbagfx/global.h Normal file → Executable file
View File

0
tools/gbagfx/huff.c Normal file → Executable file
View File

0
tools/gbagfx/huff.h Normal file → Executable file
View File

0
tools/gbagfx/jasc_pal.c Normal file → Executable file
View File

0
tools/gbagfx/jasc_pal.h Normal file → Executable file
View File

0
tools/gbagfx/lz.c Normal file → Executable file
View File

0
tools/gbagfx/lz.h Normal file → Executable file
View File

0
tools/gbagfx/main.c Normal file → Executable file
View File

0
tools/gbagfx/options.h Normal file → Executable file
View File

0
tools/gbagfx/rl.c Normal file → Executable file
View File

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