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

Merge branch 'master' of https://github.com/zeldaret/tmc

Browse Source
This commit is contained in:
21aslade
2020-06-19 13:34:22 -06:00
parent a27bcf72c6 cae2706938
commit d13da4af82
337 changed files with 54674 additions and 48556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+1 -1
View File
@@ -183,7 +183,7 @@ typedef struct Entity
EntityType entityType;
u8 action;
u8 previousActionFlag;
u8 parameter3;
u8 actionDelay;
u8 field_0xf;
u8 flags;
Makefile
+2 -2
View File
@@ -169,7 +169,7 @@ endif
$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
$(PREPROC) $(C_BUILDDIR)/$*.i | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
@echo -e "\t.text\n\t.align\t2, 0 @ Don't pad with nop\n" >> $(C_BUILDDIR)/$*.s
$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
@@ -189,7 +189,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I . $(DATA_ASM_SUBDIR)/
endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
$(PREPROC) $< | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(AS) $(ASFLAGS) -o $@
$(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef -Wno-unicode - | $(AS) $(ASFLAGS) -o $@
$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
$(AS) $(ASFLAGS) -I sound -o $@ $<
asm/acroBandits.s
+11 -11
View File
@@ -403,7 +403,7 @@ _08031B44:
sub_08031B48: @ 0x08031B48
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r2, r4, #0
adds r2, #0x5a
ldrb r1, [r2]
@@ -493,7 +493,7 @@ _08031BDA:
strb r0, [r4, #0xe]
_08031BFA:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
cmp r0, #0
bne _08031C1A
@@ -513,7 +513,7 @@ _08031C1A:
sub_08031C1C: @ 0x08031C1C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -547,7 +547,7 @@ sub_08031C58: @ 0x08031C58
mov r6, r8
push {r6, r7}
adds r7, r0, #0
bl sub_08004274
bl GetNextFrame
adds r3, r7, #0
adds r3, #0x5a
ldrb r1, [r3]
@@ -676,7 +676,7 @@ _08031D66:
sub_08031D70: @ 0x08031D70
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -743,7 +743,7 @@ sub_08031DC4: @ 0x08031DC4
b _08031E00
_08031DE8:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r1, [r5]
movs r0, #0xf
ands r0, r1
@@ -914,7 +914,7 @@ _08031F1E:
cmp r0, #1
bne _08031F2E
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08031F2E:
ldr r0, [r4, #0x20]
cmp r0, #0
@@ -987,7 +987,7 @@ _08031FAC: .4byte gUnk_080CE5F0
sub_08031FB0: @ 0x08031FB0
push {r4, r5, lr}
adds r5, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r5, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -1180,7 +1180,7 @@ _0803210E:
strb r7, [r6]
_0803213E:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08032144:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -1296,7 +1296,7 @@ _08032202:
sub_08032204: @ 0x08032204
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r2, r4, #0
adds r2, #0x5a
ldrb r1, [r2]
@@ -1353,7 +1353,7 @@ sub_08032248: @ 0x08032248
b _0803228E
_08032276:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r1, [r5]
movs r0, #0xf
ands r0, r1
asm/anju.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0806C2C4
sub_0806C2C4: @ 0x0806C2C4
thumb_func_start Anju
Anju: @ 0x0806C2C4
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -94,8 +94,8 @@ sub_0806C354: @ 0x0806C354
bl sub_08078784
pop {r4, pc}
thumb_func_start sub_0806C36C
sub_0806C36C: @ 0x0806C36C
thumb_func_start Anju_Fusion
Anju_Fusion: @ 0x0806C36C
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/armos.s
+4 -4
View File
@@ -108,7 +108,7 @@ sub_08030240: @ 0x08030240
cmp r0, #0
bne _08030260
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08030260:
adds r0, r4, #0
bl sub_08001242
@@ -364,7 +364,7 @@ sub_08030430: @ 0x08030430
cmp r1, r0
ble _0803044A
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0803044A:
adds r0, r4, #0
bl sub_080309A8
@@ -1013,7 +1013,7 @@ _0803088E:
orrs r0, r1
strb r0, [r2]
ldr r0, [r5, #0x7c]
bl sub_08080840
bl DoExitTransition
ldr r0, _08030938 @ =gUnk_030010A0
adds r1, r5, #0
adds r1, #0x80
@@ -1088,7 +1088,7 @@ _0803099E:
sub_080309A8: @ 0x080309A8
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x84
ldr r0, [r0]
asm/bakerOven.s
+1 -1
View File
@@ -107,7 +107,7 @@ sub_0809CD0C: @ 0x0809CD0C
cmp r0, #0
beq _0809CDAC
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r1, r4, #0
adds r1, #0x5a
ldrb r2, [r1]
asm/beanstalk.s
+3 -3
View File
@@ -424,7 +424,7 @@ _0808A00E:
sub_0808A010: @ 0x0808A010
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -522,7 +522,7 @@ sub_0808A0C0: @ 0x0808A0C0
cmp r0, #0
bne _0808A0D6
adds r0, r2, #0
bl sub_08004274
bl GetNextFrame
_0808A0D6:
pop {pc}
@@ -666,7 +666,7 @@ _0808A1DC:
strb r0, [r5, #0xe]
_0808A1DE:
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
adds r0, r5, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/beedle.s
+8 -8
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_080632A8
sub_080632A8: @ 0x080632A8
thumb_func_start Beedle
Beedle: @ 0x080632A8
push {lr}
adds r2, r0, #0
ldrb r1, [r2, #0x10]
@@ -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
@@ -136,7 +136,7 @@ _0806338C: .4byte gTextBox
sub_08063390: @ 0x08063390
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -174,8 +174,8 @@ sub_080633C8: @ 0x080633C8
_080633DE:
pop {r4, pc}
thumb_func_start sub_080633E0
sub_080633E0: @ 0x080633E0
thumb_func_start Beedle_Head
Beedle_Head: @ 0x080633E0
push {r4, lr}
adds r4, r0, #0
adds r0, #0x5a
@@ -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]
@@ -235,7 +235,7 @@ _0806344E:
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08063462:
pop {r4, r5, pc}
.align 2, 0
asm/beetle.s
+9 -9
View File
@@ -73,7 +73,7 @@ _080217A8:
strb r0, [r2]
ldr r0, _080217EC @ =gLinkEntity
adds r1, r4, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
ldr r0, _080217F0 @ =0x0000FFFF
strh r0, [r4, #0x36]
adds r1, r4, #0
@@ -251,7 +251,7 @@ sub_080218CC: @ 0x080218CC
str r0, [r5, #0x20]
_08021916:
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
adds r2, r5, #0
adds r2, #0x5a
ldrb r1, [r2]
@@ -375,7 +375,7 @@ _08021A0C: .4byte 0x0000012D
sub_08021A10: @ 0x08021A10
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldr r1, _08021A60 @ =gLinkEntity
adds r0, r4, #0
movs r2, #0x78
@@ -463,7 +463,7 @@ _08021AC8:
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08021AD4:
pop {r4, r5, pc}
.align 2, 0
@@ -472,7 +472,7 @@ _08021AD4:
sub_08021AD8: @ 0x08021AD8
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -639,7 +639,7 @@ _08021C04:
strb r0, [r1]
ldr r0, _08021C50 @ =gLinkEntity
adds r1, r4, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
ldr r2, _08021C54 @ =gUnk_080CB5E4
ldrb r1, [r4, #0xf]
adds r0, r1, #1
@@ -658,7 +658,7 @@ _08021C04:
subs r0, #1
strh r0, [r4, #0x36]
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08021C4E:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -669,7 +669,7 @@ _08021C54: .4byte gUnk_080CB5E4
sub_08021C58: @ 0x08021C58
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -737,7 +737,7 @@ sub_08021CD0: @ 0x08021CD0
cmp r0, #0
bne _08021CE6
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08021CE6:
adds r0, r4, #0
movs r1, #1
asm/bigGoron.s
+1 -1
View File
@@ -630,7 +630,7 @@ sub_0806D4C0: @ 0x0806D4C0
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
adds r0, r4, #0
movs r1, #2
bl sub_0805E3A0
asm/bigIceBlock.s
+2 -2
View File
@@ -754,7 +754,7 @@ _08099D40:
bl InitializeAnimation
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
ldrh r0, [r4, #0x32]
adds r0, #1
strh r0, [r4, #0x32]
@@ -793,7 +793,7 @@ _08099D6A:
strb r0, [r1]
_08099DA2:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _08099DB4
_08099DAA:
ldrb r1, [r4, #0x18]
asm/bigPushableLever.s
+1 -1
View File
@@ -98,7 +98,7 @@ _08098F8C: .4byte gLinkEntity
sub_08098F90: @ 0x08098F90
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/bigVortex.s
+1 -1
View File
@@ -143,7 +143,7 @@ sub_08098DC4: @ 0x08098DC4
strb r4, [r0]
adds r0, r5, #0
adds r1, r6, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
ldr r1, _08098E30 @ =gLinkState
movs r0, #0x1f
strb r0, [r1, #0xc]
asm/bird.s
+3 -3
View File
@@ -94,7 +94,7 @@ sub_0809CF54: @ 0x0809CF54
bl PositionRelative
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_0809CFD8:
pop {r4, r5, pc}
.align 2, 0
@@ -365,7 +365,7 @@ _0809D19C:
b _0809D1EE
_0809D1E8:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0809D1EE:
pop {r4, pc}
@@ -879,7 +879,7 @@ _0809D5E6:
cmp r4, #0
beq _0809D62E
ldr r1, _0809D668 @ =gUnk_0800B0AC
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
asm/bobomb.s
+7 -7
View File
@@ -213,7 +213,7 @@ _0802C7F6:
cmp r0, #0
beq _0802C816
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0802C816:
pop {r4, pc}
.align 2, 0
@@ -373,7 +373,7 @@ sub_0802C8D8: @ 0x0802C8D8
sub_0802C91C: @ 0x0802C91C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
@@ -488,7 +488,7 @@ sub_0802C9D0: @ 0x0802C9D0
adds r0, r4, #0
bl InitializeAnimation
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
thumb_func_start sub_0802CA10
@@ -514,7 +514,7 @@ _0802CA34:
adds r0, r4, #0
bl sub_0802CC18
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0802CA66
_0802CA42:
adds r1, r4, #0
@@ -532,7 +532,7 @@ _0802CA42:
adds r0, r4, #0
bl sub_0802CC18
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0802CA66:
pop {r4, pc}
.align 2, 0
@@ -555,7 +555,7 @@ _0802CA84:
adds r0, r4, #0
bl sub_0802CC18
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0802CA90:
pop {r4, pc}
.align 2, 0
@@ -662,7 +662,7 @@ _0802CB30:
strb r0, [r1]
_0802CB5C:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0802CB62:
pop {r4, pc}
asm/bollard.s
+2 -2
View File
@@ -86,7 +86,7 @@ _0808B320: .4byte 0x000001A5
sub_0808B324: @ 0x0808B324
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -140,7 +140,7 @@ _0808B388: .4byte 0x000001A5
sub_0808B38C: @ 0x0808B38C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/bombPeahat.s
+9 -173
View File
@@ -6,170 +6,6 @@
.text
thumb_func_start BombPeahat
BombPeahat: @ 0x0802A804
push {r4, r5, lr}
adds r5, r0, #0
ldrb r0, [r5, #0xa]
cmp r0, #2
bne _0802A830
adds r0, r5, #0
bl sub_080012DC
adds r1, r0, #0
cmp r1, #0
beq _0802A830
ldr r0, _0802A82C @ =gUnk_080012C8
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r5, #0
bl _call_via_r1
b _0802A844
.align 2, 0
_0802A82C: .4byte gUnk_080012C8
_0802A830:
ldr r4, _0802A848 @ =gUnk_080CD0F0
adds r0, r5, #0
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
adds r0, r5, #0
bl _call_via_r1
_0802A844:
pop {r4, r5, pc}
.align 2, 0
_0802A848: .4byte gUnk_080CD0F0
thumb_func_start sub_0802A84C
sub_0802A84C: @ 0x0802A84C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
cmp r0, #2
beq _0802A878
cmp r0, #3
beq _0802A894
ldr r0, _0802A874 @ =gUnk_080CD108
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_0802AD54
b _0802A8A4
.align 2, 0
_0802A874: .4byte gUnk_080CD108
_0802A878:
ldr r0, _0802A890 @ =gUnk_080CD120
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_0802B048
b _0802A8A4
.align 2, 0
_0802A890: .4byte gUnk_080CD120
_0802A894:
ldr r0, _0802A8A8 @ =gUnk_080CD134
ldrb r1, [r4, #0xc]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r4, #0
bl _call_via_r1
_0802A8A4:
pop {r4, pc}
.align 2, 0
_0802A8A8: .4byte gUnk_080CD134
thumb_func_start sub_0802A8AC
sub_0802A8AC: @ 0x0802A8AC
push {lr}
adds r1, r0, #0
adds r2, r1, #0
adds r2, #0x81
movs r0, #0
strb r0, [r2]
ldrb r0, [r1, #0xa]
cmp r0, #1
bhi _0802A8C6
adds r0, r1, #0
movs r1, #0
bl InitializeAnimation
_0802A8C6:
pop {pc}
thumb_func_start sub_0802A8C8
sub_0802A8C8: @ 0x0802A8C8
push {lr}
ldr r2, _0802A8DC @ =gUnk_080CD140
ldrb r1, [r0, #0xd]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0802A8DC: .4byte gUnk_080CD140
thumb_func_start sub_0802A8E0
sub_0802A8E0: @ 0x0802A8E0
movs r1, #1
strb r1, [r0, #0xd]
movs r1, #0x3c
strb r1, [r0, #0x1d]
bx lr
.align 2, 0
thumb_func_start sub_0802A8EC
sub_0802A8EC: @ 0x0802A8EC
push {lr}
bl sub_0806F4E8
pop {pc}
thumb_func_start sub_0802A8F4
sub_0802A8F4: @ 0x0802A8F4
push {lr}
bl sub_0806F3E4
pop {pc}
thumb_func_start sub_0802A8FC
sub_0802A8FC: @ 0x0802A8FC
push {lr}
adds r2, r0, #0
ldr r0, _0802A914 @ =gLinkState
ldrb r0, [r0, #0x1c]
movs r1, #0xf
ands r1, r0
cmp r1, #0
bne _0802A912
adds r0, r2, #0
adds r0, #0x45
strb r1, [r0]
_0802A912:
pop {pc}
.align 2, 0
_0802A914: .4byte gLinkState
thumb_func_start nullsub_143
nullsub_143: @ 0x0802A918
bx lr
.align 2, 0
thumb_func_start sub_0802A91C
sub_0802A91C: @ 0x0802A91C
adds r0, #0x45
movs r1, #0
strb r1, [r0]
bx lr
thumb_func_start sub_0802A924
sub_0802A924: @ 0x0802A924
push {r4, r5, r6, r7, lr}
@@ -588,7 +424,7 @@ sub_0802AC08: @ 0x0802AC08
bl sub_0802ADDC
_0802AC36:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
.align 2, 0
@@ -596,7 +432,7 @@ _0802AC36:
sub_0802AC40: @ 0x0802AC40
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
adds r5, r4, #0
@@ -950,7 +786,7 @@ _0802AED0: .4byte gUnk_080CD158
sub_0802AED4: @ 0x0802AED4
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r5, r4, #0
adds r5, #0x81
ldrb r0, [r5]
@@ -1008,20 +844,20 @@ sub_0802AF28: @ 0x0802AF28
orrs r0, r1
strb r0, [r2]
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
thumb_func_start sub_0802AF50
sub_0802AF50: @ 0x0802AF50
push {lr}
bl sub_08004274
bl GetNextFrame
pop {pc}
thumb_func_start sub_0802AF58
sub_0802AF58: @ 0x0802AF58
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r4, #0x29
ldrb r1, [r4]
movs r0, #0x39
@@ -1048,7 +884,7 @@ sub_0802AF74: @ 0x0802AF74
strb r0, [r2, #0xe]
_0802AF8A:
adds r0, r2, #0
bl sub_08004274
bl GetNextFrame
pop {pc}
.align 2, 0
@@ -1062,7 +898,7 @@ sub_0802AF94: @ 0x0802AF94
sub_0802AF9C: @ 0x0802AF9C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -1478,6 +1314,6 @@ _0802B294:
strb r0, [r2]
_0802B2A2:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
.align 2, 0
asm/bombarossa.s
+1 -1
View File
@@ -67,7 +67,7 @@ _0803340E:
asrs r0, r0, #0x18
strh r0, [r4, #0x36]
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _08033440
asm/book.s
+1 -1
View File
@@ -274,7 +274,7 @@ sub_0809B56C: @ 0x0809B56C
cmp r1, #0
beq _0809B5B0
adds r0, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_0809B5B0:
pop {r4, pc}
.align 2, 0
asm/bossDoor.s
+1 -1
View File
@@ -206,7 +206,7 @@ sub_0808C348: @ 0x0808C348
bl PlaySFX
_0808C36A:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0808C382
.align 2, 0
_0808C374: .4byte gUnk_030010A0
asm/bowMoblin.s
+1 -1
View File
@@ -747,7 +747,7 @@ _0803C6EA:
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
thumb_func_start sub_0803C6F8
asm/bowUse.s
+1 -1
View File
@@ -25,7 +25,7 @@ _08019188:
bl DeleteThisEntity
_0801919C:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldr r0, [r4, #0x74]
cmp r0, #0x17
bhi _080191BA
asm/brocco.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08063524
sub_08063524: @ 0x08063524
thumb_func_start Brocco
Brocco: @ 0x08063524
push {lr}
adds r2, r0, #0
ldrb r1, [r2, #0x10]
@@ -257,8 +257,8 @@ sub_080636F4: @ 0x080636F4
bl sub_08078784
pop {r4, pc}
thumb_func_start sub_0806370C
sub_0806370C: @ 0x0806370C
thumb_func_start Brocco_Fusion
Brocco_Fusion: @ 0x0806370C
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/businessScrub.s
+6 -6
View File
@@ -200,7 +200,7 @@ _08028A72:
sub_08028A74: @ 0x08028A74
push {r4, r5, r6, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xd]
cmp r0, #4
bls _08028A84
@@ -451,7 +451,7 @@ _08028C66:
bl sub_0802925C
_08028C76:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0800445C
pop {r4, pc}
@@ -498,7 +498,7 @@ _08028CC8:
bl sub_080290E0
_08028CD2:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0800445C
adds r0, r4, #0
@@ -664,7 +664,7 @@ _08028E0C:
adds r0, r4, #0
bl sub_0800445C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08028E3A:
pop {r4, pc}
.align 2, 0
@@ -699,7 +699,7 @@ _08028E72:
adds r0, r4, #0
bl sub_0800445C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, r5, pc}
.align 2, 0
_08028E80: .4byte gTextBox
@@ -1275,7 +1275,7 @@ sub_08029270: @ 0x08029270
b _0802929C
_08029296:
adds r0, r2, #0
bl sub_08004274
bl GetNextFrame
_0802929C:
pop {pc}
.align 2, 0
asm/businessScrubPrologue.s
+4 -4
View File
@@ -144,7 +144,7 @@ sub_08045C3C: @ 0x08045C3C
bl sub_08095C48
ldr r1, _08045CA0 @ =gUnk_08015AC4
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r0, r4, #0
bl sub_0807DD50
pop {r4, pc}
@@ -191,7 +191,7 @@ nullsub_24: @ 0x08045CDC
sub_08045CE0: @ 0x08045CE0
push {r4, r5, r6, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xd]
cmp r0, #4
bls _08045CF0
@@ -422,7 +422,7 @@ _08045E70:
bl sub_0805E3A0
_08045EBA:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0800445C
pop {r4, pc}
@@ -461,7 +461,7 @@ sub_08045EDC: @ 0x08045EDC
bl sub_08046030
_08045F00:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0804604C
adds r3, r4, #0
asm/carlov.s
+2 -2
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_0806BD54
sub_0806BD54: @ 0x0806BD54
thumb_func_start Carlov
Carlov: @ 0x0806BD54
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
asm/carpenter.s
+10 -10
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08067158
sub_08067158: @ 0x08067158
thumb_func_start Carpenter
Carpenter: @ 0x08067158
push {r4, r5, lr}
adds r4, r0, #0
adds r0, #0x84
@@ -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
@@ -88,7 +88,7 @@ _080671F4:
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _08067224
_0806720A:
adds r0, r4, #0
@@ -106,8 +106,8 @@ _08067224:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_08067228
sub_08067228: @ 0x08067228
thumb_func_start Carpenter_Head
Carpenter_Head: @ 0x08067228
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
@@ -235,8 +235,8 @@ sub_08067314: @ 0x08067314
bl sub_08078784
pop {r4, pc}
thumb_func_start sub_0806732C
sub_0806732C: @ 0x0806732C
thumb_func_start Carpenter_Fusion
Carpenter_Fusion: @ 0x0806732C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -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]
@@ -273,6 +273,6 @@ sub_0806732C: @ 0x0806732C
_08067374: .4byte gUnk_08110CA8
_08067378:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0806737E:
pop {r4, pc}
asm/castleMaid.s
+5 -5
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08064508
sub_08064508: @ 0x08064508
thumb_func_start Maid
Maid: @ 0x08064508
push {lr}
adds r2, r0, #0
ldrb r1, [r2, #0x10]
@@ -24,8 +24,8 @@ _0806451E:
_08064522:
pop {pc}
thumb_func_start sub_08064524
sub_08064524: @ 0x08064524
thumb_func_start Maid_Head
Maid_Head: @ 0x08064524
push {r4, r5, lr}
adds r4, r0, #0
adds r0, #0x5a
@@ -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/castorWildsStatue.s
+7 -7
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08067380
sub_08067380: @ 0x08067380
thumb_func_start CastorWildsStatue
CastorWildsStatue: @ 0x08067380
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
@@ -365,7 +365,7 @@ _080675EC:
strb r0, [r3, #0x19]
adds r0, r4, #0
adds r1, r3, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_08067646:
subs r6, #1
adds r5, #2
@@ -418,7 +418,7 @@ _08067656:
strb r0, [r3, #0x19]
adds r0, r4, #0
adds r1, r3, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_080676B0:
subs r6, #1
adds r5, #2
@@ -511,8 +511,8 @@ _08067748:
.align 2, 0
_0806774C: .4byte gUnk_02033280
thumb_func_start sub_08067750
sub_08067750: @ 0x08067750
thumb_func_start CastorWildsStatue_Fusion
CastorWildsStatue_Fusion: @ 0x08067750
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -541,7 +541,7 @@ sub_08067750: @ 0x08067750
_08067784: .4byte 0x0000017B
_08067788:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0806778E:
pop {r4, pc}
asm/cat.s
+2 -2
View File
@@ -829,8 +829,8 @@ sub_08067DDC: @ 0x08067DDC
.align 2, 0
_08067DF8: .4byte gUnk_08110EF0
thumb_func_start sub_08067DFC
sub_08067DFC: @ 0x08067DFC
thumb_func_start Cat_Fusion
Cat_Fusion: @ 0x08067DFC
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/chaser.s
+2 -2
View File
@@ -91,7 +91,7 @@ _0802B56A:
sub_0802B56C: @ 0x0802B56C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x41
ldrb r1, [r0]
@@ -140,7 +140,7 @@ _0802B5C4:
sub_0802B5C8: @ 0x0802B5C8
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/chestSpawner.s
+1 -1
View File
@@ -313,7 +313,7 @@ sub_08084024: @ 0x08084024
adds r4, r0, #0
bl sub_0800445C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/chuchu.s
+34 -34
View File
@@ -272,7 +272,7 @@ _0801F018:
adds r0, r4, #0
bl sub_08003FC4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F028:
pop {r4, pc}
.align 2, 0
@@ -286,7 +286,7 @@ sub_0801F02C: @ 0x0801F02C
cmp r0, #6
bne _0801F03E
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F03E:
adds r0, r4, #0
bl sub_08001318
@@ -301,7 +301,7 @@ sub_0801F048: @ 0x0801F048
lsls r1, r1, #5
bl sub_08003FC4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0801F068
@@ -335,7 +335,7 @@ sub_0801F084: @ 0x0801F084
cmp r0, #0
bne _0801F09A
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F09A:
adds r0, r4, #0
bl sub_08001242
@@ -369,7 +369,7 @@ nullsub_4: @ 0x0801F0C4
sub_0801F0C8: @ 0x0801F0C8
push {r4, r5, lr}
adds r5, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r5, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -440,7 +440,7 @@ _0801F158:
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -512,11 +512,11 @@ _0801F1DE:
cmp r0, #0
bne _0801F200
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0801F200
_0801F1FA:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F200:
adds r0, r4, #0
adds r0, #0x5a
@@ -556,7 +556,7 @@ sub_0801F228: @ 0x0801F228
strb r0, [r4, #0x15]
_0801F246:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
.align 2, 0
@@ -564,7 +564,7 @@ _0801F246:
sub_0801F250: @ 0x0801F250
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -597,7 +597,7 @@ _0801F28C:
adds r0, r4, #0
bl sub_080AF160
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0801FBD0
cmp r0, #0
@@ -629,7 +629,7 @@ _0801F2CA:
sub_0801F2CC: @ 0x0801F2CC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -657,7 +657,7 @@ sub_0801F2F8: @ 0x0801F2F8
lsls r1, r1, #5
bl sub_08003FC4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -862,14 +862,14 @@ _0801F488:
thumb_func_start sub_0801F48C
sub_0801F48C: @ 0x0801F48C
push {lr}
bl sub_08004274
bl GetNextFrame
pop {pc}
thumb_func_start sub_0801F494
sub_0801F494: @ 0x0801F494
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -914,7 +914,7 @@ _0801F4E8:
sub_0801F4EC: @ 0x0801F4EC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xf]
subs r0, #1
strb r0, [r4, #0xf]
@@ -985,7 +985,7 @@ _0801F574:
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F580:
pop {r4, r5, pc}
.align 2, 0
@@ -1024,11 +1024,11 @@ _0801F5B2:
cmp r0, #0
bne _0801F5D4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0801F5D4
_0801F5CE:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F5D4:
adds r0, r4, #0
adds r0, #0x5a
@@ -1080,14 +1080,14 @@ sub_0801F61C: @ 0x0801F61C
strb r0, [r1, #0xc]
_0801F630:
adds r0, r1, #0
bl sub_08004274
bl GetNextFrame
pop {pc}
thumb_func_start sub_0801F638
sub_0801F638: @ 0x0801F638
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -1151,7 +1151,7 @@ _0801F6AA:
adds r0, r4, #0
bl sub_080AF160
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0801F6C8
_0801F6C2:
adds r0, r4, #0
@@ -1164,7 +1164,7 @@ _0801F6C8:
sub_0801F6CC: @ 0x0801F6CC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -1192,7 +1192,7 @@ sub_0801F6F8: @ 0x0801F6F8
lsls r1, r1, #5
bl sub_08003FC4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -1361,7 +1361,7 @@ _0801F83E:
sub_0801F840: @ 0x0801F840
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -1397,7 +1397,7 @@ _0801F880:
sub_0801F884: @ 0x0801F884
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _0801F898
@@ -1481,7 +1481,7 @@ _0801F92C:
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F938:
pop {r4, r5, pc}
.align 2, 0
@@ -1517,13 +1517,13 @@ _0801F966:
cmp r0, #0
bne _0801F98E
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0801F98E
.align 2, 0
_0801F984: .4byte 0x0000012B
_0801F988:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0801F98E:
adds r0, r4, #0
adds r0, #0x5a
@@ -1566,14 +1566,14 @@ sub_0801F9C4: @ 0x0801F9C4
strb r0, [r1, #0xc]
_0801F9D8:
adds r0, r1, #0
bl sub_08004274
bl GetNextFrame
pop {pc}
thumb_func_start sub_0801F9E0
sub_0801F9E0: @ 0x0801F9E0
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -1624,7 +1624,7 @@ sub_0801FA30: @ 0x0801FA30
adds r0, r4, #0
bl sub_080AF160
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0801FA74
_0801FA54:
adds r0, r4, #0
@@ -1649,7 +1649,7 @@ _0801FA74:
sub_0801FA78: @ 0x0801FA78
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -1680,7 +1680,7 @@ sub_0801FAAC: @ 0x0801FAAC
lsls r1, r1, #5
bl sub_08003FC4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/clothesRack.s
+1 -1
View File
@@ -159,5 +159,5 @@ _0806DEC4: .4byte gRoomControls
thumb_func_start sub_0806DEC8
sub_0806DEC8: @ 0x0806DEC8
push {lr}
bl sub_08004274
bl GetNextFrame
pop {pc}
asm/cloudPiranha.s
+3 -3
View File
@@ -392,7 +392,7 @@ sub_080386B8: @ 0x080386B8
cmp r1, #0
beq _08038720
adds r0, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_08038720:
pop {r4, pc}
.align 2, 0
@@ -499,7 +499,7 @@ _080387D8:
cmp r1, #0
beq _080387EE
adds r0, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_080387EE:
pop {r4, pc}
@@ -586,7 +586,7 @@ _0803887E:
bl InitializeAnimation
_08038890:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r1, r4, #0
adds r1, #0x82
ldrb r0, [r1]
asm/code_080011C4.s
+4 -4
View File
@@ -1233,7 +1233,7 @@ _08002812:
tst r3, r4
bne _0800283E
push {r0, r1, r2, r3}
ldr r4, _08002978 @ =gUnk_080C9160
ldr r4, _08002978 @ =gSineTable
ldrh r0, [r4, r2]
cmp r0, #0
beq _08002834
@@ -1251,7 +1251,7 @@ _0800283E:
tst r3, r4
bne _08002860
push {r0, r1, r2, r3}
ldr r4, _0800297C @ =gUnk_080C91E0
ldr r4, _0800297C @ =gCosineTable
ldrh r0, [r4, r2]
cmp r0, #0
beq _08002856
@@ -1430,8 +1430,8 @@ _08002968:
_0800296C: .4byte 0x00000100
_08002970: .4byte gUnk_0800275C
_08002974: .4byte 0x0000EE00
_08002978: .4byte gUnk_080C9160
_0800297C: .4byte gUnk_080C91E0
_08002978: .4byte gSineTable
_0800297C: .4byte gCosineTable
_08002980: .4byte 0x00000E00
_08002984: .4byte 0x0000020E
_08002988: .4byte 0x000004E0
asm/code_08003FC4.s
+2 -2
View File
@@ -427,8 +427,8 @@ InitializeAnimation: @ 0x08004260
str r1, [r0, #0x5c]
b _0800432A
thumb_func_start sub_08004274
sub_08004274: @ 0x08004274
thumb_func_start GetNextFrame
GetNextFrame: @ 0x08004274
movs r1, #1
non_word_aligned_thumb_func_start InitializeAnimationAnimation
asm/code_080041E8.s
+2 -2
View File
@@ -93,8 +93,8 @@ InitializeAnimation: @ 0x08004260
str r1, [r0, #0x5c]
b _0800432A
thumb_func_start sub_08004274
sub_08004274: @ 0x08004274
thumb_func_start GetNextFrame
GetNextFrame: @ 0x08004274
movs r1, #1
non_word_aligned_thumb_func_start InitializeAnimationAnimation
asm/code_0800857C.s
+2 -2
View File
@@ -689,7 +689,7 @@ sub_08008AA0: @ 0x08008AA0
cmp r2, #0xff
beq _08008AC4
lsls r2, r2, #4
ldr r3, _08008B44 @ =gUnk_080C9160
ldr r3, _08008B44 @ =gSineTable
ldrsh r4, [r3, r2]
adds r3, #0x80
ldrsh r5, [r3, r2]
@@ -775,7 +775,7 @@ sub_08008B2E: @ 0x08008B2E
_08008B38: .4byte 0x00000180
_08008B3C: .4byte 0xFFFFFE80
_08008B40: .4byte gLinkState
_08008B44: .4byte gUnk_080C9160
_08008B44: .4byte gSineTable
_08008B48: .4byte gLinkState
_08008B4C: .4byte gUnk_02000020
_08008B50: .4byte 0x00004000
asm/code_08018500.s
+2 -2
View File
@@ -1230,7 +1230,7 @@ sub_08018E68: @ 0x08018E68
cmp r0, #0
bne _08018E82
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
movs r1, #5
bl sub_08008790
@@ -1375,7 +1375,7 @@ sub_08018F6C: @ 0x08018F6C
b _08018F9A
_08018F8A:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r0, [r0]
asm/code_08019444.s
+3 -3
View File
@@ -10,7 +10,7 @@
sub_08019444: @ 0x08019444
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
movs r1, #0x80
@@ -181,7 +181,7 @@ sub_08019580: @ 0x08019580
cmp r0, r1
beq _08019638
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
ldrb r0, [r4, #0xe]
@@ -3887,7 +3887,7 @@ sub_0801B188: @ 0x0801B188
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r2, [r4, #0xc]
cmp r2, #3
beq _0801B24E
asm/code_0801C85C.s
+4 -4
View File
@@ -1816,8 +1816,8 @@ ReadBit: @ 0x0801D5A8
bx lr
.align 2, 0
thumb_func_start sub_0801D5BC
sub_0801D5BC: @ 0x0801D5BC
thumb_func_start WriteBit
WriteBit: @ 0x0801D5BC
lsrs r2, r1, #3
adds r3, r0, r2
movs r2, #7
@@ -1831,8 +1831,8 @@ sub_0801D5BC: @ 0x0801D5BC
ands r0, r2
bx lr
thumb_func_start sub_0801D5D4
sub_0801D5D4: @ 0x0801D5D4
thumb_func_start ClearBit
ClearBit: @ 0x0801D5D4
lsrs r2, r1, #3
adds r3, r0, r2
movs r2, #7
asm/code_0801D79C.s
+3 -3
View File
@@ -1769,7 +1769,7 @@ sub_0801E49C: @ 0x0801E49C
subs r3, #0x40
movs r2, #0xff
ands r3, r2
ldr r1, _0801E5EC @ =gUnk_080C9160
ldr r1, _0801E5EC @ =gSineTable
adds r0, r3, #0
adds r0, #0x40
lsls r0, r0, #1
@@ -1916,7 +1916,7 @@ _0801E5D6:
.align 2, 0
_0801E5E4: .4byte 0x0000FFFF
_0801E5E8: .4byte gUnk_02018EE0
_0801E5EC: .4byte gUnk_080C9160
_0801E5EC: .4byte gSineTable
_0801E5F0: .4byte gUnk_03003DE4
_0801E5F4: .4byte gUnk_02017AA0
_0801E5F8:
@@ -2417,7 +2417,7 @@ _0801E97C:
beq _0801E990
ldr r0, _0801E998 @ =gUnk_02002C8E
adds r1, r5, #0
bl sub_0801D5BC
bl WriteBit
_0801E990:
adds r5, #1
cmp r5, #0x64
asm/code_08049CD4.s
+1 -1
View File
@@ -1154,7 +1154,7 @@ sub_0804A4E4: @ 0x0804A4E4
strb r0, [r1]
adds r0, r5, #0
adds r1, r6, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
ldrb r0, [r7]
ands r4, r0
cmp r4, #0
asm/code_0804AEB0.s
+1 -1
View File
@@ -115,7 +115,7 @@ _0804AF64:
strh r0, [r4, #0x32]
ldr r1, [r2, #0xc]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
cmp r0, #0
bne _0804AF88
adds r0, r4, #0
asm/code_080526F8.s
+1 -1
View File
@@ -1406,7 +1406,7 @@ _080531DC:
ldr r0, _080531F4 @ =gUnk_02002AA0
ldr r1, _080531EC @ =gArea
ldrb r1, [r1, #1]
bl sub_0801D5BC
bl WriteBit
_080531E6:
pop {r4, r5, pc}
.align 2, 0
asm/code_08056418.s
+17 -17
View File
@@ -512,7 +512,7 @@ _08056844:
ldrh r1, [r5, #0x22]
movs r2, #0x1f
ands r1, r2
bl sub_0801D5BC
bl WriteBit
b _08056942
.align 2, 0
_08056854: .4byte gUnk_0200005C
@@ -1976,7 +1976,7 @@ sub_0805732C: @ 0x0805732C
movs r3, #0
mov ip, r2
mov r8, r1
ldr r0, _08057398 @ =gUnk_080C9160
ldr r0, _08057398 @ =gSineTable
mov sb, r0
movs r2, #0xff
ldr r1, _0805739C @ =gScreen
@@ -2012,7 +2012,7 @@ _08057354:
.align 2, 0
_08057390: .4byte gUnk_03003DE4
_08057394: .4byte gUnk_02017AA0
_08057398: .4byte gUnk_080C9160
_08057398: .4byte gSineTable
_0805739C: .4byte gScreen
_080573A0: .4byte 0x0400001C
_080573A4: .4byte 0xA2600001
@@ -2052,7 +2052,7 @@ sub_080573AC: @ 0x080573AC
ldrh r2, [r2, #0x2e]
adds r0, r0, r2
strh r0, [r5, #0x30]
ldr r2, _08057444 @ =gUnk_080C9160
ldr r2, _08057444 @ =gSineTable
ldr r4, _08057448 @ =gUnk_030010A0
ldr r1, [r4]
ldrb r0, [r4]
@@ -2096,7 +2096,7 @@ _08057434: .4byte gRoomControls
_08057438: .4byte 0xFFFFE000
_0805743C: .4byte 0xFFFFF000
_08057440: .4byte gScreen
_08057444: .4byte gUnk_080C9160
_08057444: .4byte gSineTable
_08057448: .4byte gUnk_030010A0
_0805744C: .4byte gUnk_08107C30
@@ -3266,7 +3266,7 @@ _08057D18:
bne _08057D3A
ldrb r0, [r4, #6]
bl sub_0804B128
bl sub_08080840
bl DoExitTransition
_08057D3A:
adds r4, #8
ldrh r0, [r4]
@@ -5179,7 +5179,7 @@ sub_08058BC8: @ 0x08058BC8
strh r1, [r0, #0xc]
movs r5, #0
mov r6, sp
ldr r0, _08058CA4 @ =gUnk_080C9160
ldr r0, _08058CA4 @ =gSineTable
mov r8, r0
adds r7, r1, #0
_08058C0A:
@@ -5256,7 +5256,7 @@ _08058C0A:
.align 2, 0
_08058C9C: .4byte gUnk_03003DE4
_08058CA0: .4byte gUnk_02017AA0
_08058CA4: .4byte gUnk_080C9160
_08058CA4: .4byte gSineTable
_08058CA8: .4byte gUnk_02017BA0
_08058CAC: .4byte gScreen
@@ -7873,7 +7873,7 @@ sub_0805A114: @ 0x0805A114
mov r8, r2
mov sb, r1
ldr r2, _0805A15C @ =gScreen
ldr r0, _0805A160 @ =gUnk_080C9160
ldr r0, _0805A160 @ =gSineTable
mov ip, r0
_0805A13A:
movs r1, #0x30
@@ -7893,7 +7893,7 @@ _0805A13A:
_0805A154: .4byte gUnk_03003DE4
_0805A158: .4byte gUnk_02017AA0
_0805A15C: .4byte gScreen
_0805A160: .4byte gUnk_080C9160
_0805A160: .4byte gSineTable
_0805A164: .4byte _0805A168
_0805A168: @ jump table
.4byte _0805A190 @ case 0
@@ -9312,7 +9312,7 @@ _0805AC00:
bne _0805AC1A
adds r0, r7, #0
adds r1, r5, #0
bl sub_0801D5D4
bl ClearBit
b _0805ACA6
_0805AC1A:
ldrh r0, [r4, #0xe]
@@ -9326,7 +9326,7 @@ _0805AC1A:
bhi _0805ACA6
adds r0, r7, #0
adds r1, r5, #0
bl sub_0801D5BC
bl WriteBit
cmp r0, #0
bne _0805ACA6
ldr r0, [r4, #8]
@@ -11129,7 +11129,7 @@ _0805B9F8:
ldrb r0, [r5, #0xf]
adds r0, #0x10
strb r0, [r5, #0xf]
ldr r1, _0805BA28 @ =gUnk_080C9160
ldr r1, _0805BA28 @ =gSineTable
ldrb r0, [r5, #0xf]
lsls r0, r0, #1
adds r0, r0, r1
@@ -11142,7 +11142,7 @@ _0805B9F8:
b _0805BA42
.align 2, 0
_0805BA24: .4byte gUnk_030010A0
_0805BA28: .4byte gUnk_080C9160
_0805BA28: .4byte gSineTable
_0805BA2C:
movs r0, #0
str r0, [r5, #0x20]
@@ -15265,7 +15265,7 @@ sub_0805DA08: @ 0x0805DA08
movs r3, #0
mov r8, r2
mov sb, r1
ldr r0, _0805DA80 @ =gUnk_080C9160
ldr r0, _0805DA80 @ =gSineTable
mov ip, r0
movs r2, #0xff
ldr r1, _0805DA84 @ =gScreen
@@ -15306,7 +15306,7 @@ _0805DA34:
.align 2, 0
_0805DA78: .4byte gUnk_03003DE4
_0805DA7C: .4byte gUnk_02017AA0
_0805DA80: .4byte gUnk_080C9160
_0805DA80: .4byte gSineTable
_0805DA84: .4byte gScreen
_0805DA88: .4byte 0x0400001C
_0805DA8C: .4byte 0xA2600001
@@ -15569,7 +15569,7 @@ sub_0805DC70: @ 0x0805DC70
push {lr}
bl sub_0805E5A8
ldr r0, _0805DC80 @ =gUnk_0813AC48
bl sub_08080840
bl DoExitTransition
pop {pc}
.align 2, 0
_0805DC80: .4byte gUnk_0813AC48
asm/code_0805E744.s
+1 -1
View File
@@ -2865,7 +2865,7 @@ sub_0805FC74: @ 0x0805FC74
cmp r0, r1
beq _0805FD1C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
ldrb r0, [r4, #0xe]
asm/code_0806ED78.s
+6 -6
View File
@@ -1183,7 +1183,7 @@ sub_0806F5BC: @ 0x0806F5BC
ands r0, r2
cmp r0, #0
bne _0806F620
ldr r0, _0806F628 @ =gUnk_080C9160
ldr r0, _0806F628 @ =gSineTable
mov r8, r0
lsls r4, r2, #3
lsls r0, r2, #4
@@ -1226,7 +1226,7 @@ _0806F620:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806F628: .4byte gUnk_080C9160
_0806F628: .4byte gSineTable
thumb_func_start sub_0806F62C
sub_0806F62C: @ 0x0806F62C
@@ -1237,7 +1237,7 @@ sub_0806F62C: @ 0x0806F62C
adds r6, r0, #0
adds r5, r1, #0
adds r4, r2, #0
ldr r0, _0806F698 @ =gUnk_080C9160
ldr r0, _0806F698 @ =gSineTable
mov sb, r0
lsls r4, r4, #0x18
lsrs r4, r4, #0x18
@@ -1281,7 +1281,7 @@ sub_0806F62C: @ 0x0806F62C
mov sb, r4
pop {r4, r5, r6, pc}
.align 2, 0
_0806F698: .4byte gUnk_080C9160
_0806F698: .4byte gSineTable
thumb_func_start sub_0806F69C
sub_0806F69C: @ 0x0806F69C
@@ -1292,7 +1292,7 @@ sub_0806F69C: @ 0x0806F69C
ands r0, r1
cmp r0, #0
bne _0806F6FE
ldr r5, _0806F700 @ =gUnk_080C9160
ldr r5, _0806F700 @ =gSineTable
ldrb r0, [r6, #0x15]
lsls r0, r0, #4
adds r0, r0, r5
@@ -1333,7 +1333,7 @@ sub_0806F69C: @ 0x0806F69C
_0806F6FE:
pop {r4, r5, r6, pc}
.align 2, 0
_0806F700: .4byte gUnk_080C9160
_0806F700: .4byte gSineTable
thumb_func_start sub_0806F704
sub_0806F704: @ 0x0806F704
asm/code_0806FA6C.s
+6 -88
View File
@@ -4,88 +4,6 @@
.syntax unified
.text
thumb_func_start sub_0806FA6C
sub_0806FA6C: @ 0x0806FA6C
push {lr}
adds r2, r0, #0
adds r2, #0x62
ldrb r2, [r2]
adds r3, r1, #0
adds r3, #0x62
strb r2, [r3]
adds r2, r0, #0
adds r2, #0x63
ldrb r2, [r2]
adds r3, #1
strb r2, [r3]
movs r2, #0
movs r3, #0
bl PositionRelative
pop {pc}
.align 2, 0
thumb_func_start sub_0806FA90
sub_0806FA90: @ 0x0806FA90
push {r4, r5, lr}
adds r4, r0, #0
adds r4, #0x62
ldrb r4, [r4]
movs r5, #0x62
strb r4, [r5, r1]
adds r4, r0, #0
adds r4, #0x63
ldrb r4, [r4]
movs r5, #0x63
strb r4, [r5, r1]
lsls r2, r2, #0x10
lsls r3, r3, #0x10
bl PositionRelative
pop {r4, r5, pc}
thumb_func_start sub_0806FAB0
sub_0806FAB0: @ 0x0806FAB0
ldr r2, _0806FAD4 @ =gUnk_08114F78
adds r0, #0x29
ldrb r0, [r0]
lsls r0, r0, #0x1d
lsrs r0, r0, #0x1d
adds r0, r0, r2
ldrb r0, [r0]
adds r1, #0x29
movs r2, #7
ands r2, r0
ldrb r3, [r1]
movs r0, #8
rsbs r0, r0, #0
ands r0, r3
orrs r0, r2
strb r0, [r1]
bx lr
.align 2, 0
_0806FAD4: .4byte gUnk_08114F78
thumb_func_start sub_0806FAD8
sub_0806FAD8: @ 0x0806FAD8
ldr r2, _0806FAFC @ =gUnk_08114F80
adds r0, #0x29
ldrb r0, [r0]
lsls r0, r0, #0x1d
lsrs r0, r0, #0x1d
adds r0, r0, r2
ldrb r0, [r0]
adds r1, #0x29
movs r2, #7
ands r2, r0
ldrb r3, [r1]
movs r0, #8
rsbs r0, r0, #0
ands r0, r3
orrs r0, r2
strb r0, [r1]
bx lr
.align 2, 0
_0806FAFC: .4byte gUnk_08114F80
thumb_func_start sub_0806FB00
sub_0806FB00: @ 0x0806FB00
@@ -515,8 +433,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}
@@ -1119,7 +1037,7 @@ _08070260:
b _0807037A
_08070268:
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
adds r0, r5, #0
bl sub_0806F69C
ldrb r0, [r5, #0xa]
@@ -1251,7 +1169,7 @@ _0807037A:
sub_0807037C: @ 0x0807037C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r4, #0x5a
ldrb r1, [r4]
movs r0, #0x80
@@ -1267,7 +1185,7 @@ _08070394:
sub_08070398: @ 0x08070398
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
movs r1, #0x80
@@ -1285,7 +1203,7 @@ _080703B8:
sub_080703BC: @ 0x080703BC
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _08070404 @ =gRoomControls
asm/code_08070698.s
+2 -2
View File
@@ -1128,7 +1128,7 @@ sub_08070F50: @ 0x08070F50
beq _08070F9A
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA30
bl PositionEntityOnTop
ldrh r0, [r4, #0x12]
ldrb r1, [r4, #0x1e]
bl sub_080700C8
@@ -2205,7 +2205,7 @@ _080717B0:
cmp r0, #6
bne _080717C0
ldr r0, _080717BC @ =gUnk_0813AB58
bl sub_08080840
bl DoExitTransition
b _080717CA
.align 2, 0
_080717BC: .4byte gUnk_0813AB58
asm/code_080732D0.s
+18 -18
View File
@@ -806,7 +806,7 @@ _080738A2:
lsls r0, r0, #2
ldr r1, _080738E8 @ =gUnk_0813AD88
adds r0, r0, r1
bl sub_08080840
bl DoExitTransition
b _080738F0
.align 2, 0
_080738DC: .4byte gUnk_030010A0
@@ -4253,7 +4253,7 @@ _08075252:
bl CopyPosition
adds r0, r4, #0
adds r1, r6, #0
bl sub_0807DAD0
bl StartCutscene
_08075270:
ldr r4, _08075298 @ =gLinkEntity
movs r1, #0xe
@@ -4321,7 +4321,7 @@ _080752E4: .4byte gUnk_02033280
thumb_func_start sub_080752E8
sub_080752E8: @ 0x080752E8
push {lr}
ldr r3, _080752FC @ =gItemBehaviors
ldr r3, _080752FC @ =gItemFunctions
ldrb r2, [r0, #1]
lsls r2, r2, #2
adds r2, r2, r3
@@ -4329,10 +4329,10 @@ sub_080752E8: @ 0x080752E8
bl _call_via_r2
pop {pc}
.align 2, 0
_080752FC: .4byte gItemBehaviors
_080752FC: .4byte gItemFunctions
thumb_func_start sub_08075300
sub_08075300: @ 0x08075300
thumb_func_start CellOverwriteSet
CellOverwriteSet: @ 0x08075300
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
@@ -4342,8 +4342,8 @@ sub_08075300: @ 0x08075300
bl sub_08077E78
pop {r4, r5, pc}
thumb_func_start sub_08075314
sub_08075314: @ 0x08075314
thumb_func_start Sword
Sword: @ 0x08075314
push {lr}
ldr r2, _08075330 @ =gLinkState
adds r2, #0xa8
@@ -5231,8 +5231,8 @@ _080759E8: .4byte gLinkState
_080759EC: .4byte gLinkEntity
_080759F0: .4byte 0xF7FFFFFF
thumb_func_start sub_080759F4
sub_080759F4: @ 0x080759F4
thumb_func_start Lantern
Lantern: @ 0x080759F4
push {lr}
ldr r3, _08075A08 @ =gUnk_0811BD68
ldrb r2, [r0, #4]
@@ -5724,8 +5724,8 @@ _08075DD8:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_08075DDC
sub_08075DDC: @ 0x08075DDC
thumb_func_start Bow
Bow: @ 0x08075DDC
push {lr}
ldr r3, _08075DF0 @ =gUnk_0811BD80
ldrb r2, [r0, #4]
@@ -5989,8 +5989,8 @@ _08075FD8:
.align 2, 0
_08075FDC: .4byte gLinkState
thumb_func_start sub_08075FE0
sub_08075FE0: @ 0x08075FE0
thumb_func_start Bomb
Bomb: @ 0x08075FE0
push {lr}
ldr r3, _08075FF4 @ =gUnk_0811BD98
ldrb r2, [r0, #4]
@@ -6221,8 +6221,8 @@ _080761A0:
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_080761A8
sub_080761A8: @ 0x080761A8
thumb_func_start TryPickupObject
TryPickupObject: @ 0x080761A8
push {lr}
ldr r3, _080761BC @ =gUnk_0811BDB4
ldrb r2, [r0, #4]
@@ -6819,8 +6819,8 @@ _0807663A:
.align 2, 0
_0807663C: .4byte gLinkState
thumb_func_start sub_08076640
sub_08076640: @ 0x08076640
thumb_func_start RocsCape
RocsCape: @ 0x08076640
push {r4, r5, lr}
adds r3, r0, #0
adds r4, r1, #0
asm/code_08076C80.s
+10 -10
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_08076C80
sub_08076C80: @ 0x08076C80
thumb_func_start PacciCane
PacciCane: @ 0x08076C80
push {lr}
ldr r3, _08076C94 @ =gUnk_0811BDE0
ldrb r2, [r0, #4]
@@ -64,8 +64,8 @@ _08076CE8:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08076CEC
sub_08076CEC: @ 0x08076CEC
thumb_func_start Shield
Shield: @ 0x08076CEC
push {lr}
ldr r3, _08076D00 @ =gUnk_0811BDE8
ldrb r2, [r0, #4]
@@ -175,8 +175,8 @@ _08076DC8:
.align 2, 0
_08076DCC: .4byte gLinkState
thumb_func_start sub_08076DD0
sub_08076DD0: @ 0x08076DD0
thumb_func_start GustJar
GustJar: @ 0x08076DD0
push {lr}
ldr r2, _08076DEC @ =gLinkState
adds r2, #0xa8
@@ -590,8 +590,8 @@ _08077110:
.align 2, 0
_08077114: .4byte gLinkEntity
thumb_func_start sub_08077118
sub_08077118: @ 0x08077118
thumb_func_start MoleMitts
MoleMitts: @ 0x08077118
push {lr}
ldr r3, _0807712C @ =gUnk_0811BE04
ldrb r2, [r0, #4]
@@ -1099,8 +1099,8 @@ _08077518:
_0807751A:
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0807751C
sub_0807751C: @ 0x0807751C
thumb_func_start JarEmpty
JarEmpty: @ 0x0807751C
push {lr}
ldr r3, _08077530 @ =gUnk_0811BE28
ldrb r2, [r0, #4]
asm/code_08077B98.s
+6 -6
View File
@@ -2434,7 +2434,7 @@ _08078DE0:
strh r0, [r4, #0x32]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
ldr r0, _08078E34 @ =gLinkState
ldrb r0, [r0, #5]
cmp r0, #4
@@ -2609,7 +2609,7 @@ sub_08078F24: @ 0x08078F24
.align 2, 0
_08078F38: .4byte gLinkState
_08078F3C:
ldr r2, _08078F5C @ =gUnk_080C9160
ldr r2, _08078F5C @ =gSineTable
lsls r0, r3, #4
adds r0, r0, r2
ldrh r1, [r0]
@@ -2627,7 +2627,7 @@ _08078F3C:
_08078F5A:
pop {r4, pc}
.align 2, 0
_08078F5C: .4byte gUnk_080C9160
_08078F5C: .4byte gSineTable
thumb_func_start sub_08078F60
sub_08078F60: @ 0x08078F60
@@ -7327,7 +7327,7 @@ sub_0807B264: @ 0x0807B264
ldrb r0, [r4, #0xf]
adds r0, #2
strb r0, [r4, #0xf]
ldr r1, _0807B2B4 @ =gUnk_080C9160
ldr r1, _0807B2B4 @ =gSineTable
ldrb r0, [r4, #0xf]
lsls r0, r0, #1
adds r0, r0, r1
@@ -7360,7 +7360,7 @@ sub_0807B264: @ 0x0807B264
_0807B2B0:
pop {r4, pc}
.align 2, 0
_0807B2B4: .4byte gUnk_080C9160
_0807B2B4: .4byte gSineTable
thumb_func_start sub_0807B2B8
sub_0807B2B8: @ 0x0807B2B8
@@ -7386,7 +7386,7 @@ sub_0807B2B8: @ 0x0807B2B8
lsls r0, r0, #2
ldr r1, _0807B2F4 @ =gUnk_0813AD88
adds r0, r0, r1
bl sub_08080840
bl DoExitTransition
_0807B2EC:
pop {r4, pc}
.align 2, 0
asm/code_0807CAA0.s
-52
View File
@@ -151,55 +151,3 @@ _0807CBCA:
adds r0, r1, #0
pop {pc}
.align 2, 0
thumb_func_start CheckLocalFlag
CheckLocalFlag: @ 0x0807CBD0
push {lr}
adds r1, r0, #0
ldr r0, _0807CBE0 @ =gArea
ldrh r0, [r0, #4]
bl CheckLocalFlagByOffset
pop {pc}
.align 2, 0
_0807CBE0: .4byte gArea
thumb_func_start CheckFlags
CheckFlags: @ 0x0807CBE4
push {lr}
ldr r3, _0807CC14 @ =0x000003FF
ands r3, r0
movs r1, #0xf0
lsls r1, r1, #6
ands r1, r0
lsrs r1, r1, #0xa
adds r2, r1, #1
movs r1, #0xc0
lsls r1, r1, #8
ands r1, r0
lsrs r1, r1, #0xe
cmp r1, #1
beq _0807CC22
cmp r1, #1
blo _0807CC18
cmp r1, #2
bne _0807CC2C
adds r0, r3, #0
adds r1, r2, #0
bl CheckRoomFlags
b _0807CC2E
.align 2, 0
_0807CC14: .4byte 0x000003FF
_0807CC18:
adds r0, r3, #0
adds r1, r2, #0
bl CheckLocalFlags
b _0807CC2E
_0807CC22:
adds r0, r3, #0
adds r1, r2, #0
bl CheckGlobalFlags
b _0807CC2E
_0807CC2C:
movs r0, #0
_0807CC2E:
pop {pc}
asm/code_0807CC3C.s
+6 -200
View File
@@ -5,200 +5,6 @@
.text
thumb_func_start CheckLocalFlagsByOffset
CheckLocalFlagsByOffset: @ 0x0807CC4C
push {lr}
adds r3, r0, #0
ldr r0, _0807CC5C @ =gGlobalFlags
adds r3, r3, r1
adds r1, r3, #0
bl CheckBits
pop {pc}
.align 2, 0
_0807CC5C: .4byte gGlobalFlags
thumb_func_start CheckLocalFlags
CheckLocalFlags: @ 0x0807CC60
push {lr}
adds r3, r0, #0
adds r2, r1, #0
ldr r0, _0807CC74 @ =gArea
ldrh r0, [r0, #4]
adds r1, r3, #0
bl CheckLocalFlagsByOffset
pop {pc}
.align 2, 0
_0807CC74: .4byte gArea
thumb_func_start CheckGlobalFlags
CheckGlobalFlags: @ 0x0807CC78
push {lr}
adds r3, r0, #0
adds r2, r1, #0
movs r0, #0
adds r1, r3, #0
bl CheckLocalFlagsByOffset
pop {pc}
thumb_func_start CheckRoomFlags
CheckRoomFlags: @ 0x0807CC88
push {lr}
adds r3, r0, #0
adds r2, r1, #0
ldr r0, _0807CC98 @ =gUnk_02034364
adds r1, r3, #0
bl CheckBits
pop {pc}
.align 2, 0
_0807CC98: .4byte gUnk_02034364
thumb_func_start SetLocalFlagByOffset
SetLocalFlagByOffset: @ 0x0807CC9C
push {lr}
adds r2, r0, #0
cmp r1, #0
beq _0807CCAC
ldr r0, _0807CCB0 @ =gGlobalFlags
adds r1, r2, r1
bl sub_0801D5BC
_0807CCAC:
pop {pc}
.align 2, 0
_0807CCB0: .4byte gGlobalFlags
thumb_func_start SetLocalFlag
SetLocalFlag: @ 0x0807CCB4
push {lr}
adds r1, r0, #0
ldr r0, _0807CCC4 @ =gArea
ldrh r0, [r0, #4]
bl SetLocalFlagByOffset
pop {pc}
.align 2, 0
_0807CCC4: .4byte gArea
thumb_func_start SetFlag
SetFlag: @ 0x0807CCC8
push {lr}
adds r1, r0, #0
cmp r1, #0
beq _0807CD02
ldr r2, _0807CCF0 @ =0x000003FF
ands r2, r1
movs r0, #0xc0
lsls r0, r0, #8
ands r0, r1
lsrs r0, r0, #0xe
cmp r0, #1
beq _0807CCFC
cmp r0, #1
blo _0807CCF4
cmp r0, #2
bne _0807CD02
adds r0, r2, #0
bl SetRoomFlag
b _0807CD02
.align 2, 0
_0807CCF0: .4byte 0x000003FF
_0807CCF4:
adds r0, r2, #0
bl SetLocalFlag
b _0807CD02
_0807CCFC:
adds r0, r2, #0
bl SetGlobalFlag
_0807CD02:
pop {pc}
thumb_func_start SetGlobalFlag
SetGlobalFlag: @ 0x0807CD04
push {lr}
adds r1, r0, #0
movs r0, #0
bl SetLocalFlagByOffset
pop {pc}
thumb_func_start SetRoomFlag
SetRoomFlag: @ 0x0807CD10
push {lr}
adds r1, r0, #0
ldr r0, _0807CD1C @ =gUnk_02034364
bl sub_0801D5BC
pop {pc}
.align 2, 0
_0807CD1C: .4byte gUnk_02034364
thumb_func_start ClearLocalFlagByOffset
ClearLocalFlagByOffset: @ 0x0807CD20
push {lr}
adds r2, r0, #0
ldr r0, _0807CD30 @ =gGlobalFlags
adds r2, r2, r1
adds r1, r2, #0
bl sub_0801D5D4
pop {pc}
.align 2, 0
_0807CD30: .4byte gGlobalFlags
thumb_func_start ClearLocalFlag
ClearLocalFlag: @ 0x0807CD34
push {lr}
adds r1, r0, #0
ldr r0, _0807CD44 @ =gArea
ldrh r0, [r0, #4]
bl ClearLocalFlagByOffset
pop {pc}
.align 2, 0
_0807CD44: .4byte gArea
thumb_func_start ClearFlag
ClearFlag: @ 0x0807CD48
push {lr}
ldr r2, _0807CD6C @ =0x000003FF
ands r2, r0
movs r1, #0xc0
lsls r1, r1, #8
ands r1, r0
lsrs r1, r1, #0xe
cmp r1, #1
beq _0807CD78
cmp r1, #1
blo _0807CD70
cmp r1, #2
bne _0807CD7E
adds r0, r2, #0
bl ClearRoomFlag
b _0807CD7E
.align 2, 0
_0807CD6C: .4byte 0x000003FF
_0807CD70:
adds r0, r2, #0
bl ClearLocalFlag
b _0807CD7E
_0807CD78:
adds r0, r2, #0
bl ClearGlobalFlag
_0807CD7E:
pop {pc}
thumb_func_start ClearGlobalFlag
ClearGlobalFlag: @ 0x0807CD80
push {lr}
adds r1, r0, #0
movs r0, #0
bl ClearLocalFlagByOffset
pop {pc}
thumb_func_start ClearRoomFlag
ClearRoomFlag: @ 0x0807CD8C
push {lr}
adds r1, r0, #0
ldr r0, _0807CD98 @ =gUnk_02034364
bl sub_0801D5D4
pop {pc}
.align 2, 0
_0807CD98: .4byte gUnk_02034364
thumb_func_start sub_0807CD9C
sub_0807CD9C: @ 0x0807CD9C
push {lr}
@@ -2014,8 +1820,8 @@ sub_0807DAC4: @ 0x0807DAC4
pop {pc}
.align 2, 0
thumb_func_start sub_0807DAD0
sub_0807DAD0: @ 0x0807DAD0
thumb_func_start StartCutscene
StartCutscene: @ 0x0807DAD0
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
@@ -6094,7 +5900,7 @@ sub_0807F714: @ 0x0807F714
orrs r0, r2
strb r0, [r1, #0x19]
adds r0, r1, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
pop {pc}
.align 2, 0
_0807F734: .4byte gUnk_08114F30
@@ -8182,7 +7988,7 @@ _080806E2:
cmp r0, #0
beq _08080720
adds r0, r5, #0
bl sub_08080840
bl DoExitTransition
movs r0, #1
b _0808072A
.align 2, 0
@@ -8355,8 +8161,8 @@ _0808083C:
_0808083E:
pop {r4, r5, pc}
thumb_func_start sub_08080840
sub_08080840: @ 0x08080840
thumb_func_start DoExitTransition
DoExitTransition: @ 0x08080840
push {r4, lr}
adds r4, r0, #0
ldr r0, _0808085C @ =gUnk_030010A0
asm/code_080A29BC.s
+6 -6
View File
@@ -206,7 +206,7 @@ sub_080A2AF4: @ 0x080A2AF4
asrs r7, r7, #0x10
movs r0, #0xff
ands r7, r0
ldr r0, _080A2B7C @ =gUnk_080C9160
ldr r0, _080A2B7C @ =gSineTable
mov r8, r0
lsls r0, r7, #1
add r0, r8
@@ -249,7 +249,7 @@ _080A2B74:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A2B7C: .4byte gUnk_080C9160
_080A2B7C: .4byte gSineTable
thumb_func_start sub_080A2B80
sub_080A2B80: @ 0x080A2B80
@@ -286,7 +286,7 @@ _080A2BB4:
bl PositionRelative
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
adds r0, r5, #0
adds r0, #0x62
ldrb r0, [r0]
@@ -499,7 +499,7 @@ sub_080A2D2C: @ 0x080A2D2C
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
str r5, [r4, #0x50]
adds r0, r4, #0
adds r0, #0x62
@@ -1002,7 +1002,7 @@ sub_080A310C: @ 0x080A310C
b _080A3200
_080A312A:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldr r0, [r4, #0x6c]
subs r0, #1
str r0, [r4, #0x6c]
@@ -1011,7 +1011,7 @@ _080A312A:
cmp r0, r1
beq _080A31FC
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
ldrb r0, [r4, #0xe]
asm/code_080A3BD0.s
+4 -4
View File
@@ -478,7 +478,7 @@ sub_080A3F68: @ 0x080A3F68
ldr r0, _080A3FBC @ =gUnk_02022740
ldrb r1, [r0, #3]
adds r0, r4, #0
bl sub_0801D5BC
bl WriteBit
ldr r0, _080A3FC0 @ =0xFFFFFED6
adds r1, r4, r0
ldrb r0, [r1]
@@ -727,7 +727,7 @@ sub_080A414C: @ 0x080A414C
movs r1, #0xff
mov r8, r1
adds r7, r4, #0
ldr r6, _080A421C @ =gUnk_080C9160
ldr r6, _080A421C @ =gSineTable
rsbs r0, r0, #0
adds r4, r0, #0
subs r4, #0x45
@@ -814,7 +814,7 @@ _080A4200:
_080A4210: .4byte gUnk_03001010
_080A4214: .4byte gUnk_02000080
_080A4218: .4byte 0x00000B21
_080A421C: .4byte gUnk_080C9160
_080A421C: .4byte gSineTable
_080A4220: .4byte gUnk_02002B6B
_080A4224: .4byte 0x0000FFFF
_080A4228: .4byte gUnk_02002A40
@@ -1468,7 +1468,7 @@ _080A4744: .4byte gUnk_02000080
_080A4748:
ldr r0, _080A477C @ =gUnk_02002B0E
ldrb r1, [r4, #0x1c]
bl sub_0801D5BC
bl WriteBit
adds r1, r4, #0
adds r1, #0x21
strb r0, [r1]
asm/code_080A5574.s
+78 -78
View File
@@ -3643,7 +3643,7 @@ sub_080A71F4: @ 0x080A71F4
push {lr}
cmp r0, #0
beq _080A71FE
bl sub_08080840
bl DoExitTransition
_080A71FE:
bl sub_0805E89C
bl sub_0805E974
@@ -5359,7 +5359,7 @@ _080A7F56:
strb r0, [r2]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
adds r0, r4, #0
bl sub_080A7F9C
ldrb r0, [r4, #0xa]
@@ -5546,7 +5546,7 @@ sub_080A8088: @ 0x080A8088
sub_080A80A0: @ 0x080A80A0
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
cmp r0, #0
@@ -5588,7 +5588,7 @@ sub_080A80F4: @ 0x080A80F4
adds r4, r0, #0
bl sub_0806F69C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
@@ -5604,7 +5604,7 @@ _080A8116:
sub_080A8118: @ 0x080A8118
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
movs r1, #0xa0
@@ -5729,7 +5729,7 @@ _080A81F8: .4byte 0x0000FFFE
sub_080A81FC: @ 0x080A81FC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
ldrh r0, [r4, #0x2a]
@@ -5767,7 +5767,7 @@ _080A8246:
sub_080A8248: @ 0x080A8248
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
movs r1, #0xc0
@@ -5806,7 +5806,7 @@ sub_080A827C: @ 0x080A827C
adds r0, r4, #0
bl sub_0806F69C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
@@ -5822,7 +5822,7 @@ _080A82B2:
sub_080A82B4: @ 0x080A82B4
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
movs r1, #0xc0
@@ -6143,7 +6143,7 @@ _080A8500: .4byte 0x0000018D
sub_080A8504: @ 0x080A8504
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
cmp r0, #0
@@ -6230,7 +6230,7 @@ _080A85B6:
sub_080A85B8: @ 0x080A85B8
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
cmp r0, #0
@@ -6272,7 +6272,7 @@ _080A860E:
sub_080A8610: @ 0x080A8610
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r4, #0x5a
ldrb r1, [r4]
movs r0, #0x80
@@ -6288,7 +6288,7 @@ _080A8628:
sub_080A862C: @ 0x080A862C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
movs r1, #0xa0
@@ -6851,7 +6851,7 @@ _080A8A44:
sub_080A8A48: @ 0x080A8A48
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -6968,7 +6968,7 @@ _080A8B1A:
bl InitializeAnimation
_080A8B2E:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_080A8B34:
pop {r4, r5, pc}
.align 2, 0
@@ -6977,7 +6977,7 @@ _080A8B34:
sub_080A8B38: @ 0x080A8B38
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
adds r2, r0, #0
@@ -7010,7 +7010,7 @@ _080A8B74:
sub_080A8B78: @ 0x080A8B78
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -7113,7 +7113,7 @@ _080A8C16:
bl InitializeAnimation
_080A8C42:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_080A8C48:
pop {r4, r5, pc}
.align 2, 0
@@ -7122,7 +7122,7 @@ _080A8C48:
sub_080A8C4C: @ 0x080A8C4C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
adds r2, r0, #0
@@ -7155,7 +7155,7 @@ _080A8C88:
sub_080A8C8C: @ 0x080A8C8C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -7258,7 +7258,7 @@ _080A8D2A:
bl InitializeAnimation
_080A8D56:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_080A8D5C:
pop {r4, r5, pc}
.align 2, 0
@@ -7267,7 +7267,7 @@ _080A8D5C:
sub_080A8D60: @ 0x080A8D60
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
adds r2, r0, #0
@@ -7300,7 +7300,7 @@ _080A8D9C:
sub_080A8DA0: @ 0x080A8DA0
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -7583,7 +7583,7 @@ sub_080A8FB8: @ 0x080A8FB8
b _080A9054
_080A8FE8:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
ldrb r0, [r4, #0xa]
@@ -7637,7 +7637,7 @@ _080A9054:
sub_080A9058: @ 0x080A9058
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xa]
cmp r0, #2
bne _080A9098
@@ -7688,7 +7688,7 @@ _080A90BA:
sub_080A90BC: @ 0x080A90BC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r4, #0x5a
ldrb r1, [r4]
movs r0, #0x80
@@ -8156,7 +8156,7 @@ sub_080A942C: @ 0x080A942C
bl DeleteThisEntity
_080A9440:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
thumb_func_start sub_080A9448
@@ -8329,7 +8329,7 @@ _080A9578:
_080A9586:
ldrb r1, [r3, #0x15]
lsls r1, r1, #1
ldr r0, _080A95B8 @ =gUnk_080C9160
ldr r0, _080A95B8 @ =gSineTable
adds r1, r1, r0
movs r4, #0
ldrsh r2, [r1, r4]
@@ -8349,17 +8349,17 @@ _080A9586:
subs r0, r0, r1
str r0, [r3, #0x30]
adds r0, r3, #0
bl sub_08004274
bl GetNextFrame
_080A95B6:
pop {r4, pc}
.align 2, 0
_080A95B8: .4byte gUnk_080C9160
_080A95B8: .4byte gSineTable
thumb_func_start sub_080A95BC
sub_080A95BC: @ 0x080A95BC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -8788,7 +8788,7 @@ _080A9908:
bl sub_080A99F0
_080A9916:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
@@ -8857,7 +8857,7 @@ _080A9998:
b _080A99EE
_080A99A0:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -9502,7 +9502,7 @@ sub_080A9DFC: @ 0x080A9DFC
sub_080A9E14: @ 0x080A9E14
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
ldrh r0, [r4, #0x2a]
@@ -11032,7 +11032,7 @@ sub_080AA9AC: @ 0x080AA9AC
sub_080AA9C4: @ 0x080AA9C4
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -11233,7 +11233,7 @@ sub_080AAB24: @ 0x080AAB24
sub_080AAB38: @ 0x080AAB38
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _080AAB4C
@@ -11258,7 +11258,7 @@ _080AAB62:
sub_080AAB64: @ 0x080AAB64
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
ldrh r0, [r4, #0x2a]
@@ -11290,7 +11290,7 @@ _080AABA2:
adds r0, r4, #0
bl sub_080AABB0
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
thumb_func_start sub_080AABB0
@@ -11303,7 +11303,7 @@ sub_080AABB0: @ 0x080AABB0
bl CopyPosition
ldrb r1, [r5, #0x14]
lsls r1, r1, #1
ldr r0, _080AABEC @ =gUnk_080C9160
ldr r0, _080AABEC @ =gSineTable
adds r1, r1, r0
ldrb r2, [r4, #0xe]
lsls r2, r2, #8
@@ -11324,7 +11324,7 @@ sub_080AABB0: @ 0x080AABB0
str r0, [r4, #0x30]
pop {r4, r5, pc}
.align 2, 0
_080AABEC: .4byte gUnk_080C9160
_080AABEC: .4byte gSineTable
thumb_func_start sub_080AABF0
sub_080AABF0: @ 0x080AABF0
@@ -11399,14 +11399,14 @@ sub_080AAC44: @ 0x080AAC44
bne _080AAC84
ldr r0, _080AAC80 @ =gLinkEntity
adds r1, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
b _080AAC8C
.align 2, 0
_080AAC80: .4byte gLinkEntity
_080AAC84:
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_080AAC8C:
bl sub_08077B2C
ldr r2, _080AACB4 @ =gLinkState
@@ -11595,7 +11595,7 @@ _080AADCC:
strb r0, [r1]
ldr r0, [r5, #0x50]
adds r1, r5, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
_080AADE0:
ldrb r1, [r5, #0xa]
cmp r1, #0
@@ -11664,7 +11664,7 @@ _080AAE60: .4byte gLinkEntity
_080AAE64:
ldr r0, [r5, #0x50]
adds r1, r5, #0
bl sub_0806FAB0
bl ResolveEntityOnTop
ldrb r1, [r5, #0x10]
movs r0, #0x7f
ands r0, r1
@@ -11905,7 +11905,7 @@ _080AB030: .4byte gLinkEntity
sub_080AB034: @ 0x080AB034
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5b
ldrb r1, [r0]
@@ -11974,7 +11974,7 @@ _080AB0AA:
adds r1, r4, #0
movs r2, #0
bl sub_0806FA90
ldr r3, _080AB128 @ =gUnk_080C9160
ldr r3, _080AB128 @ =gSineTable
adds r2, r5, #0
adds r2, #0x7c
ldrb r0, [r2]
@@ -12021,11 +12021,11 @@ _080AB0AA:
strb r0, [r5, #0xa]
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
_080AB124:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080AB128: .4byte gUnk_080C9160
_080AB128: .4byte gSineTable
thumb_func_start sub_080AB12C
sub_080AB12C: @ 0x080AB12C
@@ -12413,7 +12413,7 @@ _080AB3F4:
sub_080AB414: @ 0x080AB414
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
adds r0, r4, #0
@@ -12448,7 +12448,7 @@ _080AB458:
sub_080AB45C: @ 0x080AB45C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -12472,7 +12472,7 @@ _080AB486:
sub_080AB488: @ 0x080AB488
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r4, #0x5a
ldrb r1, [r4]
movs r0, #0x80
@@ -12626,7 +12626,7 @@ _080AB598: .4byte 0x0000FFFC
sub_080AB59C: @ 0x080AB59C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
cmp r0, #0
@@ -12645,7 +12645,7 @@ _080AB5BC:
sub_080AB5C4: @ 0x080AB5C4
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AF090
adds r0, r4, #0
@@ -12813,7 +12813,7 @@ _080AB6F8:
sub_080AB6FC: @ 0x080AB6FC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -12836,7 +12836,7 @@ _080AB724:
sub_080AB728: @ 0x080AB728
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldr r2, [r4, #0x50]
ldr r1, [r2, #0x2c]
ldr r0, [r4, #0x74]
@@ -13194,7 +13194,7 @@ _080AB9D0:
bl DeleteThisEntity
_080AB9D4:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, r5, pc}
thumb_func_start sub_080AB9DC
@@ -13429,7 +13429,7 @@ _080ABB7C:
strh r0, [r4, #0x32]
_080ABB84:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, r5, r6, pc}
thumb_func_start sub_080ABB8C
@@ -13678,7 +13678,7 @@ _080ABD60:
adds r0, r4, #0
bl sub_080AF090
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
.align 2, 0
@@ -13686,7 +13686,7 @@ _080ABD60:
sub_080ABD70: @ 0x080ABD70
push {r4, r5, lr}
adds r5, r0, #0
bl sub_08004274
bl GetNextFrame
adds r2, r5, #0
adds r2, #0x5a
ldrb r1, [r2]
@@ -13894,7 +13894,7 @@ _080ABF14:
adds r0, r4, #0
bl sub_0806F69C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
.align 2, 0
@@ -13950,7 +13950,7 @@ _080ABF78:
bl DeleteThisEntity
_080ABF88:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080A7EB0
cmp r0, #0
@@ -14061,7 +14061,7 @@ _080AC058:
strb r0, [r1]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
ldrh r0, [r4, #0x36]
subs r0, #0x14
strh r0, [r4, #0x36]
@@ -14084,7 +14084,7 @@ sub_080AC074: @ 0x080AC074
_080AC084:
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
ldrh r0, [r4, #0x36]
subs r0, #0x14
strh r0, [r4, #0x36]
@@ -14105,7 +14105,7 @@ _080AC084:
bl PlaySFX
_080AC0B2:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -14165,7 +14165,7 @@ _080AC116:
bl DeleteThisEntity
_080AC126:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080A7EB0
cmp r0, #0
@@ -14198,7 +14198,7 @@ _080AC164: .4byte gLinkEntity
sub_080AC168: @ 0x080AC168
push {r4, r5, r6, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldr r0, [r4, #0x34]
ldr r1, _080AC1C0 @ =0xFFFF8000
adds r0, r0, r1
@@ -14274,7 +14274,7 @@ _080AC1FC: .4byte gUnk_0812A98A
sub_080AC200: @ 0x080AC200
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -14771,7 +14771,7 @@ _080AC5A6:
adds r0, #0x79
ldrb r2, [r0]
lsls r2, r2, #8
ldr r3, _080AC5E0 @ =gUnk_080C9160
ldr r3, _080AC5E0 @ =gSineTable
ldrb r0, [r5, #0x15]
lsls r0, r0, #1
adds r0, r0, r3
@@ -14796,7 +14796,7 @@ _080AC5A6:
pop {r4, r5, pc}
.align 2, 0
_080AC5DC: .4byte gUnk_080FD448
_080AC5E0: .4byte gUnk_080C9160
_080AC5E0: .4byte gSineTable
thumb_func_start sub_080AC5E4
sub_080AC5E4: @ 0x080AC5E4
@@ -15081,7 +15081,7 @@ _080AC7E6:
adds r0, #0x79
ldrb r2, [r0]
lsls r2, r2, #8
ldr r3, _080AC880 @ =gUnk_080C9160
ldr r3, _080AC880 @ =gSineTable
mov sb, r3
ldrb r1, [r7, #0x15]
lsls r0, r1, #1
@@ -15151,7 +15151,7 @@ _080AC7E6:
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080AC880: .4byte gUnk_080C9160
_080AC880: .4byte gSineTable
thumb_func_start sub_080AC884
sub_080AC884: @ 0x080AC884
@@ -15278,7 +15278,7 @@ sub_080AC954: @ 0x080AC954
_080AC964:
ldr r0, [r5, #0x50]
ldrb r3, [r0, #0x14]
ldr r4, _080AC9C4 @ =gUnk_080C9160
ldr r4, _080AC9C4 @ =gSineTable
lsls r1, r3, #1
adds r1, r1, r4
movs r2, #0
@@ -15298,7 +15298,7 @@ _080AC964:
adds r1, r5, #0
bl PositionRelative
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r5, #0xe]
subs r0, #1
strb r0, [r5, #0xe]
@@ -15321,7 +15321,7 @@ _080AC964:
_080AC9C0:
pop {r4, r5, pc}
.align 2, 0
_080AC9C4: .4byte gUnk_080C9160
_080AC9C4: .4byte gSineTable
_080AC9C8: .4byte gLinkEntity
thumb_func_start sub_080AC9CC
@@ -15330,7 +15330,7 @@ sub_080AC9CC: @ 0x080AC9CC
adds r4, r0, #0
bl sub_080AF090
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080A7EB0
cmp r0, #0
@@ -15366,7 +15366,7 @@ sub_080ACA14: @ 0x080ACA14
adds r4, r0, #0
bl sub_080AF090
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r4, #0x5a
ldrb r1, [r4]
movs r0, #0x80
@@ -15485,7 +15485,7 @@ sub_080ACAF0: @ 0x080ACAF0
adds r4, r0, #0
bl sub_080AF090
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080A7EB0
cmp r0, #0
@@ -15506,7 +15506,7 @@ sub_080ACB10: @ 0x080ACB10
bl DeleteThisEntity
_080ACB22:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080ACB90
adds r0, r4, #0
asm/code_080AD90C.s
+44 -44
View File
@@ -2062,7 +2062,7 @@ sub_080AE800: @ 0x080AE800
ands r0, r1
cmp r0, #0
bne _080AE8AE
ldr r0, _080AE858 @ =gUnk_080C9160
ldr r0, _080AE858 @ =gSineTable
adds r0, #0x80
movs r1, #0
ldrsh r0, [r0, r1]
@@ -2073,7 +2073,7 @@ sub_080AE800: @ 0x080AE800
subs r0, r0, r1
b _080AE8AC
.align 2, 0
_080AE858: .4byte gUnk_080C9160
_080AE858: .4byte gSineTable
_080AE85C:
cmp r0, #4
bne _080AE8AE
@@ -2094,7 +2094,7 @@ _080AE85C:
ands r0, r1
cmp r0, #0
bne _080AE8AE
ldr r0, _080AE898 @ =gUnk_080C9160
ldr r0, _080AE898 @ =gSineTable
adds r0, #0x80
movs r1, #0
ldrsh r0, [r0, r1]
@@ -2105,9 +2105,9 @@ _080AE85C:
subs r0, r0, r1
b _080AE8AC
.align 2, 0
_080AE898: .4byte gUnk_080C9160
_080AE898: .4byte gSineTable
_080AE89C:
ldr r0, _080AE8C4 @ =gUnk_080C9160
ldr r0, _080AE8C4 @ =gSineTable
adds r0, #0x80
movs r1, #0
ldrsh r0, [r0, r1]
@@ -2130,7 +2130,7 @@ _080AE8AE:
movs r0, #0
b _080AE8D2
.align 2, 0
_080AE8C4: .4byte gUnk_080C9160
_080AE8C4: .4byte gSineTable
_080AE8C8: .4byte 0x00003333
_080AE8CC: .4byte 0x00006665
_080AE8D0:
@@ -2168,7 +2168,7 @@ _080AE904:
orrs r1, r2
cmp r1, #0
bne _080AE928
ldr r1, _080AE924 @ =gUnk_080C9160
ldr r1, _080AE924 @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2182,7 +2182,7 @@ _080AE904:
str r0, [r4, #0x30]
b _080AE98A
.align 2, 0
_080AE924: .4byte gUnk_080C9160
_080AE924: .4byte gSineTable
_080AE928:
mov r2, ip
cmp r2, #2
@@ -2215,7 +2215,7 @@ _080AE95C:
ands r0, r2
cmp r0, #0
bne _080AE97E
ldr r1, _080AE9B4 @ =gUnk_080C9160
ldr r1, _080AE9B4 @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2233,7 +2233,7 @@ _080AE97E:
ands r0, r2
cmp r0, #0
bne _080AE99E
ldr r1, _080AE9B4 @ =gUnk_080C9160
ldr r1, _080AE9B4 @ =gSineTable
_080AE98A:
mov r2, r8
lsls r0, r2, #1
@@ -2258,7 +2258,7 @@ _080AE99E:
movs r0, #0
b _080AE9C2
.align 2, 0
_080AE9B4: .4byte gUnk_080C9160
_080AE9B4: .4byte gSineTable
_080AE9B8: .4byte 0x00003333
_080AE9BC: .4byte 0x00006665
_080AE9C0:
@@ -2310,7 +2310,7 @@ sub_080AE9CC: @ 0x080AE9CC
ands r0, r1
cmp r0, #0
bne _080AEA90
ldr r1, _080AEA30 @ =gUnk_080C9160
ldr r1, _080AEA30 @ =gSineTable
lsls r0, r7, #1
adds r0, r0, r1
movs r1, #0
@@ -2322,7 +2322,7 @@ sub_080AE9CC: @ 0x080AE9CC
add r0, sb
b _080AEA8E
.align 2, 0
_080AEA30: .4byte gUnk_080C9160
_080AEA30: .4byte gSineTable
_080AEA34:
movs r0, #0x80
lsls r0, r0, #7
@@ -2345,7 +2345,7 @@ _080AEA34:
ands r0, r1
cmp r0, #0
bne _080AEA90
ldr r1, _080AEA78 @ =gUnk_080C9160
ldr r1, _080AEA78 @ =gSineTable
lsls r0, r7, #1
adds r0, r0, r1
movs r1, #0
@@ -2357,9 +2357,9 @@ _080AEA34:
add r0, sb
b _080AEA8E
.align 2, 0
_080AEA78: .4byte gUnk_080C9160
_080AEA78: .4byte gSineTable
_080AEA7C:
ldr r1, _080AEAA8 @ =gUnk_080C9160
ldr r1, _080AEAA8 @ =gSineTable
lsls r0, r7, #1
adds r0, r0, r1
movs r1, #0
@@ -2383,7 +2383,7 @@ _080AEA90:
movs r0, #0
b _080AEAB6
.align 2, 0
_080AEAA8: .4byte gUnk_080C9160
_080AEAA8: .4byte gSineTable
_080AEAAC: .4byte 0x00003333
_080AEAB0: .4byte 0x00006665
_080AEAB4:
@@ -2423,7 +2423,7 @@ _080AEAEC:
orrs r1, r2
cmp r1, #0
bne _080AEB10
ldr r1, _080AEB0C @ =gUnk_080C9160
ldr r1, _080AEB0C @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2437,7 +2437,7 @@ _080AEAEC:
str r0, [r4, #0x30]
b _080AEB72
.align 2, 0
_080AEB0C: .4byte gUnk_080C9160
_080AEB0C: .4byte gSineTable
_080AEB10:
mov r2, ip
cmp r2, #0x20
@@ -2470,7 +2470,7 @@ _080AEB44:
ands r0, r2
cmp r0, #0
bne _080AEB66
ldr r1, _080AEB9C @ =gUnk_080C9160
ldr r1, _080AEB9C @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2488,7 +2488,7 @@ _080AEB66:
ands r0, r2
cmp r0, #0
bne _080AEB86
ldr r1, _080AEB9C @ =gUnk_080C9160
ldr r1, _080AEB9C @ =gSineTable
_080AEB72:
mov r2, r8
lsls r0, r2, #1
@@ -2513,7 +2513,7 @@ _080AEB86:
movs r0, #0
b _080AEBAA
.align 2, 0
_080AEB9C: .4byte gUnk_080C9160
_080AEB9C: .4byte gSineTable
_080AEBA0: .4byte 0x00003333
_080AEBA4: .4byte 0x00006665
_080AEBA8:
@@ -2562,7 +2562,7 @@ sub_080AEBB4: @ 0x080AEBB4
ands r0, r1
cmp r0, #0
bne _080AEC7C
ldr r1, _080AEC18 @ =gUnk_080C9160
ldr r1, _080AEC18 @ =gSineTable
adds r0, r7, #0
adds r0, #0x40
lsls r0, r0, #1
@@ -2576,7 +2576,7 @@ sub_080AEBB4: @ 0x080AEBB4
subs r0, r0, r1
b _080AEC7A
.align 2, 0
_080AEC18: .4byte gUnk_080C9160
_080AEC18: .4byte gSineTable
_080AEC1C:
cmp r0, #0x40
bne _080AEC7C
@@ -2597,7 +2597,7 @@ _080AEC1C:
ands r0, r1
cmp r0, #0
bne _080AEC7C
ldr r1, _080AEC60 @ =gUnk_080C9160
ldr r1, _080AEC60 @ =gSineTable
adds r0, r7, #0
adds r0, #0x40
lsls r0, r0, #1
@@ -2611,9 +2611,9 @@ _080AEC1C:
subs r0, r0, r1
b _080AEC7A
.align 2, 0
_080AEC60: .4byte gUnk_080C9160
_080AEC60: .4byte gSineTable
_080AEC64:
ldr r1, _080AEC94 @ =gUnk_080C9160
ldr r1, _080AEC94 @ =gSineTable
adds r0, r7, #0
adds r0, #0x40
lsls r0, r0, #1
@@ -2639,7 +2639,7 @@ _080AEC7C:
movs r0, #0
b _080AECA2
.align 2, 0
_080AEC94: .4byte gUnk_080C9160
_080AEC94: .4byte gSineTable
_080AEC98: .4byte 0x00003333
_080AEC9C: .4byte 0x00006665
_080AECA0:
@@ -2679,7 +2679,7 @@ _080AECD8:
orrs r1, r2
cmp r1, #0
bne _080AECFC
ldr r1, _080AECF8 @ =gUnk_080C9160
ldr r1, _080AECF8 @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2693,7 +2693,7 @@ _080AECD8:
str r0, [r4, #0x30]
b _080AED5E
.align 2, 0
_080AECF8: .4byte gUnk_080C9160
_080AECF8: .4byte gSineTable
_080AECFC:
mov r2, ip
cmp r2, #0x40
@@ -2726,7 +2726,7 @@ _080AED30:
ands r0, r2
cmp r0, #0
bne _080AED52
ldr r1, _080AED88 @ =gUnk_080C9160
ldr r1, _080AED88 @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2744,7 +2744,7 @@ _080AED52:
ands r0, r2
cmp r0, #0
bne _080AED72
ldr r1, _080AED88 @ =gUnk_080C9160
ldr r1, _080AED88 @ =gSineTable
_080AED5E:
mov r2, r8
lsls r0, r2, #1
@@ -2769,7 +2769,7 @@ _080AED72:
movs r0, #0
b _080AED96
.align 2, 0
_080AED88: .4byte gUnk_080C9160
_080AED88: .4byte gSineTable
_080AED8C: .4byte 0x00003333
_080AED90: .4byte 0x00006665
_080AED94:
@@ -2821,7 +2821,7 @@ sub_080AEDA0: @ 0x080AEDA0
ands r0, r1
cmp r0, #0
bne _080AEE64
ldr r1, _080AEE04 @ =gUnk_080C9160
ldr r1, _080AEE04 @ =gSineTable
lsls r0, r7, #1
adds r0, r0, r1
movs r1, #0
@@ -2833,7 +2833,7 @@ sub_080AEDA0: @ 0x080AEDA0
add r0, sb
b _080AEE62
.align 2, 0
_080AEE04: .4byte gUnk_080C9160
_080AEE04: .4byte gSineTable
_080AEE08:
movs r0, #0x80
lsls r0, r0, #3
@@ -2856,7 +2856,7 @@ _080AEE08:
ands r0, r1
cmp r0, #0
bne _080AEE64
ldr r1, _080AEE4C @ =gUnk_080C9160
ldr r1, _080AEE4C @ =gSineTable
lsls r0, r7, #1
adds r0, r0, r1
movs r1, #0
@@ -2868,9 +2868,9 @@ _080AEE08:
add r0, sb
b _080AEE62
.align 2, 0
_080AEE4C: .4byte gUnk_080C9160
_080AEE4C: .4byte gSineTable
_080AEE50:
ldr r1, _080AEE7C @ =gUnk_080C9160
ldr r1, _080AEE7C @ =gSineTable
lsls r0, r7, #1
adds r0, r0, r1
movs r1, #0
@@ -2894,7 +2894,7 @@ _080AEE64:
movs r0, #0
b _080AEE8A
.align 2, 0
_080AEE7C: .4byte gUnk_080C9160
_080AEE7C: .4byte gSineTable
_080AEE80: .4byte 0x00003333
_080AEE84: .4byte 0x00006665
_080AEE88:
@@ -2934,7 +2934,7 @@ _080AEEC0:
orrs r1, r2
cmp r1, #0
bne _080AEEE4
ldr r1, _080AEEE0 @ =gUnk_080C9160
ldr r1, _080AEEE0 @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2948,7 +2948,7 @@ _080AEEC0:
str r0, [r4, #0x30]
b _080AEF46
.align 2, 0
_080AEEE0: .4byte gUnk_080C9160
_080AEEE0: .4byte gSineTable
_080AEEE4:
mov r2, ip
cmp r2, #4
@@ -2981,7 +2981,7 @@ _080AEF18:
ands r0, r2
cmp r0, #0
bne _080AEF3A
ldr r1, _080AEF70 @ =gUnk_080C9160
ldr r1, _080AEF70 @ =gSineTable
mov r0, r8
adds r0, #0x40
lsls r0, r0, #1
@@ -2999,7 +2999,7 @@ _080AEF3A:
ands r0, r2
cmp r0, #0
bne _080AEF5A
ldr r1, _080AEF70 @ =gUnk_080C9160
ldr r1, _080AEF70 @ =gSineTable
_080AEF46:
mov r2, r8
lsls r0, r2, #1
@@ -3024,7 +3024,7 @@ _080AEF5A:
movs r0, #0
b _080AEF7E
.align 2, 0
_080AEF70: .4byte gUnk_080C9160
_080AEF70: .4byte gSineTable
_080AEF74: .4byte 0x00003333
_080AEF78: .4byte 0x00006665
_080AEF7C:
asm/crenalBeanSprout.s
+3 -3
View File
@@ -304,7 +304,7 @@ _08096570:
_0809657C: .4byte gLinkState
_08096580:
adds r0, r6, #0
bl sub_08004274
bl GetNextFrame
_08096586:
ldr r0, [r6, #0x50]
adds r0, #0x29
@@ -369,7 +369,7 @@ _080965D6:
_080965FC: .4byte gLinkState
_08096600:
adds r0, r6, #0
bl sub_08004274
bl GetNextFrame
_08096606:
ldr r0, _08096664 @ =gLinkEntity
ldrb r0, [r0, #0x14]
@@ -580,7 +580,7 @@ sub_08096780: @ 0x08096780
cmp r4, r0
bne _080967DC
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
ldr r2, _080967D8 @ =gLinkState
ldrb r0, [r2, #0xb]
movs r1, #0x80
asm/crow.s
+5 -5
View File
@@ -110,7 +110,7 @@ _08032896:
strb r0, [r1]
_080328AE:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
.align 2, 0
@@ -126,7 +126,7 @@ sub_080328B8: @ 0x080328B8
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F520
cmp r0, #0
@@ -231,7 +231,7 @@ sub_0803298C: @ 0x0803298C
adds r4, r0, #0
bl sub_08032AB0
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
movs r0, #1
bl sub_08049DF4
cmp r0, #0
@@ -318,7 +318,7 @@ _08032A3A:
adds r0, r4, #0
bl sub_08032B10
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_08032A46:
pop {r4, pc}
@@ -613,6 +613,6 @@ _08032C64:
bl sub_08032B10
_08032C6A:
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
pop {r4, r5, r6, pc}
.align 2, 0
asm/cucco.s
+4 -4
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_0806E4A0
sub_0806E4A0: @ 0x0806E4A0
thumb_func_start Cucco
Cucco: @ 0x0806E4A0
push {lr}
ldr r2, _0806E4B4 @ =gUnk_081145B4
ldrb r1, [r0, #0xc]
@@ -299,8 +299,8 @@ _0806E6D4: .4byte gUnk_02002A40
_0806E6D8: .4byte 0x000001C1
_0806E6DC: .4byte gUnk_081145D0
thumb_func_start sub_0806E6E0
sub_0806E6E0: @ 0x0806E6E0
thumb_func_start Cucco_Fusion
Cucco_Fusion: @ 0x0806E6E0
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/cuccoAggr.s
+7 -7
View File
@@ -267,7 +267,7 @@ _08038E70:
bl sub_08039260
_08038EA2:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
.align 2, 0
@@ -287,7 +287,7 @@ sub_08038EAC: @ 0x08038EAC
adds r0, r4, #0
bl sub_080390F8
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
pop {r4, pc}
thumb_func_start sub_08038ED0
@@ -306,7 +306,7 @@ sub_08038EE0: @ 0x08038EE0
adds r4, r0, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_08039298
movs r1, #0xe0
@@ -338,7 +338,7 @@ sub_08038F20: @ 0x08038F20
adds r4, r0, #0
bl sub_08039298
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -368,7 +368,7 @@ sub_08038F44: @ 0x08038F44
adds r0, r4, #0
bl sub_080044EC
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_08039298
adds r1, r4, #0
@@ -432,7 +432,7 @@ _08038FE0:
adds r0, r4, #0
bl sub_0806F69C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _08039018
.align 2, 0
_08038FF4: .4byte 0x0000FFFF
@@ -441,7 +441,7 @@ _08038FFC:
adds r0, r4, #0
bl sub_0806F69C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0803917C
cmp r0, #0
asm/cuccoChick.s
+4 -4
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_0806E710
sub_0806E710: @ 0x0806E710
thumb_func_start CuccoChick
CuccoChick: @ 0x0806E710
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806E72C @ =gUnk_081145D4
@@ -211,8 +211,8 @@ sub_0806E884: @ 0x0806E884
.align 2, 0
_0806E890: .4byte 0x00000DB6
thumb_func_start sub_0806E894
sub_0806E894: @ 0x0806E894
thumb_func_start CuccoChick_Fusion
CuccoChick_Fusion: @ 0x0806E894
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
asm/curtain.s
+2 -2
View File
@@ -111,7 +111,7 @@ sub_08048268: @ 0x08048268
cmp r0, #0
beq _08048292
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -131,7 +131,7 @@ _08048292:
sub_08048294: @ 0x08048294
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/dampe.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0806BDAC
sub_0806BDAC: @ 0x0806BDAC
thumb_func_start Dampe
Dampe: @ 0x0806BDAC
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -91,8 +91,8 @@ sub_0806BE3C: @ 0x0806BE3C
bl sub_08078784
pop {r4, pc}
thumb_func_start sub_0806BE54
sub_0806BE54: @ 0x0806BE54
thumb_func_start Dampe_Fusion
Dampe_Fusion: @ 0x0806BE54
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/deathFx.s
+1 -1
View File
@@ -139,7 +139,7 @@ _0808171C: .4byte gUnk_0811EC20
sub_08081720: @ 0x08081720
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/din.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08064790
sub_08064790: @ 0x08064790
thumb_func_start Din
Din: @ 0x08064790
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -111,8 +111,8 @@ _0806484E:
_08064858: .4byte gUnk_02002A40
_0806485C: .4byte 0x00000141
thumb_func_start sub_08064860
sub_08064860: @ 0x08064860
thumb_func_start Din_Fusion
Din_Fusion: @ 0x08064860
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/dog.s
+8 -8
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08069B1C
sub_08069B1C: @ 0x08069B1C
thumb_func_start Dog
Dog: @ 0x08069B1C
push {r4, lr}
adds r4, r0, #0
ldr r1, _08069B40 @ =gUnk_08111D88
@@ -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
@@ -539,8 +539,8 @@ _08069F28:
_08069F2A:
pop {r4, pc}
thumb_func_start sub_08069F2C
sub_08069F2C: @ 0x08069F2C
thumb_func_start Dog_Head
Dog_Head: @ 0x08069F2C
push {r4, lr}
adds r4, r0, #0
adds r0, #0x5a
@@ -851,8 +851,8 @@ _0806A17A:
_0806A18C: .4byte gLinkState
_0806A190: .4byte gUnk_08111FD8
thumb_func_start sub_0806A194
sub_0806A194: @ 0x0806A194
thumb_func_start Dog_Fusion
Dog_Fusion: @ 0x0806A194
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -881,7 +881,7 @@ sub_0806A194: @ 0x0806A194
b _0806A1D4
_0806A1CE:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0806A1D4:
pop {r4, pc}
.align 2, 0
asm/doorMimic.s
+2 -2
View File
@@ -183,7 +183,7 @@ _080220EC:
sub_080220F0: @ 0x080220F0
push {r4, r5, r6, lr}
adds r5, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r5, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -274,7 +274,7 @@ sub_08022198: @ 0x08022198
adds r4, r0, #0
bl sub_0800445C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/drLeft.s
+3 -3
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_0806BF80
sub_0806BF80: @ 0x0806BF80
thumb_func_start DrLeft
DrLeft: @ 0x0806BF80
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
@@ -30,7 +30,7 @@ _0806BFA2:
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806BFD8
b _0806BFD4
asm/enemy50.s
+11 -11
View File
@@ -204,7 +204,7 @@ _08040CA8: .4byte gUnk_080D0DC4
sub_08040CAC: @ 0x08040CAC
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_08001328
ldrb r0, [r4, #0xa]
@@ -365,7 +365,7 @@ _08040DE0: .4byte gLinkEntity
sub_08040DE4: @ 0x08040DE4
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F4E8
pop {r4, pc}
@@ -374,7 +374,7 @@ sub_08040DE4: @ 0x08040DE4
sub_08040DF4: @ 0x08040DF4
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F3E4
cmp r0, #0
@@ -487,7 +487,7 @@ _08040EC4:
sub_08040EC8: @ 0x08040EC8
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -528,7 +528,7 @@ sub_08040F0C: @ 0x08040F0C
adds r0, r4, #0
bl sub_0803F58C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -544,7 +544,7 @@ _08040F36:
sub_08040F38: @ 0x08040F38
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
movs r1, #1
bl sub_08049F84
@@ -592,7 +592,7 @@ _08040F94:
sub_08040F98: @ 0x08040F98
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0803F5A8
cmp r0, #0
@@ -653,7 +653,7 @@ _08041014:
sub_08041018: @ 0x08041018
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -678,7 +678,7 @@ sub_08041044: @ 0x08041044
adds r4, r0, #0
bl sub_0803F738
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -703,7 +703,7 @@ _08041074:
sub_08041078: @ 0x08041078
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -779,7 +779,7 @@ _0804110A:
sub_0804110C: @ 0x0804110C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/enemy5A.s
+1 -1
View File
@@ -467,7 +467,7 @@ sub_08045A28: @ 0x08045A28
cmp r0, #0
bne _08045A3E
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
_08045A3E:
adds r6, r5, #0
adds r6, #0x5a
asm/enemy5F.s
+5 -5
View File
@@ -68,7 +68,7 @@ sub_08048330: @ 0x08048330
adds r4, r0, #0
bl sub_080485D8
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -188,7 +188,7 @@ sub_080483F8: @ 0x080483F8
b _08048436
_0804841C:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -242,7 +242,7 @@ sub_08048478: @ 0x08048478
adds r4, r0, #0
bl sub_080485FC
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
adds r2, r0, #0
cmp r2, #0
@@ -299,7 +299,7 @@ sub_080484E8: @ 0x080484E8
adds r4, r0, #0
bl sub_080485FC
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _08048528
@@ -396,7 +396,7 @@ sub_080485A0: @ 0x080485A0
adds r4, r0, #0
bl sub_080485FC
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/enemy62.s
+2 -2
View File
@@ -174,7 +174,7 @@ sub_08048ED0: @ 0x08048ED0
adds r4, r0, #0
bl sub_08048F50
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -226,7 +226,7 @@ sub_08048F30: @ 0x08048F30
adds r4, r0, #0
bl sub_08048F50
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r4, #0x5a
ldrb r1, [r4]
movs r0, #0x80
asm/enemy64.s
+2 -2
View File
@@ -1311,7 +1311,7 @@ sub_080499F0: @ 0x080499F0
ldrsh r2, [r4, r3]
subs r1, r1, r2
bl sub_080045DA
ldr r3, _08049A88 @ =gUnk_080C9160
ldr r3, _08049A88 @ =gSineTable
lsls r1, r0, #1
adds r1, r1, r3
movs r2, #0
@@ -1340,7 +1340,7 @@ _08049A82:
pop {r4, r5, r6, pc}
.align 2, 0
_08049A84: .4byte gLinkEntity
_08049A88: .4byte gUnk_080C9160
_08049A88: .4byte gSineTable
thumb_func_start sub_08049A8C
sub_08049A8C: @ 0x08049A8C
asm/evilSpirit.s
+4 -4
View File
@@ -333,7 +333,7 @@ _080864EA:
rsbs r0, r2, #0
strh r0, [r1]
_080864EE:
ldr r5, _0808654C @ =gUnk_080C9160
ldr r5, _0808654C @ =gSineTable
ldrb r0, [r6, #0x15]
lsls r0, r0, #1
adds r0, r0, r5
@@ -378,7 +378,7 @@ _080864EE:
_0808654A:
pop {r4, r5, r6, pc}
.align 2, 0
_0808654C: .4byte gUnk_080C9160
_0808654C: .4byte gSineTable
thumb_func_start sub_08086550
sub_08086550: @ 0x08086550
@@ -512,7 +512,7 @@ _0808663A:
movs r1, #0x80
eors r0, r1
strb r0, [r7, #0x15]
ldr r6, _080866BC @ =gUnk_080C9160
ldr r6, _080866BC @ =gSineTable
ldrb r0, [r7, #0x15]
lsls r0, r0, #1
adds r0, r0, r6
@@ -563,4 +563,4 @@ _0808663A:
_080866B8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080866BC: .4byte gUnk_080C9160
_080866BC: .4byte gSineTable
asm/eyeSwitch.s
+2 -2
View File
@@ -123,7 +123,7 @@ _0808875C: .4byte 0x00000111
sub_08088760: @ 0x08088760
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -188,7 +188,7 @@ _080887D6:
sub_080887D8: @ 0x080887D8
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/eyegore.s
+4 -4
View File
@@ -339,7 +339,7 @@ sub_08030C70: @ 0x08030C70
_08030C94: .4byte gUnk_080CE2BC
_08030C98:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -368,7 +368,7 @@ _08030CCC:
sub_08030CD0: @ 0x08030CD0
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -445,7 +445,7 @@ _08030D66:
sub_08030D68: @ 0x08030D68
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -539,7 +539,7 @@ _08030E1C:
sub_08030E20: @ 0x08030E20
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/ezloCap.s
+8 -8
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0806D86C
sub_0806D86C: @ 0x0806D86C
thumb_func_start EzloCap
EzloCap: @ 0x0806D86C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -194,8 +194,8 @@ _0806D9C6:
pop {pc}
.align 2, 0
thumb_func_start sub_0806D9D0
sub_0806D9D0: @ 0x0806D9D0
thumb_func_start NPC4E
NPC4E: @ 0x0806D9D0
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
@@ -436,7 +436,7 @@ sub_0806DB84: @ 0x0806DB84
bl PositionRelative
ldr r1, _0806DBEC @ =gUnk_08016030
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@@ -456,7 +456,7 @@ _0806DBB6:
bl PositionRelative
ldr r1, _0806DBF0 @ =gUnk_0801606C
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
@@ -594,8 +594,8 @@ sub_0806DCC0: @ 0x0806DCC0
.align 2, 0
_0806DCD0: .4byte gUnk_030010A0
thumb_func_start sub_0806DCD4
sub_0806DCD4: @ 0x0806DCD4
thumb_func_start NPC4E_Fusion
NPC4E_Fusion: @ 0x0806DCD4
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
asm/fairy.s
+2 -2
View File
@@ -407,7 +407,7 @@ sub_0808D998: @ 0x0808D998
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r6, [r5, #0x54]
ldr r2, _0808DA28 @ =gUnk_080C9160
ldr r2, _0808DA28 @ =gSineTable
ldrb r0, [r5, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
@@ -479,7 +479,7 @@ _0808D9DA:
movs r0, #3
b _0808DA3E
.align 2, 0
_0808DA28: .4byte gUnk_080C9160
_0808DA28: .4byte gSineTable
_0808DA2C: .4byte 0x0000FFFF
_0808DA30:
adds r2, r5, #0
asm/fallingBoulder.s
+1 -1
View File
@@ -188,7 +188,7 @@ _0802C35A:
strb r0, [r4, #0x18]
_0802C36A:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r2, _0802C3C4 @ =gRoomControls
asm/fan.s
+1 -1
View File
@@ -471,7 +471,7 @@ sub_0809F08C: @ 0x0809F08C
strb r0, [r4, #0xf]
_0809F09A:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r2, r4, #0
adds r2, #0x5a
ldrb r1, [r2]
asm/farmers.s
+9 -9
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0806BBE4
sub_0806BBE4: @ 0x0806BBE4
thumb_func_start Farmers
Farmers: @ 0x0806BBE4
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -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]
@@ -61,7 +61,7 @@ _0806BC40:
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0806BC54:
pop {r4, pc}
.align 2, 0
@@ -74,8 +74,8 @@ sub_0806BC58: @ 0x0806BC58
pop {pc}
.align 2, 0
thumb_func_start sub_0806BC64
sub_0806BC64: @ 0x0806BC64
thumb_func_start Farmers_Head
Farmers_Head: @ 0x0806BC64
push {r4, lr}
adds r4, r0, #0
adds r0, #0x5a
@@ -160,8 +160,8 @@ sub_0806BCE8: @ 0x0806BCE8
.align 2, 0
_0806BCF8: .4byte gUnk_08113158
thumb_func_start sub_0806BCFC
sub_0806BCFC: @ 0x0806BCFC
thumb_func_start Farmers_Fusion
Farmers_Fusion: @ 0x0806BCFC
push {r4, lr}
adds r4, r0, #0
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/farore.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08064990
sub_08064990: @ 0x08064990
thumb_func_start Farore
Farore: @ 0x08064990
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -111,8 +111,8 @@ _08064A4E:
_08064A58: .4byte gUnk_02002A40
_08064A5C: .4byte 0x00000141
thumb_func_start sub_08064A60
sub_08064A60: @ 0x08064A60
thumb_func_start Farore_Fusion
Farore_Fusion: @ 0x08064A60
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/festari.s
+2 -2
View File
@@ -219,8 +219,8 @@ _0805FF94:
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_0805FFA0
sub_0805FFA0: @ 0x0805FFA0
thumb_func_start Festari_Fusion
Festari_Fusion: @ 0x0805FFA0
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
asm/figurineDevice.s
+1 -1
View File
@@ -277,7 +277,7 @@ _08087DB8: .4byte 0x00000111
sub_08087DBC: @ 0x08087DBC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r2, r4, #0
adds r2, #0x7a
ldrb r0, [r2]
asm/fireballGuy.s
+1 -1
View File
@@ -100,7 +100,7 @@ sub_08045430: @ 0x08045430
adds r4, r0, #0
bl sub_080AEFE0
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
asm/flyingSkull.s
+3 -3
View File
@@ -622,7 +622,7 @@ _0803A044: .4byte gRoomControls
sub_0803A048: @ 0x0803A048
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldr r0, [r4, #0x34]
ldr r1, _0803A078 @ =0xFFFF0000
adds r0, r0, r1
@@ -651,7 +651,7 @@ _0803A07C: .4byte gLinkEntity
sub_0803A080: @ 0x0803A080
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -668,7 +668,7 @@ _0803A098:
sub_0803A09C: @ 0x0803A09C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_080AEFE0
ldrh r0, [r4, #0x2a]
asm/forestMinish.s
+10 -10
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805FFD8
sub_0805FFD8: @ 0x0805FFD8
thumb_func_start ForestMinish
ForestMinish: @ 0x0805FFD8
push {r4, r5, lr}
adds r4, r0, #0
ldrb r5, [r4, #0xc]
@@ -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
@@ -52,7 +52,7 @@ _0805FFF2:
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl sub_0807DAD0
bl StartCutscene
adds r0, r4, #0
bl sub_0807DD50
b _0806008C
@@ -110,8 +110,8 @@ sub_08060090: @ 0x08060090
bl sub_08078784
pop {r4, pc}
thumb_func_start sub_080600A8
sub_080600A8: @ 0x080600A8
thumb_func_start ForestMinish_Head
ForestMinish_Head: @ 0x080600A8
push {r4, lr}
adds r4, r0, #0
adds r0, #0x5a
@@ -523,8 +523,8 @@ _080603B0:
_080603B2:
pop {r4, pc}
thumb_func_start sub_080603B4
sub_080603B4: @ 0x080603B4
thumb_func_start ForestMinish_Fusion
ForestMinish_Fusion: @ 0x080603B4
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -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]
@@ -556,6 +556,6 @@ sub_080603B4: @ 0x080603B4
_080603F0: .4byte gUnk_0810A348
_080603F4:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_080603FA:
pop {r4, pc}
asm/fusionMenuNPC.s
+4 -4
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_0806E8CC
sub_0806E8CC: @ 0x0806E8CC
thumb_func_start FusionMenuNPC
FusionMenuNPC: @ 0x0806E8CC
push {lr}
adds r3, r0, #0
ldr r2, _0806E8EC @ =gNPCFunctions
@@ -31,8 +31,8 @@ _0806E8F4:
pop {pc}
.align 2, 0
thumb_func_start sub_0806E8F8
sub_0806E8F8: @ 0x0806E8F8
thumb_func_start FusionMenuNPC_Head
FusionMenuNPC_Head: @ 0x0806E8F8
push {lr}
adds r3, r0, #0
ldr r2, _0806E918 @ =gNPCFunctions
asm/gentari.s
+6 -6
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0805FD24
sub_0805FD24: @ 0x0805FD24
thumb_func_start Gentari
Gentari: @ 0x0805FD24
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -84,8 +84,8 @@ _0805FDBC:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0805FDC0
sub_0805FDC0: @ 0x0805FDC0
thumb_func_start Gentari_Fusion
Gentari_Fusion: @ 0x0805FDC0
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -114,8 +114,8 @@ _0805FDF4:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0805FDF8
sub_0805FDF8: @ 0x0805FDF8
thumb_func_start Festari
Festari: @ 0x0805FDF8
push {lr}
ldr r2, _0805FE0C @ =gUnk_08109BBC
ldrb r1, [r0, #0xc]
asm/ghini.s
+10 -10
View File
@@ -150,7 +150,7 @@ _0803F0F0: .4byte gUnk_080D0924
sub_0803F0F4: @ 0x0803F0F4
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_08001328
adds r0, r4, #0
@@ -286,7 +286,7 @@ _0803F1F8: .4byte gLinkEntity
sub_0803F1FC: @ 0x0803F1FC
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F4E8
pop {r4, pc}
@@ -295,7 +295,7 @@ sub_0803F1FC: @ 0x0803F1FC
sub_0803F20C: @ 0x0803F20C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F3E4
cmp r0, #0
@@ -438,7 +438,7 @@ _0803F322:
sub_0803F324: @ 0x0803F324
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -460,7 +460,7 @@ sub_0803F340: @ 0x0803F340
adds r0, r4, #0
bl sub_0803F58C
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -476,7 +476,7 @@ _0803F36A:
sub_0803F36C: @ 0x0803F36C
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
movs r1, #1
bl sub_08049F84
@@ -546,7 +546,7 @@ _0803F3F6:
adds r0, r4, #0
bl sub_080AEFB4
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
b _0803F41C
.align 2, 0
_0803F40C: .4byte gUnk_080D0970
@@ -564,7 +564,7 @@ _0803F41C:
sub_0803F420: @ 0x0803F420
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -582,7 +582,7 @@ sub_0803F43C: @ 0x0803F43C
adds r4, r0, #0
bl sub_0803F738
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -611,7 +611,7 @@ _0803F474:
sub_0803F478: @ 0x0803F478
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/ghostBrothers.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08065BA4
sub_08065BA4: @ 0x08065BA4
thumb_func_start GhostBrothers
GhostBrothers: @ 0x08065BA4
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
@@ -525,8 +525,8 @@ _08065F74:
_08065F88: .4byte gUnk_02002A40
_08065F8C: .4byte gUnk_08110280
thumb_func_start sub_08065F90
sub_08065F90: @ 0x08065F90
thumb_func_start GhostBrothers_Fusion
GhostBrothers_Fusion: @ 0x08065F90
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/gibdo.s
+1 -1
View File
@@ -339,7 +339,7 @@ sub_080376D0: @ 0x080376D0
strb r0, [r2, #0xa]
ldr r0, _08037728 @ =gLinkEntity
adds r1, r4, #0
bl sub_0806FA6C
bl CopyPositionAndSpriteOffset
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r2, r4, #0
asm/gina.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0806C13C
sub_0806C13C: @ 0x0806C13C
thumb_func_start Gina
Gina: @ 0x0806C13C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
@@ -82,8 +82,8 @@ _0806C1BE:
_0806C1D2:
pop {r4, pc}
thumb_func_start sub_0806C1D4
sub_0806C1D4: @ 0x0806C1D4
thumb_func_start Gina_Fusion
Gina_Fusion: @ 0x0806C1D4
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
asm/gleerok.s
+8 -8
View File
@@ -1287,7 +1287,7 @@ _0802D9F8:
b _0802DB7E
_0802DA0E:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -2334,7 +2334,7 @@ sub_0802E1D0: @ 0x0802E1D0
cmp r0, #0
bne _0802E1F6
adds r0, r5, #0
bl sub_08004274
bl GetNextFrame
_0802E1F6:
ldrb r0, [r4]
movs r2, #0x3f
@@ -2690,7 +2690,7 @@ _0802E490:
bl sub_0802EA68
_0802E4A6:
adds r0, r7, #0
bl sub_08004274
bl GetNextFrame
adds r0, r7, #0
adds r0, #0x84
ldr r0, [r0]
@@ -2704,7 +2704,7 @@ _0802E4A6:
sub_0802E4C0: @ 0x0802E4C0
push {r4, lr}
adds r4, r0, #0
bl sub_08004274
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -2815,7 +2815,7 @@ _0802E580:
add r4, sb
ldrb r0, [r4, #0x19]
lsls r0, r0, #4
ldr r1, _0802E644 @ =gUnk_080C9160
ldr r1, _0802E644 @ =gSineTable
adds r0, r0, r1
movs r2, #0
ldrsh r0, [r0, r2]
@@ -2832,7 +2832,7 @@ _0802E580:
adds r1, r0, #0
ldrb r0, [r4, #1]
lsls r0, r0, #4
ldr r2, _0802E644 @ =gUnk_080C9160
ldr r2, _0802E644 @ =gSineTable
adds r0, r0, r2
movs r2, #0
ldrsh r0, [r0, r2]
@@ -2852,7 +2852,7 @@ _0802E580:
ldrb r0, [r4, #0x19]
lsls r0, r0, #4
adds r0, #0x80
ldr r1, _0802E644 @ =gUnk_080C9160
ldr r1, _0802E644 @ =gSineTable
adds r0, r0, r1
movs r2, #0
ldrsh r0, [r0, r2]
@@ -2893,7 +2893,7 @@ _0802E580:
adds r7, #3
b _0802E64C
.align 2, 0
_0802E644: .4byte gUnk_080C9160
_0802E644: .4byte gSineTable
_0802E648:
lsrs r0, r1, #0x1a
adds r7, r7, r0
asm/gorman.s
+6 -6
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08069784
sub_08069784: @ 0x08069784
thumb_func_start Gorman
Gorman: @ 0x08069784
push {lr}
adds r2, r0, #0
ldrb r1, [r2, #0x10]
@@ -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]
@@ -453,8 +453,8 @@ _08069AE4:
str r0, [r2, #0x14]
pop {pc}
thumb_func_start sub_08069AE8
sub_08069AE8: @ 0x08069AE8
thumb_func_start Gorman_Head
Gorman_Head: @ 0x08069AE8
push {r4, lr}
adds r4, r0, #0
adds r0, #0x5a
asm/goronMerchant.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08069544
sub_08069544: @ 0x08069544
thumb_func_start GoronMerchant
GoronMerchant: @ 0x08069544
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]

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