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

Convert .inc files into .s files and include them in linker.ld

This commit is contained in:
octorock 2021-03-23 21:34:24 +01:00
parent b9903c2f5d
commit 58445541d2
790 changed files with 33208 additions and 29538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asm/castorWildsStatue.s
View File

@ -544,23 +544,3 @@ _08067788:
bl GetNextFrame
_0806778E:
pop {r4, pc}
@ TODO this already belongs to cat
thumb_func_start sub_08067790
sub_08067790: @ 0x08067790
push {lr}
ldrb r2, [r0, #0xa]
lsls r1, r2, #2
adds r1, r1, r2
lsls r1, r1, #4
ldr r2, _080677AC @ =gSave
ldrb r2, [r2, #8]
lsls r2, r2, #3
ldr r3, _080677B0 @ =gUnk_08110EF8
adds r2, r2, r3
adds r1, r1, r2
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_080677AC: .4byte gSave
_080677B0: .4byte gUnk_08110EF8

2
asm/cat.s
View File

@ -6,8 +6,6 @@
.text
thumb_func_start sub_080677EC
sub_080677EC: @ 0x080677EC
push {r4, lr}

46
asm/code_08019444.s → asm/code_0801967C.s
View File

@ -6,42 +6,6 @@
.text
thumb_func_start sub_08019444 @ TODO bow
sub_08019444: @ 0x08019444
push {r4, lr}
adds r4, r0, #0
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
movs r1, #0x80
lsls r1, r1, #6
adds r0, r4, #0
bl sub_08003FC4
cmp r0, #0
bne _08019464
bl DeleteThisEntity
_08019464:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08019468 @ TODO bow?
sub_08019468: @ 0x08019468
push {lr}
adds r1, r0, #0
adds r0, #0x40
ldrb r0, [r0]
cmp r0, #0xe
bne _0801947E
adds r0, r1, #0
movs r1, #0x50
movs r2, #0
bl CreateFx
_0801947E:
pop {pc}
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/playerItem/playerItemSwordBeam.inc"
thumb_func_start sub_0801967C
sub_0801967C: @ 0x0801967C
push {lr}
@ -3625,13 +3589,3 @@ _0801B178:
pop {pc}
.align 2, 0
_0801B184: .4byte gUnk_02000CC0
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/playerItem/playerItemBomb.inc"
.include "asm/playerItem/playerItem3.inc"
.include "asm/playerItem/playerItemC.inc"
.include "asm/playerItem/playerItemSwordSpin.inc"

2351
asm/code_0805436C.s
View File

File diff suppressed because it is too large Load Diff

2354
asm/code_08054C04.s Normal file
View File

File diff suppressed because it is too large Load Diff

110
asm/code_0806FA6C.s
View File

@ -843,113 +843,3 @@ GetSpriteSubEntryOffsetDataPointer: @ 0x080700C8
bx lr
.align 2, 0
_080700E4: .4byte gUnk_089FB780
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/playerItem/playerItem12.inc"
.include "asm/playerItem/playerItemPacciCane.inc"
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
push {lr}
ldr r0, _08070614 @ =gInput
ldrh r1, [r0, #2]
movs r0, #8
ands r0, r1
cmp r0, #0
beq _08070674
ldr r0, _08070618 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _0807061C @ =gUnk_02034490
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _08070620 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
bne _08070674
ldr r1, _08070624 @ =gSave
adds r0, r1, #0
adds r0, #0xaa
ldrb r0, [r0]
cmp r0, #0
beq _08070674
adds r0, r1, #0
adds r0, #0xf2
ldrb r0, [r0]
cmp r0, #0
beq _08070674
ldr r1, _08070628 @ =gPlayerState
adds r0, r1, #0
adds r0, #0x8b
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _0807062C @ =gUnk_03003DC0
ldrh r0, [r0, #8]
cmp r0, #0
bne _08070674
adds r2, r1, #0
adds r2, #0xa8
ldrb r0, [r2]
cmp r0, #0
bne _08070630
adds r0, r1, #0
adds r0, #0xa9
ldrb r0, [r0]
b _08070632
.align 2, 0
_08070614: .4byte gInput
_08070618: .4byte gFadeControl
_0807061C: .4byte gUnk_02034490
_08070620: .4byte gTextBox
_08070624: .4byte gSave
_08070628: .4byte gPlayerState
_0807062C: .4byte gUnk_03003DC0
_08070630:
ldrb r0, [r2]
_08070632:
subs r0, #0x12
cmp r0, #0xa
bhi _08070678
lsls r0, r0, #2
ldr r1, _08070644 @ =_08070648
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08070644: .4byte _08070648
_08070648: @ jump table
.4byte _08070674 @ case 0
.4byte _08070674 @ case 1
.4byte _08070678 @ case 2
.4byte _08070674 @ case 3
.4byte _08070674 @ case 4
.4byte _08070678 @ case 5
.4byte _08070678 @ case 6
.4byte _08070678 @ case 7
.4byte _08070678 @ case 8
.4byte _08070678 @ case 9
.4byte _08070674 @ case 10
_08070674:
movs r0, #0
b _0807067E
_08070678:
bl sub_080A4D88
movs r0, #1
_0807067E:
pop {pc}

112
asm/code_0807059C.s Normal file
View File

@ -0,0 +1,112 @@
.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
push {lr}
ldr r0, _08070614 @ =gInput
ldrh r1, [r0, #2]
movs r0, #8
ands r0, r1
cmp r0, #0
beq _08070674
ldr r0, _08070618 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _0807061C @ =gUnk_02034490
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _08070620 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
bne _08070674
ldr r1, _08070624 @ =gSave
adds r0, r1, #0
adds r0, #0xaa
ldrb r0, [r0]
cmp r0, #0
beq _08070674
adds r0, r1, #0
adds r0, #0xf2
ldrb r0, [r0]
cmp r0, #0
beq _08070674
ldr r1, _08070628 @ =gPlayerState
adds r0, r1, #0
adds r0, #0x8b
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _0807062C @ =gUnk_03003DC0
ldrh r0, [r0, #8]
cmp r0, #0
bne _08070674
adds r2, r1, #0
adds r2, #0xa8
ldrb r0, [r2]
cmp r0, #0
bne _08070630
adds r0, r1, #0
adds r0, #0xa9
ldrb r0, [r0]
b _08070632
.align 2, 0
_08070614: .4byte gInput
_08070618: .4byte gFadeControl
_0807061C: .4byte gUnk_02034490
_08070620: .4byte gTextBox
_08070624: .4byte gSave
_08070628: .4byte gPlayerState
_0807062C: .4byte gUnk_03003DC0
_08070630:
ldrb r0, [r2]
_08070632:
subs r0, #0x12
cmp r0, #0xa
bhi _08070678
lsls r0, r0, #2
ldr r1, _08070644 @ =_08070648
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08070644: .4byte _08070648
_08070648: @ jump table
.4byte _08070674 @ case 0
.4byte _08070674 @ case 1
.4byte _08070678 @ case 2
.4byte _08070674 @ case 3
.4byte _08070674 @ case 4
.4byte _08070678 @ case 5
.4byte _08070678 @ case 6
.4byte _08070678 @ case 7
.4byte _08070678 @ case 8
.4byte _08070678 @ case 9
.4byte _08070674 @ case 10
_08070674:
movs r0, #0
b _0807067E
_08070678:
bl sub_080A4D88
movs r0, #1
_0807067E:
pop {pc}

40
asm/code_080732D0.s
View File

@ -4330,43 +4330,3 @@ sub_080752E8: @ 0x080752E8
pop {pc}
.align 2, 0
_080752FC: .4byte gItemFunctions
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/item/itemDebug.inc"
.include "asm/item/itemSword.inc"
.include "asm/item/itemLantern.inc"
.include "asm/item/itemBoomerang.inc"
.include "asm/item/itemBow.inc"
.include "asm/item/itemBomb.inc"
.include "asm/item/itemTryPickupObject.inc"
.include "asm/item/itemRocsCape.inc"
.include "asm/item/itemPegasusBoots.inc"

8
asm/code_08076C80.s → asm/code_08077698.s
View File

@ -6,14 +6,6 @@
.text
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/item/itemGustJar.inc"
.include "asm/item/itemMoleMitts.inc"
.include "asm/item/itemJarEmpty.inc"
thumb_func_start sub_08077698
sub_08077698: @ 0x08077698
push {r4, r5, lr}

60
asm/code_080A29BC.s
View File

@ -397,63 +397,3 @@ _080A2D6E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/playerItem/playerItemShield.inc"
.include "asm/playerItem/playerItem15.inc"
thumb_func_start InitSound
InitSound: @ 0xInitSound
push {lr}
bl sub_080A3210
bl m4aSoundInit
pop {pc}
thumb_func_start sub_080A3210
sub_080A3210: @ 0x080A3210
push {r4, lr}
ldr r4, _080A3230 @ =gUnk_02021EE0
adds r0, r4, #0
movs r1, #0x18
bl MemClear
bl sub_080A35C8
movs r0, #0x80
lsls r0, r0, #1
strh r0, [r4, #0x12]
strh r0, [r4, #4]
bl m4aMPlayAllStop
pop {r4, pc}
.align 2, 0
_080A3230: .4byte gUnk_02021EE0
thumb_func_start sub_080A3234
sub_080A3234: @ 0x080A3234
push {lr}
ldr r1, _080A3244 @ =gUnk_02021EE0
strh r0, [r1, #8]
strh r0, [r1, #0xa]
ldrh r0, [r1, #0x14]
bl sub_080A353C
pop {pc}
.align 2, 0
_080A3244: .4byte gUnk_02021EE0
thumb_func_start sub_080A3248
sub_080A3248: @ 0x080A3248
push {lr}
ldr r1, _080A3258 @ =gUnk_02021EE0
strh r0, [r1, #0x10]
strh r0, [r1, #0xe]
ldrh r0, [r1, #0x14]
bl sub_080A353C
pop {pc}
.align 2, 0
_080A3258: .4byte gUnk_02021EE0
thumb_func_start sub_080A325C
sub_080A325C: @ 0x080A325C
ldr r1, _080A3264 @ =gUnk_02021EE0
strh r0, [r1, #0x12]
bx lr
.align 2, 0
_080A3264: .4byte gUnk_02021EE0

62
asm/code_080A3204.s Normal file
View File

@ -0,0 +1,62 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start InitSound
InitSound: @ 0xInitSound
push {lr}
bl sub_080A3210
bl m4aSoundInit
pop {pc}
thumb_func_start sub_080A3210
sub_080A3210: @ 0x080A3210
push {r4, lr}
ldr r4, _080A3230 @ =gUnk_02021EE0
adds r0, r4, #0
movs r1, #0x18
bl MemClear
bl sub_080A35C8
movs r0, #0x80
lsls r0, r0, #1
strh r0, [r4, #0x12]
strh r0, [r4, #4]
bl m4aMPlayAllStop
pop {r4, pc}
.align 2, 0
_080A3230: .4byte gUnk_02021EE0
thumb_func_start sub_080A3234
sub_080A3234: @ 0x080A3234
push {lr}
ldr r1, _080A3244 @ =gUnk_02021EE0
strh r0, [r1, #8]
strh r0, [r1, #0xa]
ldrh r0, [r1, #0x14]
bl sub_080A353C
pop {pc}
.align 2, 0
_080A3244: .4byte gUnk_02021EE0
thumb_func_start sub_080A3248
sub_080A3248: @ 0x080A3248
push {lr}
ldr r1, _080A3258 @ =gUnk_02021EE0
strh r0, [r1, #0x10]
strh r0, [r1, #0xe]
ldrh r0, [r1, #0x14]
bl sub_080A353C
pop {pc}
.align 2, 0
_080A3258: .4byte gUnk_02021EE0
thumb_func_start sub_080A325C
sub_080A325C: @ 0x080A325C
ldr r1, _080A3264 @ =gUnk_02021EE0
strh r0, [r1, #0x12]
bx lr
.align 2, 0
_080A3264: .4byte gUnk_02021EE0

508
asm/code_080A5574.s
View File

@ -3981,511 +3981,3 @@ sub_080A7528: @ 0x080A7528
.align 2, 0
_080A753C: .4byte gUnk_08129030
_080A7540: .4byte gUnk_02032EC0
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/playerItem/playerItemSword.inc"
thumb_func_start CreateItemEntity
CreateItemEntity: @ 0x080A7C00
push {r4, lr}
bl GiveItemWithCutscene
adds r4, r0, #0
cmp r4, #0
beq _080A7C16
ldrb r1, [r4, #0xa]
movs r2, #0
bl sub_080A276C
str r0, [r4, #0x50]
_080A7C16:
pop {r4, pc}
thumb_func_start sub_080A7C18
sub_080A7C18: @ 0x080A7C18
push {lr}
bl GiveItemWithCutscene
adds r2, r0, #0
cmp r2, #0
beq _080A7C32
ldr r0, _080A7C34 @ =gPlayerEntity
str r0, [r2, #0x50]
ldrb r1, [r2, #0xa]
adds r0, r2, #0
movs r2, #0
bl sub_08078AF0
_080A7C32:
pop {pc}
.align 2, 0
_080A7C34: .4byte gPlayerEntity
thumb_func_start GiveItemWithCutscene
GiveItemWithCutscene: @ 0x080A7C38
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r6, r1, #0
adds r7, r2, #0
cmp r5, #0x3f
bne _080A7C52
ldr r0, _080A7C78 @ =gSave
adds r0, #0xbb
ldrb r0, [r0]
cmp r0, #0
beq _080A7C52
movs r5, #0x57
movs r6, #0
_080A7C52:
bl sub_0805E744
adds r4, r0, #0
cmp r4, #0
beq _080A7C72
strb r5, [r4, #0xa]
strb r6, [r4, #0xb]
strb r7, [r4, #0xe]
movs r0, #0xb
strb r0, [r4, #9]
movs r0, #6
strb r0, [r4, #8]
adds r0, r4, #0
movs r1, #6
bl AppendEntityToList
_080A7C72:
adds r0, r4, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7C78: .4byte gSave
thumb_func_start sub_080A7C7C
sub_080A7C7C: @ 0x080A7C7C
push {lr}
ldr r0, _080A7C88 @ =gUnk_02017660
movs r1, #0x40
bl MemClear
pop {pc}
.align 2, 0
_080A7C88: .4byte gUnk_02017660
thumb_func_start sub_080A7C8C
sub_080A7C8C: @ 0x080A7C8C
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
ldr r4, _080A7C9C @ =gUnk_02017660
movs r2, #0
movs r1, #0
b _080A7CA8
.align 2, 0
_080A7C9C: .4byte gUnk_02017660
_080A7CA0:
adds r1, #1
adds r4, #8
cmp r1, #7
bhi _080A7CB0
_080A7CA8:
ldrh r0, [r4, #4]
cmp r0, r5
bne _080A7CA0
movs r2, #1
_080A7CB0:
lsrs r1, r6, #1
ldrb r0, [r4, #6]
lsls r0, r0, #0x1f
lsrs r0, r0, #0x1f
cmp r1, r0
bne _080A7CF4
cmp r2, #0
beq _080A7CD2
ldrb r0, [r4, #1]
bl SetLocalFlag
ldrb r0, [r4, #2]
ldrb r1, [r4, #3]
movs r2, #0
bl CreateItemEntity
b _080A7CDC
_080A7CD2:
movs r0, #0x60
movs r1, #0
movs r2, #0
bl CreateItemEntity
_080A7CDC:
movs r0, #0x74
adds r1, r5, #0
adds r2, r6, #0
bl sub_0807B7D8
movs r0, #0
movs r1, #0x78
bl sub_0805E4E0
ldr r0, _080A7CF8 @ =0x0000011B
bl SoundReq
_080A7CF4:
pop {r4, r5, r6, pc}
.align 2, 0
_080A7CF8: .4byte 0x0000011B
thumb_func_start sub_080A7CFC
sub_080A7CFC: @ 0x080A7CFC
push {r4, r5, r6, lr}
adds r5, r0, #0
movs r4, #0xc0
lsls r4, r4, #3
movs r6, #0
movs r0, #3
bl GetCurrentRoomProperty
adds r1, r0, #0
cmp r1, #0
beq _080A7D38
_080A7D12:
ldrh r0, [r1, #4]
cmp r0, r5
bne _080A7D30
ldrb r0, [r1]
cmp r0, #5
beq _080A7D24
cmp r0, #6
beq _080A7D2A
b _080A7D38
_080A7D24:
movs r6, #0
ldrh r4, [r1, #6]
b _080A7D38
_080A7D2A:
movs r6, #1
ldrh r4, [r1, #6]
b _080A7D38
_080A7D30:
adds r1, #8
ldrh r0, [r1, #4]
cmp r0, #0
bne _080A7D12
_080A7D38:
adds r0, r4, #0
adds r1, r6, #0
bl sub_080A7D44
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_080A7D44
sub_080A7D44: @ 0x080A7D44
push {lr}
cmp r1, #0
beq _080A7D52
movs r1, #0
bl sub_08078AA8
b _080A7D56
_080A7D52:
bl TextboxNoOverlapFollow
_080A7D56:
pop {pc}
thumb_func_start sub_080A7D58
sub_080A7D58: @ 0x080A7D58
push {lr}
adds r3, r0, #0
ldrb r0, [r3, #9]
lsls r0, r0, #4
ldr r1, _080A7D78 @ =gUnk_0813210C
adds r2, r0, r1
ldrh r1, [r2]
ldr r0, _080A7D7C @ =0x0000FFFF
cmp r1, r0
bne _080A7D74
ldrb r0, [r3, #0xa]
lsls r0, r0, #4
ldr r1, [r2, #4]
adds r2, r1, r0
_080A7D74:
adds r0, r2, #0
pop {pc}
.align 2, 0
_080A7D78: .4byte gUnk_0813210C
_080A7D7C: .4byte 0x0000FFFF
thumb_func_start sub_080A7D80
sub_080A7D80: @ 0x080A7D80
push {r4, r5, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
movs r0, #1
ands r0, r1
cmp r0, #0
bne _080A7E4A
adds r0, r4, #0
bl sub_080A7D58
adds r5, r0, #0
adds r0, r4, #0
adds r1, r5, #0
bl sub_080A7E50
cmp r0, #0
bne _080A7DA6
movs r0, #0
b _080A7E4C
_080A7DA6:
ldrb r1, [r4, #0x10]
movs r0, #1
adds r2, r1, #0
orrs r2, r0
strb r2, [r4, #0x10]
ldrb r1, [r5, #0xa]
movs r0, #8
ands r0, r1
cmp r0, #0
beq _080A7DC0
movs r0, #0x80
orrs r2, r0
strb r2, [r4, #0x10]
_080A7DC0:
ldrh r0, [r5, #8]
lsls r0, r0, #0x14
lsrs r0, r0, #0x14
strh r0, [r4, #0x12]
ldrb r2, [r4, #0x18]
lsls r0, r2, #0x1e
cmp r0, #0
bne _080A7DE0
ldrb r1, [r5, #0xa]
lsls r1, r1, #0x1a
lsrs r1, r1, #0x1e
movs r0, #4
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x18]
_080A7DE0:
ldrb r1, [r5, #0xa]
lsls r1, r1, #0x1d
adds r3, r4, #0
adds r3, #0x29
lsrs r1, r1, #0x1a
ldrb r2, [r3]
movs r0, #0x39
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r3]
ldrb r1, [r5, #0xa]
lsrs r1, r1, #6
lsls r1, r1, #4
ldrb r2, [r4, #0x18]
movs r0, #0x31
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x18]
movs r1, #0x24
ldrsh r0, [r4, r1]
cmp r0, #0
bne _080A7E14
ldrh r0, [r5, #0xc]
strh r0, [r4, #0x24]
_080A7E14:
ldrb r0, [r5, #9]
lsrs r0, r0, #4
lsls r0, r0, #4
movs r1, #7
orrs r0, r1
adds r1, r4, #0
adds r1, #0x3c
strb r0, [r1]
ldrb r0, [r5, #0xf]
subs r1, #1
strb r0, [r1]
ldrb r0, [r5, #0xe]
adds r1, #4
strb r0, [r1]
ldrb r1, [r5, #0xb]
adds r0, r4, #0
adds r0, #0x40
strb r1, [r0]
adds r1, r4, #0
adds r1, #0x45
movs r0, #0xff
strb r0, [r1]
ldr r0, [r5, #4]
str r0, [r4, #0x48]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
_080A7E4A:
movs r0, #1
_080A7E4C:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_080A7E50
sub_080A7E50: @ 0x080A7E50
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldrh r2, [r5]
lsls r1, r2, #0x10
cmp r1, #0
beq _080A7EA2
movs r0, #0x80
lsls r0, r0, #8
ands r0, r2
cmp r0, #0
beq _080A7E78
ldr r0, _080A7E74 @ =0x000003FF
ands r0, r2
adds r1, r4, #0
adds r1, #0x60
strh r0, [r1]
b _080A7EA2
.align 2, 0
_080A7E74: .4byte 0x000003FF
_080A7E78:
movs r0, #0x80
lsls r0, r0, #7
ands r0, r2
cmp r0, #0
beq _080A7E92
lsrs r1, r1, #0x14
lsls r1, r1, #0x18
lsrs r1, r1, #0x18
adds r0, r4, #0
movs r2, #0
bl sub_080AE008
b _080A7E9A
_080A7E92:
ldrh r1, [r5]
adds r0, r4, #0
bl LoadFixedGFX
_080A7E9A:
cmp r0, #0
bne _080A7EA2
movs r0, #0
b _080A7EAC
_080A7EA2:
ldrh r1, [r5, #2]
adds r0, r4, #0
bl sub_0801D040
movs r0, #1
_080A7EAC:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_080A7EB0
sub_080A7EB0: @ 0x080A7EB0
push {lr}
adds r3, r0, #0
movs r1, #0x2e
ldrsh r0, [r3, r1]
ldr r2, _080A7ED8 @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
ldrh r1, [r2, #0x1e]
cmp r0, r1
bhi _080A7ED2
movs r1, #0x32
ldrsh r0, [r3, r1]
ldrh r1, [r2, #8]
subs r0, r0, r1
ldrh r2, [r2, #0x20]
cmp r0, r2
bls _080A7EDC
_080A7ED2:
movs r0, #1
b _080A7EDE
.align 2, 0
_080A7ED8: .4byte gRoomControls
_080A7EDC:
movs r0, #0
_080A7EDE:
pop {pc}
thumb_func_start sub_080A7EE0
sub_080A7EE0: @ 0x080A7EE0
push {r4, r5, lr}
adds r5, r0, #0
bl GetEmptyEntity
adds r4, r0, #0
cmp r4, #0
beq _080A7EFC
movs r0, #4
strb r0, [r4, #8]
strb r5, [r4, #9]
adds r0, r4, #0
movs r1, #5
bl AppendEntityToList
_080A7EFC:
adds r0, r4, #0
pop {r4, r5, pc}
@ TODO convert .inc files into .s files and include them in linker.ld
.include "asm/projectile/projectile0.inc"
.include "asm/projectile/projectile1.inc"
.include "asm/projectile/projectile2.inc"
.include "asm/projectile/projectile3.inc"
.include "asm/projectile/projectile4.inc"
.include "asm/projectile/projectile5.inc"
.include "asm/projectile/projectile6.inc"
.include "asm/projectile/projectile7.inc"
.include "asm/projectile/projectile8.inc"
.include "asm/projectile/projectile9.inc"
.include "asm/projectile/projectileA.inc"
.include "asm/projectile/projectileB.inc"
.include "asm/projectile/projectileC.inc"
.include "asm/projectile/projectileD.inc"
.include "asm/projectile/projectileE.inc"
.include "asm/projectile/projectileF.inc"
.include "asm/projectile/projectile10.inc"
.include "asm/projectile/projectile11.inc"
.include "asm/projectile/projectile12.inc"
.include "asm/projectile/projectile13.inc"
.include "asm/projectile/projectile14.inc"
.include "asm/projectile/projectile15.inc"
.include "asm/projectile/projectile16.inc"
.include "asm/projectile/projectile17.inc"
.include "asm/projectile/projectile18.inc"
.include "asm/projectile/projectile19.inc"
.include "asm/projectile/projectile1A.inc"
.include "asm/projectile/projectile1B.inc"
.include "asm/projectile/projectile1C.inc"
.include "asm/projectile/projectile1D.inc"
.include "asm/projectile/projectile1E.inc"
.include "asm/projectile/projectile1F.inc"
.include "asm/projectile/projectile20.inc"
.include "asm/projectile/projectile21.inc"
.include "asm/projectile/projectile22.inc"
.include "asm/projectile/projectile23.inc"
.include "asm/projectile/projectile24.inc"
.include "asm/playerItem/playerItem10.inc"
.include "asm/playerItem/playerItem13.inc"

430
asm/code_080A7C00.s Normal file
View File

@ -0,0 +1,430 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start CreateItemEntity
CreateItemEntity: @ 0x080A7C00
push {r4, lr}
bl GiveItemWithCutscene
adds r4, r0, #0
cmp r4, #0
beq _080A7C16
ldrb r1, [r4, #0xa]
movs r2, #0
bl sub_080A276C
str r0, [r4, #0x50]
_080A7C16:
pop {r4, pc}
thumb_func_start sub_080A7C18
sub_080A7C18: @ 0x080A7C18
push {lr}
bl GiveItemWithCutscene
adds r2, r0, #0
cmp r2, #0
beq _080A7C32
ldr r0, _080A7C34 @ =gPlayerEntity
str r0, [r2, #0x50]
ldrb r1, [r2, #0xa]
adds r0, r2, #0
movs r2, #0
bl sub_08078AF0
_080A7C32:
pop {pc}
.align 2, 0
_080A7C34: .4byte gPlayerEntity
thumb_func_start GiveItemWithCutscene
GiveItemWithCutscene: @ 0x080A7C38
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r6, r1, #0
adds r7, r2, #0
cmp r5, #0x3f
bne _080A7C52
ldr r0, _080A7C78 @ =gSave
adds r0, #0xbb
ldrb r0, [r0]
cmp r0, #0
beq _080A7C52
movs r5, #0x57
movs r6, #0
_080A7C52:
bl sub_0805E744
adds r4, r0, #0
cmp r4, #0
beq _080A7C72
strb r5, [r4, #0xa]
strb r6, [r4, #0xb]
strb r7, [r4, #0xe]
movs r0, #0xb
strb r0, [r4, #9]
movs r0, #6
strb r0, [r4, #8]
adds r0, r4, #0
movs r1, #6
bl AppendEntityToList
_080A7C72:
adds r0, r4, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7C78: .4byte gSave
thumb_func_start sub_080A7C7C
sub_080A7C7C: @ 0x080A7C7C
push {lr}
ldr r0, _080A7C88 @ =gUnk_02017660
movs r1, #0x40
bl MemClear
pop {pc}
.align 2, 0
_080A7C88: .4byte gUnk_02017660
thumb_func_start sub_080A7C8C
sub_080A7C8C: @ 0x080A7C8C
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
ldr r4, _080A7C9C @ =gUnk_02017660
movs r2, #0
movs r1, #0
b _080A7CA8
.align 2, 0
_080A7C9C: .4byte gUnk_02017660
_080A7CA0:
adds r1, #1
adds r4, #8
cmp r1, #7
bhi _080A7CB0
_080A7CA8:
ldrh r0, [r4, #4]
cmp r0, r5
bne _080A7CA0
movs r2, #1
_080A7CB0:
lsrs r1, r6, #1
ldrb r0, [r4, #6]
lsls r0, r0, #0x1f
lsrs r0, r0, #0x1f
cmp r1, r0
bne _080A7CF4
cmp r2, #0
beq _080A7CD2
ldrb r0, [r4, #1]
bl SetLocalFlag
ldrb r0, [r4, #2]
ldrb r1, [r4, #3]
movs r2, #0
bl CreateItemEntity
b _080A7CDC
_080A7CD2:
movs r0, #0x60
movs r1, #0
movs r2, #0
bl CreateItemEntity
_080A7CDC:
movs r0, #0x74
adds r1, r5, #0
adds r2, r6, #0
bl sub_0807B7D8
movs r0, #0
movs r1, #0x78
bl sub_0805E4E0
ldr r0, _080A7CF8 @ =0x0000011B
bl SoundReq
_080A7CF4:
pop {r4, r5, r6, pc}
.align 2, 0
_080A7CF8: .4byte 0x0000011B
thumb_func_start sub_080A7CFC
sub_080A7CFC: @ 0x080A7CFC
push {r4, r5, r6, lr}
adds r5, r0, #0
movs r4, #0xc0
lsls r4, r4, #3
movs r6, #0
movs r0, #3
bl GetCurrentRoomProperty
adds r1, r0, #0
cmp r1, #0
beq _080A7D38
_080A7D12:
ldrh r0, [r1, #4]
cmp r0, r5
bne _080A7D30
ldrb r0, [r1]
cmp r0, #5
beq _080A7D24
cmp r0, #6
beq _080A7D2A
b _080A7D38
_080A7D24:
movs r6, #0
ldrh r4, [r1, #6]
b _080A7D38
_080A7D2A:
movs r6, #1
ldrh r4, [r1, #6]
b _080A7D38
_080A7D30:
adds r1, #8
ldrh r0, [r1, #4]
cmp r0, #0
bne _080A7D12
_080A7D38:
adds r0, r4, #0
adds r1, r6, #0
bl sub_080A7D44
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_080A7D44
sub_080A7D44: @ 0x080A7D44
push {lr}
cmp r1, #0
beq _080A7D52
movs r1, #0
bl sub_08078AA8
b _080A7D56
_080A7D52:
bl TextboxNoOverlapFollow
_080A7D56:
pop {pc}
thumb_func_start sub_080A7D58
sub_080A7D58: @ 0x080A7D58
push {lr}
adds r3, r0, #0
ldrb r0, [r3, #9]
lsls r0, r0, #4
ldr r1, _080A7D78 @ =gUnk_0813210C
adds r2, r0, r1
ldrh r1, [r2]
ldr r0, _080A7D7C @ =0x0000FFFF
cmp r1, r0
bne _080A7D74
ldrb r0, [r3, #0xa]
lsls r0, r0, #4
ldr r1, [r2, #4]
adds r2, r1, r0
_080A7D74:
adds r0, r2, #0
pop {pc}
.align 2, 0
_080A7D78: .4byte gUnk_0813210C
_080A7D7C: .4byte 0x0000FFFF
thumb_func_start sub_080A7D80
sub_080A7D80: @ 0x080A7D80
push {r4, r5, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
movs r0, #1
ands r0, r1
cmp r0, #0
bne _080A7E4A
adds r0, r4, #0
bl sub_080A7D58
adds r5, r0, #0
adds r0, r4, #0
adds r1, r5, #0
bl sub_080A7E50
cmp r0, #0
bne _080A7DA6
movs r0, #0
b _080A7E4C
_080A7DA6:
ldrb r1, [r4, #0x10]
movs r0, #1
adds r2, r1, #0
orrs r2, r0
strb r2, [r4, #0x10]
ldrb r1, [r5, #0xa]
movs r0, #8
ands r0, r1
cmp r0, #0
beq _080A7DC0
movs r0, #0x80
orrs r2, r0
strb r2, [r4, #0x10]
_080A7DC0:
ldrh r0, [r5, #8]
lsls r0, r0, #0x14
lsrs r0, r0, #0x14
strh r0, [r4, #0x12]
ldrb r2, [r4, #0x18]
lsls r0, r2, #0x1e
cmp r0, #0
bne _080A7DE0
ldrb r1, [r5, #0xa]
lsls r1, r1, #0x1a
lsrs r1, r1, #0x1e
movs r0, #4
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x18]
_080A7DE0:
ldrb r1, [r5, #0xa]
lsls r1, r1, #0x1d
adds r3, r4, #0
adds r3, #0x29
lsrs r1, r1, #0x1a
ldrb r2, [r3]
movs r0, #0x39
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r3]
ldrb r1, [r5, #0xa]
lsrs r1, r1, #6
lsls r1, r1, #4
ldrb r2, [r4, #0x18]
movs r0, #0x31
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x18]
movs r1, #0x24
ldrsh r0, [r4, r1]
cmp r0, #0
bne _080A7E14
ldrh r0, [r5, #0xc]
strh r0, [r4, #0x24]
_080A7E14:
ldrb r0, [r5, #9]
lsrs r0, r0, #4
lsls r0, r0, #4
movs r1, #7
orrs r0, r1
adds r1, r4, #0
adds r1, #0x3c
strb r0, [r1]
ldrb r0, [r5, #0xf]
subs r1, #1
strb r0, [r1]
ldrb r0, [r5, #0xe]
adds r1, #4
strb r0, [r1]
ldrb r1, [r5, #0xb]
adds r0, r4, #0
adds r0, #0x40
strb r1, [r0]
adds r1, r4, #0
adds r1, #0x45
movs r0, #0xff
strb r0, [r1]
ldr r0, [r5, #4]
str r0, [r4, #0x48]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
_080A7E4A:
movs r0, #1
_080A7E4C:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_080A7E50
sub_080A7E50: @ 0x080A7E50
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldrh r2, [r5]
lsls r1, r2, #0x10
cmp r1, #0
beq _080A7EA2
movs r0, #0x80
lsls r0, r0, #8
ands r0, r2
cmp r0, #0
beq _080A7E78
ldr r0, _080A7E74 @ =0x000003FF
ands r0, r2
adds r1, r4, #0
adds r1, #0x60
strh r0, [r1]
b _080A7EA2
.align 2, 0
_080A7E74: .4byte 0x000003FF
_080A7E78:
movs r0, #0x80
lsls r0, r0, #7
ands r0, r2
cmp r0, #0
beq _080A7E92
lsrs r1, r1, #0x14
lsls r1, r1, #0x18
lsrs r1, r1, #0x18
adds r0, r4, #0
movs r2, #0
bl sub_080AE008
b _080A7E9A
_080A7E92:
ldrh r1, [r5]
adds r0, r4, #0
bl LoadFixedGFX
_080A7E9A:
cmp r0, #0
bne _080A7EA2
movs r0, #0
b _080A7EAC
_080A7EA2:
ldrh r1, [r5, #2]
adds r0, r4, #0
bl sub_0801D040
movs r0, #1
_080A7EAC:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_080A7EB0
sub_080A7EB0: @ 0x080A7EB0
push {lr}
adds r3, r0, #0
movs r1, #0x2e
ldrsh r0, [r3, r1]
ldr r2, _080A7ED8 @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
ldrh r1, [r2, #0x1e]
cmp r0, r1
bhi _080A7ED2
movs r1, #0x32
ldrsh r0, [r3, r1]
ldrh r1, [r2, #8]
subs r0, r0, r1
ldrh r2, [r2, #0x20]
cmp r0, r2
bls _080A7EDC
_080A7ED2:
movs r0, #1
b _080A7EDE
.align 2, 0
_080A7ED8: .4byte gRoomControls
_080A7EDC:
movs r0, #0
_080A7EDE:
pop {pc}
thumb_func_start sub_080A7EE0
sub_080A7EE0: @ 0x080A7EE0
push {r4, r5, lr}
adds r5, r0, #0
bl GetEmptyEntity
adds r4, r0, #0
cmp r4, #0
beq _080A7EFC
movs r0, #4
strb r0, [r4, #8]
strb r5, [r4, #9]
adds r0, r4, #0
movs r1, #5
bl AppendEntityToList
_080A7EFC:
adds r0, r4, #0
pop {r4, r5, pc}

2977
asm/code_080AD90C.s
View File

File diff suppressed because it is too large Load Diff

2978
asm/code_080ADD30.s Normal file
View File

File diff suppressed because it is too large Load Diff

12
asm/item/itemBomb.inc → asm/item/itemBomb.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemBomb
ItemBomb: @ 0x08075FE0
push {lr}
@ -26,7 +34,7 @@ sub_08075FF8: @ 0x08075FF8
movs r0, #8
movs r1, #2
movs r2, #2
bl FindEntityInListBySubtype
bl FindEntityByID
b _08076026
.align 2, 0
_08076018: .4byte gPlayerState
@ -34,7 +42,7 @@ _0807601C:
adds r5, #1
adds r0, r4, #0
movs r1, #2
bl FindNextEntityOfSameSubtype
bl FindNextDuplicateID
_08076026:
adds r4, r0, #0
cmp r4, #0

8
asm/item/itemBoomerang.inc → asm/item/itemBoomerang.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemBoomerang
ItemBoomerang: @ 0x08075D14
push {lr}

8
asm/item/itemBow.inc → asm/item/itemBow.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemBow
ItemBow: @ 0x08075DDC
push {lr}

8
asm/item/itemDebug.inc → asm/item/itemDebug.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemDebug
ItemDebug: @ 0x08075300
push {r4, r5, lr}

8
asm/item/itemGustJar.inc → asm/item/itemGustJar.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08076DF4
sub_08076DF4: @ 0x08076DF4
push {r4, r5, r6, r7, lr}

8
asm/item/itemJarEmpty.inc → asm/item/itemJarEmpty.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemJarEmpty
ItemJarEmpty: @ 0x0807751C
push {lr}

8
asm/item/itemLantern.inc → asm/item/itemLantern.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemLantern
ItemLantern: @ 0x080759F4
push {lr}

8
asm/item/itemMoleMitts.inc → asm/item/itemMoleMitts.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemMoleMitts
ItemMoleMitts: @ 0x08077118
push {lr}

8
asm/item/itemPegasusBoots.inc → asm/item/itemPegasusBoots.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemPegasusBoots
ItemPegasusBoots: @ 0x08076800

8
asm/item/itemRocsCape.inc → asm/item/itemRocsCape.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemRocsCape
ItemRocsCape: @ 0x08076640
push {r4, r5, lr}

10
asm/item/itemSword.inc → asm/item/itemSword.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemSword
ItemSword: @ 0x08075314
push {lr}
@ -248,7 +256,7 @@ _080754F2:
movs r0, #8
movs r1, #0xf
movs r2, #2
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
bne _08075538
adds r0, r4, #0

8
asm/item/itemTryPickupObject.inc → asm/item/itemTryPickupObject.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ItemTryPickupObject
ItemTryPickupObject: @ 0x080761A8
push {lr}

26
asm/npc/cat.s Normal file
View File

@ -0,0 +1,26 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08067790
sub_08067790: @ 0x08067790
push {lr}
ldrb r2, [r0, #0xa]
lsls r1, r2, #2
adds r1, r1, r2
lsls r1, r1, #4
ldr r2, _080677AC @ =gSave
ldrb r2, [r2, #8]
lsls r2, r2, #3
ldr r3, _080677B0 @ =gUnk_08110EF8
adds r2, r2, r3
adds r1, r1, r2
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_080677AC: .4byte gSave
_080677B0: .4byte gUnk_08110EF8

7
asm/playerItem/playerItem10.inc → asm/playerItem/playerItem10.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItem10
PlayerItem10: @ 0x080ACBCC
push {r4, lr}

8
asm/playerItem/playerItem12.inc → asm/playerItem/playerItem12.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItem12
PlayerItem12: @ 0x080700E8
push {lr}

7
asm/playerItem/playerItem13.inc → asm/playerItem/playerItem13.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItem13
PlayerItem13: @ 0x080ACF14
push {lr}

7
asm/playerItem/playerItem15.inc → asm/playerItem/playerItem15.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItem15
PlayerItem15: @ 0x080A306C
push {lr}

8
asm/playerItem/playerItem3.inc → asm/playerItem/playerItem3.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItem3

8
asm/playerItem/playerItemBomb.inc → asm/playerItem/playerItemBomb.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemBomb
PlayerItemBomb: @ 0x0801B188
push {r4, lr}

62
asm/playerItem/playerItemBow.s
View File

@ -544,3 +544,65 @@ _08019402:
_08019404: .4byte gSave
_08019408: .4byte gPlayerEntity
_0801940C: .4byte gPlayerState
thumb_func_start sub_08019410
sub_08019410: @ 0x08019410
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xe]
cmp r0, #0xe
bhi _08019428
adds r0, r4, #0
adds r0, #0x58
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
b _0801942E
_08019428:
adds r0, r4, #0
bl GetNextFrame
_0801942E:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0xff
bne _08019440
bl DeleteThisEntity
_08019440:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08019444
sub_08019444: @ 0x08019444
push {r4, lr}
adds r4, r0, #0
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
movs r1, #0x80
lsls r1, r1, #6
adds r0, r4, #0
bl sub_08003FC4
cmp r0, #0
bne _08019464
bl DeleteThisEntity
_08019464:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08019468
sub_08019468: @ 0x08019468
push {lr}
adds r1, r0, #0
adds r0, #0x40
ldrb r0, [r0]
cmp r0, #0xe
bne _0801947E
adds r0, r1, #0
movs r1, #0x50
movs r2, #0
bl CreateFx
_0801947E:
pop {pc}

8
asm/playerItem/playerItemC.inc → asm/playerItem/playerItemC.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemC
PlayerItemC: @ 0x0801B898
push {lr}

7
asm/playerItem/playerItemGustJar.inc → asm/playerItem/playerItemGustJar.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemGustJar
PlayerItemGustJar: @ 0x080ADA30
push {r4, lr}

8
asm/playerItem/playerItemLantern.inc → asm/playerItem/playerItemLantern.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemLantern
PlayerItemLantern: @ 0x08054A40

8
asm/playerItem/playerItemPacciCane.inc → asm/playerItem/playerItemPacciCane.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemPacciCane
PlayerItemPacciCane: @ 0x080704BC
push {lr}

7
asm/playerItem/playerItemShield.inc → asm/playerItem/playerItemShield.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemShield
PlayerItemShield: @ 0x080A2D74
push {lr}

7
asm/playerItem/playerItemSword.inc → asm/playerItem/playerItemSword.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemSword
PlayerItemSword: @ 0x080A7544
push {r4, lr}

8
asm/playerItem/playerItemSwordBeam.inc → asm/playerItem/playerItemSwordBeam.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemSwordBeam
PlayerItemSwordBeam: @ 0x08019480
push {lr}

8
asm/playerItem/playerItemSwordSpin.inc → asm/playerItem/playerItemSwordSpin.s
View File

@ -1,3 +1,11 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start PlayerItemSwordSpin
PlayerItemSwordSpin: @ 0x0801BA00
push {lr}

0
asm/projectile/mv Normal file
View File

7
asm/projectile/projectile0.inc → asm/projectile/projectile0.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile0
Projectile0: @ 0x080A7F00
push {r4, lr}

7
asm/projectile/projectile1.inc → asm/projectile/projectile1.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile1
Projectile1: @ 0x080A8030
push {r4, r5, lr}

7
asm/projectile/projectile10.inc → asm/projectile/projectile10.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile10
Projectile10: @ 0x080A9A00
push {r4, r5, lr}

7
asm/projectile/projectile11.inc → asm/projectile/projectile11.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile11
Projectile11: @ 0x080A9CA8
push {r4, r5, lr}

7
asm/projectile/projectile12.inc → asm/projectile/projectile12.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile12
Projectile12: @ 0x080A9DA4
push {r4, r5, lr}

7
asm/projectile/projectile13.inc → asm/projectile/projectile13.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile13
Projectile13: @ 0x080A9E54
push {r4, r5, lr}

7
asm/projectile/projectile14.inc → asm/projectile/projectile14.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile14
Projectile14: @ 0x080AA400
push {r4, r5, lr}

7
asm/projectile/projectile15.inc → asm/projectile/projectile15.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile15
Projectile15: @ 0x080AA68C
push {r4, r5, lr}

7
asm/projectile/projectile16.inc → asm/projectile/projectile16.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile16
Projectile16: @ 0x080AAAE8
push {r4, r5, lr}

7
asm/projectile/projectile17.inc → asm/projectile/projectile17.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile17
Projectile17: @ 0x080AAB8C
push {r4, lr}

7
asm/projectile/projectile18.inc → asm/projectile/projectile18.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile18
Projectile18: @ 0x080AABF0

7
asm/projectile/projectile19.inc → asm/projectile/projectile19.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile19
Projectile19: @ 0x080AB05C
push {lr}

7
asm/projectile/projectile1A.inc → asm/projectile/projectile1A.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile1A
Projectile1A: @ 0x080AB2A8
push {r4, r5, lr}

7
asm/projectile/projectile1B.inc → asm/projectile/projectile1B.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile1B
Projectile1B: @ 0x080AB510
push {r4, r5, lr}

7
asm/projectile/projectile1C.inc → asm/projectile/projectile1C.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile1C
Projectile1C: @ 0x080AB690
push {r4, lr}

7
asm/projectile/projectile1D.inc → asm/projectile/projectile1D.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile1D
Projectile1D: @ 0x080AB8C8
push {r4, lr}

7
asm/projectile/projectile1E.inc → asm/projectile/projectile1E.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile1E
Projectile1E: @ 0x080ABA5C
push {lr}

7
asm/projectile/projectile1F.inc → asm/projectile/projectile1F.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile1F
Projectile1F: @ 0x080ABB8C
push {r4, r5, lr}

7
asm/projectile/projectile2.inc → asm/projectile/projectile2.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile2
Projectile2: @ 0x080A8190
push {r4, r5, lr}

7
asm/projectile/projectile20.inc → asm/projectile/projectile20.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile20
Projectile20: @ 0x080ABF24
push {r4, r5, lr}

7
asm/projectile/projectile21.inc → asm/projectile/projectile21.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile21
Projectile21: @ 0x080ABFB0
push {r4, r5, lr}

7
asm/projectile/projectile22.inc → asm/projectile/projectile22.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile22
Projectile22: @ 0x080AC274
push {r4, r5, lr}

7
asm/projectile/projectile23.inc → asm/projectile/projectile23.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile23
Projectile23: @ 0x080AC8A8
push {r4, r5, lr}

7
asm/projectile/projectile24.inc → asm/projectile/projectile24.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile24
Projectile24: @ 0x080ACA34
push {r4, r5, lr}

7
asm/projectile/projectile3.inc → asm/projectile/projectile3.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile3
Projectile3: @ 0x080A82F8
push {r4, r5, lr}

7
asm/projectile/projectile4.inc → asm/projectile/projectile4.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile4
Projectile4: @ 0x080A843C
push {r4, r5, lr}

7
asm/projectile/projectile5.inc → asm/projectile/projectile5.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile5
Projectile5: @ 0x080A86BC
push {r4, r5, lr}

7
asm/projectile/projectile6.inc → asm/projectile/projectile6.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile6
Projectile6: @ 0x080A87C8
push {r4, r5, lr}

7
asm/projectile/projectile7.inc → asm/projectile/projectile7.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile7
Projectile7: @ 0x080A8A68
push {r4, lr}

7
asm/projectile/projectile8.inc → asm/projectile/projectile8.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile8
Projectile8: @ 0x080A8B98
push {r4, lr}

7
asm/projectile/projectile9.inc → asm/projectile/projectile9.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Projectile9
Projectile9: @ 0x080A8CAC
push {r4, lr}

7
asm/projectile/projectileA.inc → asm/projectile/projectileA.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ProjectileA
ProjectileA: @ 0x080A8DC0
push {r4, r5, lr}

7
asm/projectile/projectileB.inc → asm/projectile/projectileB.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ProjectileB
ProjectileB: @ 0x080A9158
push {r4, r5, lr}

7
asm/projectile/projectileC.inc → asm/projectile/projectileC.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ProjectileC
ProjectileC: @ 0x080A91E0
push {r4, r5, lr}

7
asm/projectile/projectileD.inc → asm/projectile/projectileD.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ProjectileD
ProjectileD: @ 0x080A9300
push {r4, r5, lr}

7
asm/projectile/projectileE.inc → asm/projectile/projectileE.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ProjectileE
ProjectileE: @ 0x080A9500
push {lr}

7
asm/projectile/projectileF.inc → asm/projectile/projectileF.s
View File

@ -1,3 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ProjectileF
ProjectileF: @ 0x080A95DC
push {r4, r5, lr}

36
asm/sub_08019410.s
View File

@ -1,36 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08019410
sub_08019410: @ 0x08019410
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xe]
cmp r0, #0xe
bhi _08019428
adds r0, r4, #0
adds r0, #0x58
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
b _0801942E
_08019428:
adds r0, r4, #0
bl GetNextFrame
_0801942E:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0xff
bne _08019440
bl DeleteThisEntity
_08019440:
pop {r4, pc}
.align 2, 0

6
data/animations/enemy/acroBandits.inc → data/animations/enemy/acroBandits.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ .align 2
gUnk_080CE60E:: @ 080CE60E
.incbin "baserom.gba", 0x0CE60E, 0x0000018

6
data/animations/enemy/armos.inc → data/animations/enemy/armos.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CE164:: @ 080CE164
.incbin "baserom.gba", 0x0CE164, 0x0000008

6
data/animations/enemy/ballChainSoldier.inc → data/animations/enemy/ballChainSoldier.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D0744:: @ 080D0744
.incbin "baserom.gba", 0x0D0744, 0x0000004

6
data/animations/enemy/bombarossa.inc → data/animations/enemy/bombarossa.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CEB60:: @ 080CEB60
.incbin "baserom.gba", 0x0CEB60, 0x000000C

6
data/animations/enemy/bowMoblin.inc → data/animations/enemy/bowMoblin.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CFFCC:: @ 080CFFCC
.incbin "baserom.gba", 0x0CFFCC, 0x0000009

6
data/animations/enemy/cloudPiranha.inc → data/animations/enemy/cloudPiranha.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CF530:: @ 080CF530
.incbin "baserom.gba", 0x0CF530, 0x000000D

6
data/animations/enemy/crow.inc → data/animations/enemy/crow.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CE9B0:: @ 080CE9B0
.incbin "baserom.gba", 0x0CE9B0, 0x0000005

6
data/animations/enemy/cuccoAggr.inc → data/animations/enemy/cuccoAggr.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ .align 2
gUnk_080CF831:: @ 080CF831
.incbin "baserom.gba", 0x0CF831, 0x0000005

6
data/animations/enemy/curtain.inc → data/animations/enemy/curtain.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1CF0:: @ 080D1CF0
.incbin "baserom.gba", 0x0D1CF0, 0x0000009

6
data/animations/enemy/enemy5A.inc → data/animations/enemy/enemy5A.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D18C4:: @ 080D18C4
.incbin "baserom.gba", 0x0D18C4, 0x0000005

6
data/animations/enemy/enemy5F.inc → data/animations/enemy/enemy5F.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1DA0:: @ 080D1DA0
.incbin "baserom.gba", 0x0D1DA0, 0x0000028

6
data/animations/enemy/enemy62.inc → data/animations/enemy/enemy62.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D2368:: @ 080D2368
.incbin "baserom.gba", 0x0D2368, 0x0000011

6
data/animations/enemy/eyegore.inc → data/animations/enemy/eyegore.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CE30C:: @ 080CE30C
.incbin "baserom.gba", 0x0CE30C, 0x0000010

6
data/animations/enemy/fireballGuy.inc → data/animations/enemy/fireballGuy.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1818:: @ 080D1818
.incbin "baserom.gba", 0x0D1818, 0x0000004

6
data/animations/enemy/flyingSkull.inc → data/animations/enemy/flyingSkull.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CFBE8:: @ 080CFBE8
.incbin "baserom.gba", 0x0CFBE8, 0x0000024

6
data/animations/enemy/ghini.inc → data/animations/enemy/ghini.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D0988:: @ 080D0988
.incbin "baserom.gba", 0x0D0988, 0x000001C

6
data/animations/enemy/gibdo.inc → data/animations/enemy/gibdo.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CF2D0:: @ 080CF2D0
.incbin "baserom.gba", 0x0CF2D0, 0x0000004

6
data/animations/enemy/gleerok.inc → data/animations/enemy/gleerok.s
View File

@ -1,3 +1,9 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ .align 2
gUnk_080CD8A3:: @ 080CD8A3

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