mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-11 21:19:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from zeldaret/master

Browse Source 
test
This commit is contained in:
Macrepeh
2020-07-01 17:51:10 -04:00
committed by GitHub
parent e0b6a041f0 344de9129d
commit 220b113784
705 changed files with 106275 additions and 99976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clang-format
+23
View File
@@ -0,0 +1,23 @@
IndentWidth: 4
Language: Cpp
UseTab: Never
ColumnLimit: 120
PointerAlignment: Left
BreakBeforeBraces: Attach
SpaceAfterCStyleCast: false
Cpp11BracedListStyle: false
IndentCaseLabels: true
BinPackArguments: true
BinPackParameters: true
AlignAfterOpenBracket: Align
AlignOperands: true
BreakBeforeTernaryOperators: true
BreakBeforeBinaryOperators: None
AllowShortBlocksOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
AlignEscapedNewlines: Left
AlignTrailingComments: true
SortIncludes: false
.gitignore
+1
View File
@@ -35,6 +35,7 @@
*.swo
*.swp
*.til
*.code-workspace
.fuse_hidden*
.idea/
Thumbs.db
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
+14 -14
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08031864
sub_08031864: @ 0x08031864
thumb_func_start AcroBandit
AcroBandit: @ 0x08031864
push {r4, r5, lr}
adds r5, r0, #0
bl sub_080012DC
@@ -37,7 +37,7 @@ _08031898: .4byte gUnk_080012C8
_0803189C:
ldr r4, _080318C0 @ =gUnk_080CE56C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -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
+6 -6
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]
@@ -112,11 +112,11 @@ sub_0806C36C: @ 0x0806C36C
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #6
bl LoadAnimation
bl InitAnimationForceUpdate
b _0806C398
_0806C392:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_0806C398:
pop {pc}
.align 2, 0
asm/archway.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08090F70
sub_08090F70: @ 0x08090F70
thumb_func_start Archway
Archway: @ 0x08090F70
push {r4, r5, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
asm/armos.s
+6 -6
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08030198
sub_08030198: @ 0x08030198
thumb_func_start Armos
Armos: @ 0x08030198
push {r4, lr}
adds r4, r0, #0
ldr r1, _080301B8 @ =gUnk_080CE124
@@ -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/backgroundCloud.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0808F640
sub_0808F640: @ 0x0808F640
thumb_func_start BackgroundCloud
BackgroundCloud: @ 0x0808F640
push {lr}
ldr r2, _0808F654 @ =gUnk_08121EA4
ldrb r1, [r0, #0xc]
asm/bakerOven.s
+3 -3
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0809CC5C
sub_0809CC5C: @ 0x0809CC5C
thumb_func_start BakerOven
BakerOven: @ 0x0809CC5C
push {lr}
ldr r2, _0809CC70 @ =gUnk_08123E20
ldrb r1, [r0, #0xc]
@@ -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/ballChainSoldier.s
+7 -7
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0803E528
sub_0803E528: @ 0x0803E528
thumb_func_start BallChainSoldier
BallChainSoldier: @ 0x0803E528
push {lr}
ldr r1, _0803E534 @ =gUnk_080D06E0
bl EnemyFunctionHandler
@@ -107,7 +107,7 @@ sub_0803E580: @ 0x0803E580
ldrb r1, [r5, #0x14]
lsls r1, r1, #2
adds r0, r5, #0
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r5, #0
bl sub_0803E86C
_0803E5E4:
@@ -272,7 +272,7 @@ sub_0803E6E0: @ 0x0803E6E0
ldrb r1, [r4, #0x14]
adds r1, #0x20
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_0803E718:
pop {r4, pc}
.align 2, 0
@@ -323,7 +323,7 @@ sub_0803E75C: @ 0x0803E75C
cmp r0, #0
bne _0803E774
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
b _0803E7B0
_0803E774:
ldrb r0, [r2, #0xe]
@@ -620,7 +620,7 @@ _0803E988:
adds r4, r0, r1
adds r0, r3, #0
adds r1, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_0803E9A2:
pop {r4, r5, r6, pc}
@@ -647,7 +647,7 @@ sub_0803E9A4: @ 0x0803E9A4
ands r1, r0
adds r1, r4, r1
adds r0, r2, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_0803E9D2:
pop {r4, pc}
asm/beanstalk.s
+9 -9
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08089D04
sub_08089D04: @ 0x08089D04
thumb_func_start Beanstalk
Beanstalk: @ 0x08089D04
push {lr}
ldr r2, _08089D18 @ =gUnk_08120DF4
ldrb r1, [r0, #0xc]
@@ -104,7 +104,7 @@ _08089DAC:
adds r1, r1, r0
ldrb r1, [r1]
adds r0, r5, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08089DC6:
ldr r1, _08089E08 @ =gUnk_08120E14
ldrb r0, [r5, #0xa]
@@ -307,7 +307,7 @@ _08089F34: .4byte gUnk_08120E78
sub_08089F38: @ 0x08089F38
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -324,7 +324,7 @@ sub_08089F38: @ 0x08089F38
_08089F5A:
adds r0, r4, #0
movs r1, #1
bl LoadAnimation
bl InitAnimationForceUpdate
movs r0, #0x10
strb r0, [r4, #0xe]
ldrb r0, [r4, #0xd]
@@ -352,7 +352,7 @@ sub_08089F70: @ 0x08089F70
bl PlaySFX
_08089F8E:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -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
+12 -12
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
@@ -100,7 +100,7 @@ _08063342:
ldrb r0, [r4, #0xe]
ldr r1, _08063368 @ =0x00000A01
adds r0, r0, r1
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
@@ -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
@@ -184,15 +184,15 @@ sub_080633E0: @ 0x080633E0
ands r2, r0
adds r0, r4, #0
movs r1, #0
bl sub_0806FF60
bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e]
adds r0, r4, #0
movs r1, #1
bl sub_0806FF60
bl SetExtraSpriteFrame
adds r0, r4, #0
movs r1, #1
movs r2, #0
bl sub_0806FF88
bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0
bl sub_0807000C
pop {r4, pc}
@@ -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
+11 -11
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08021758
sub_08021758: @ 0x08021758
thumb_func_start Beetle
Beetle: @ 0x08021758
push {lr}
ldr r1, _08021764 @ =gUnk_080CB590
bl EnemyFunctionHandler
@@ -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/bell.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08097D78
sub_08097D78: @ 0x08097D78
thumb_func_start Bell
Bell: @ 0x08097D78
push {lr}
ldr r2, _08097D8C @ =gUnk_08123384
ldrb r1, [r0, #0xc]
@@ -47,12 +47,12 @@ sub_08097D90: @ 0x08097D90
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08097DCC
sub_08097DCC: @ 0x08097DCC
push {lr}
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {pc}
asm/bigBarrel.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08088A50
sub_08088A50: @ 0x08088A50
thumb_func_start BigBarrel
BigBarrel: @ 0x08088A50
push {lr}
ldr r2, _08088A64 @ =gUnk_08120C34
ldrb r1, [r0, #0xa]
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
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08099734
sub_08099734: @ 0x08099734
thumb_func_start BigIceBlock
BigIceBlock: @ 0x08099734
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xa]
@@ -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
+3 -3
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08098EE0
sub_08098EE0: @ 0x08098EE0
thumb_func_start BigPushableLever
BigPushableLever: @ 0x08098EE0
push {lr}
ldr r2, _08098EF4 @ =gUnk_081236DC
ldrb r1, [r0, #0xc]
@@ -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
+8 -8
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08098CF4
sub_08098CF4: @ 0x08098CF4
thumb_func_start BigVortex
BigVortex: @ 0x08098CF4
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xa]
@@ -67,7 +67,7 @@ _08098D5A:
bl sub_0805E3A0
adds r0, r4, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
pop {r4, r5, pc}
thumb_func_start sub_08098D6C
@@ -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]
@@ -165,7 +165,7 @@ _08098E20:
bl sub_08077B20
_08098E24:
adds r0, r5, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, r5, r6, pc}
.align 2, 0
_08098E2C: .4byte gLinkEntity
@@ -174,7 +174,7 @@ _08098E30: .4byte gLinkState
thumb_func_start sub_08098E34
sub_08098E34: @ 0x08098E34
push {lr}
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {pc}
thumb_func_start sub_08098E3C
@@ -194,7 +194,7 @@ sub_08098E3C: @ 0x08098E3C
strb r0, [r4, #0x18]
ldrb r1, [r4, #0xa]
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08098E5E:
ldrb r1, [r4, #0xa]
movs r0, #2
@@ -210,7 +210,7 @@ _08098E5E:
movs r3, #0
bl sub_0805EC9C
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
_08098E84: .4byte gUnk_08123690
asm/bird.s
+16 -16
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0809CF24
sub_0809CF24: @ 0x0809CF24
thumb_func_start Bird
Bird: @ 0x0809CF24
push {lr}
ldr r2, _0809CF38 @ =gUnk_08123EC0
ldrb r1, [r0, #0xa]
@@ -77,7 +77,7 @@ sub_0809CF54: @ 0x0809CF54
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
movs r0, #0x95
movs r1, #1
movs r2, #0
@@ -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
@@ -133,7 +133,7 @@ _0809D018:
bl DeleteThisEntity
_0809D026:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
@@ -165,7 +165,7 @@ sub_0809D048: @ 0x0809D048
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0x17
bl LoadAnimation
bl InitAnimationForceUpdate
pop {r4, pc}
.align 2, 0
@@ -269,7 +269,7 @@ sub_0809D10C: @ 0x0809D10C
bl UpdateSpriteOrderAndFlip
adds r0, r4, #0
movs r1, #0x17
bl LoadAnimation
bl InitAnimationForceUpdate
pop {r4, pc}
.align 2, 0
@@ -296,7 +296,7 @@ _0809D14C:
movs r0, #0x17
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
ldr r0, _0809D174 @ =gUnk_02002A40
ldr r1, [r0, #0x40]
movs r2, #0x80
@@ -365,7 +365,7 @@ _0809D19C:
b _0809D1EE
_0809D1E8:
adds r0, r4, #0
bl sub_08004274
bl GetNextFrame
_0809D1EE:
pop {r4, pc}
@@ -450,7 +450,7 @@ _0809D234:
bl sub_0805E3A0
adds r0, r5, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
ldr r0, _0809D2AC @ =0x00000123
bl PlaySFX
movs r0, #0x68
@@ -590,7 +590,7 @@ _0809D3A8:
adds r0, r5, #0
bl sub_08003FC4
adds r0, r5, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldr r4, [r5, #0x54]
cmp r4, #0
beq _0809D454
@@ -765,7 +765,7 @@ sub_0809D498: @ 0x0809D498
strb r0, [r6]
adds r0, r5, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
bl sub_08078B48
adds r7, r4, #0
b _0809D62E
@@ -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]
@@ -893,7 +893,7 @@ _0809D62E:
adds r0, r5, #0
bl sub_08003FC4
adds r0, r5, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r5, #0
bl sub_080040A8
cmp r0, #0
@@ -975,10 +975,10 @@ _0809D6A2:
bl sub_0805E3A0
adds r0, r4, #0
movs r1, #0xe0
bl LoadAnimation
bl InitAnimationForceUpdate
_0809D6EC:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
b _0809D6FE
_0809D6F4:
movs r0, #3
asm/bladeBrothers.s
-819
View File
@@ -1,819 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080689C0
sub_080689C0: @ 0x080689C0
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
movs r0, #2
ands r0, r1
cmp r0, #0
beq _080689E4
ldr r0, _080689E0 @ =gUnk_081115D0
ldrb r1, [r4, #0xc]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r4, #0
bl _call_via_r1
b _080689FA
.align 2, 0
_080689E0: .4byte gUnk_081115D0
_080689E4:
ldr r0, _08068A18 @ =gUnk_081115C0
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_0806ED78
_080689FA:
adds r2, r4, #0
adds r2, #0x5a
ldrb r1, [r2]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _08068A16
movs r0, #0xfe
ands r0, r1
strb r0, [r2]
adds r0, r4, #0
movs r1, #0
bl sub_08068BEC
_08068A16:
pop {r4, pc}
.align 2, 0
_08068A18: .4byte gUnk_081115C0
thumb_func_start sub_08068A1C
sub_08068A1C: @ 0x08068A1C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
strb r0, [r4, #0xb]
ldr r0, _08068A34 @ =gUnk_030010A0
adds r0, #0x2c
ldrb r0, [r0]
cmp r0, #0
beq _08068A38
movs r1, #6
movs r0, #3
b _08068A42
.align 2, 0
_08068A34: .4byte gUnk_030010A0
_08068A38:
adds r0, r4, #0
bl sub_08078778
movs r1, #2
movs r0, #1
_08068A42:
strb r0, [r4, #0xc]
adds r0, r4, #0
bl InitializeAnimation
pop {r4, pc}
thumb_func_start sub_08068A4C
sub_08068A4C: @ 0x08068A4C
push {r4, lr}
adds r4, r0, #0
movs r1, #0x28
movs r2, #0x28
bl sub_0806ED9C
adds r1, r0, #0
cmp r1, #0
bge _08068A62
movs r1, #2
b _08068A78
_08068A62:
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _08068A6E
movs r0, #0x10
strb r0, [r4, #0xf]
b _08068A78
_08068A6E:
subs r0, #1
strb r0, [r4, #0xf]
adds r0, r4, #0
adds r0, #0x58
ldrb r1, [r0]
_08068A78:
adds r0, r4, #0
bl sub_0806F078
cmp r0, #0
bne _08068A88
adds r0, r4, #0
bl sub_08004274
_08068A88:
adds r1, r4, #0
adds r1, #0x39
movs r0, #0
ldrsb r0, [r1, r0]
cmp r0, #0
beq _08068AA2
movs r0, #0
strb r0, [r1]
movs r0, #2
strb r0, [r4, #0xc]
movs r0, #0
bl TextboxTryNoOverlap
_08068AA2:
pop {r4, pc}
thumb_func_start sub_08068AA4
sub_08068AA4: @ 0x08068AA4
push {lr}
adds r2, r0, #0
movs r0, #1
strb r0, [r2, #0xc]
ldrb r0, [r2, #0xa]
cmp r0, #0
beq _08068AD4
ldrb r0, [r2, #0xb]
adds r1, r0, #1
movs r0, #7
ands r1, r0
strb r1, [r2, #0xb]
cmp r1, #0
bne _08068AC4
adds r0, r1, #1
strb r0, [r2, #0xb]
_08068AC4:
ldr r0, _08068AD8 @ =gUnk_081115DC
ldrb r1, [r2, #0xb]
lsls r1, r1, #1
adds r1, r1, r0
ldrh r1, [r1]
adds r0, r2, #0
bl sub_0801D2B4
_08068AD4:
pop {pc}
.align 2, 0
_08068AD8: .4byte gUnk_081115DC
thumb_func_start sub_08068ADC
sub_08068ADC: @ 0x08068ADC
push {r4, lr}
adds r4, r0, #0
ldr r0, _08068AF8 @ =gUnk_030010A0
adds r0, #0x2c
ldrb r0, [r0]
cmp r0, #2
bne _08068AF0
adds r0, r4, #0
bl sub_08004274
_08068AF0:
adds r0, r4, #0
bl sub_0806FD3C
pop {r4, pc}
.align 2, 0
_08068AF8: .4byte gUnk_030010A0
thumb_func_start sub_08068AFC
sub_08068AFC: @ 0x08068AFC
push {r4, lr}
adds r4, r0, #0
movs r2, #1
movs r0, #1
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #5
ands r0, r1
orrs r0, r2
strb r0, [r4, #0x18]
adds r0, r4, #0
bl sub_0801E99C
adds r1, r4, #0
adds r1, #0x68
strb r0, [r1]
ldrb r1, [r1]
adds r0, r4, #0
bl sub_08078784
adds r0, r4, #0
bl sub_0807DD50
pop {r4, pc}
thumb_func_start sub_08068B2C
sub_08068B2C: @ 0x08068B2C
push {r4, lr}
adds r4, r0, #0
adds r2, r4, #0
adds r2, #0x39
movs r1, #0
ldrsb r1, [r2, r1]
cmp r1, #2
bne _08068B64
movs r0, #0
strb r1, [r4, #0xc]
strb r0, [r2]
ldr r1, _08068B60 @ =gLinkEntity
adds r0, r4, #0
bl sub_080045C4
bl sub_0806F5A4
adds r1, r0, #0
adds r0, r4, #0
bl LoadAnimation
adds r0, r4, #0
bl sub_0806F118
b _08068B6C
.align 2, 0
_08068B60: .4byte gLinkEntity
_08068B64:
adds r0, r4, #0
movs r1, #0
bl sub_0807DD94
_08068B6C:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08068B70
sub_08068B70: @ 0x08068B70
push {r4, lr}
adds r4, r0, #0
bl UpdateFuseInteraction
cmp r0, #0
beq _08068B80
movs r0, #1
strb r0, [r4, #0xc]
_08068B80:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08068B84
sub_08068B84: @ 0x08068B84
push {r4, lr}
adds r4, r0, #0
ldr r1, _08068BAC @ =gUnk_08111618
ldrb r0, [r4, #0xe]
adds r0, r0, r1
ldrb r0, [r0]
cmp r0, #0
beq _08068B9A
movs r1, #0
bl sub_08054414
_08068B9A:
ldr r0, _08068BB0 @ =gUnk_081115EC
ldrb r1, [r4, #0xe]
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
bl sub_0805ED14
pop {r4, pc}
.align 2, 0
_08068BAC: .4byte gUnk_08111618
_08068BB0: .4byte gUnk_081115EC
thumb_func_start sub_08068BB4
sub_08068BB4: @ 0x08068BB4
ldr r2, _08068BCC @ =gUnk_02002A40
adds r1, r2, #0
adds r1, #0xb4
ldrb r1, [r1]
adds r3, r0, #0
adds r3, #0x69
strb r1, [r3]
adds r2, #0xb5
ldrb r1, [r2]
adds r0, #0x6a
strb r1, [r0]
bx lr
.align 2, 0
_08068BCC: .4byte gUnk_02002A40
thumb_func_start sub_08068BD0
sub_08068BD0: @ 0x08068BD0
push {r4, lr}
adds r4, r0, #0
adds r0, #0x69
ldrb r0, [r0]
movs r1, #0
bl sub_08054414
adds r4, #0x6a
ldrb r0, [r4]
movs r1, #1
bl sub_08054414
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08068BEC
sub_08068BEC: @ 0x08068BEC
push {r4, lr}
adds r4, r0, #0
movs r1, #0x44
movs r2, #0
bl CreateFx
adds r2, r0, #0
cmp r2, #0
beq _08068C22
adds r3, r2, #0
adds r3, #0x29
ldrb r1, [r3]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r3]
ldr r3, _08068C24 @ =0xFFF00000
adds r0, r4, #0
adds r1, r2, #0
movs r2, #0
bl PositionRelative
movs r0, #0xfa
bl PlaySFX
_08068C22:
pop {r4, pc}
.align 2, 0
_08068C24: .4byte 0xFFF00000
thumb_func_start sub_08068C28
sub_08068C28: @ 0x08068C28
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08068C54 @ =gUnk_08111623
ldrb r1, [r4, #0xa]
adds r1, r1, r0
ldrb r0, [r1]
strb r0, [r4, #0xe]
ldrb r5, [r4, #0xa]
cmp r5, #1
bne _08068C6A
movs r0, #0x48
bl GetInventoryValue
cmp r0, #0
beq _08068C6A
movs r0, #0x4b
bl GetInventoryValue
cmp r0, #0
bne _08068C58
strb r5, [r4, #0xe]
b _08068C6A
.align 2, 0
_08068C54: .4byte gUnk_08111623
_08068C58:
movs r0, #0x4a
bl GetInventoryValue
cmp r0, #0
bne _08068C66
movs r0, #2
b _08068C68
_08068C66:
movs r0, #3
_08068C68:
strb r0, [r4, #0xe]
_08068C6A:
pop {r4, r5, pc}
thumb_func_start sub_08068C6C
sub_08068C6C: @ 0x08068C6C
push {lr}
ldr r1, _08068C88 @ =gUnk_0811162B
ldrb r0, [r0, #0xe]
adds r0, r0, r1
ldrb r0, [r0]
movs r1, #0x81
rsbs r1, r1, #0
ands r0, r1
movs r1, #0
movs r2, #0
bl sub_080A7C18
pop {pc}
.align 2, 0
_08068C88: .4byte gUnk_0811162B
thumb_func_start sub_08068C8C
sub_08068C8C: @ 0x08068C8C
ldr r2, _08068C9C @ =gUnk_08111638
ldrb r0, [r0, #0xe]
lsls r0, r0, #2
adds r0, r0, r2
ldr r0, [r0]
str r0, [r1, #0x14]
bx lr
.align 2, 0
_08068C9C: .4byte gUnk_08111638
thumb_func_start sub_08068CA0
sub_08068CA0: @ 0x08068CA0
push {r4, lr}
adds r4, r1, #0
ldrb r1, [r0, #0xa]
cmp r1, #1
bne _08068CDC
str r1, [r4, #0x14]
movs r0, #0x48
bl GetInventoryValue
cmp r0, #0
bne _08068CB8
str r0, [r4, #0x14]
_08068CB8:
movs r0, #0x4b
bl GetInventoryValue
cmp r0, #0
bne _08068CC4
str r0, [r4, #0x14]
_08068CC4:
movs r0, #0x4a
bl GetInventoryValue
cmp r0, #0
bne _08068CD0
str r0, [r4, #0x14]
_08068CD0:
movs r0, #0x4e
bl GetInventoryValue
cmp r0, #0
bne _08068CF6
b _08068CF4
_08068CDC:
ldr r1, _08068CF8 @ =gUnk_0811162B
ldrb r0, [r0, #0xe]
adds r0, r0, r1
ldrb r0, [r0]
movs r1, #0x81
rsbs r1, r1, #0
ands r0, r1
bl GetInventoryValue
cmp r0, #0
beq _08068CF4
movs r0, #1
_08068CF4:
str r0, [r4, #0x14]
_08068CF6:
pop {r4, pc}
.align 2, 0
_08068CF8: .4byte gUnk_0811162B
thumb_func_start sub_08068CFC
sub_08068CFC: @ 0x08068CFC
push {r4, lr}
adds r4, r1, #0
movs r1, #0
str r1, [r4, #0x14]
ldrb r0, [r0, #0xe]
cmp r0, #0xa
bhi _08068DB6
lsls r0, r0, #2
ldr r1, _08068D14 @ =_08068D18
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08068D14: .4byte _08068D18
_08068D18: @ jump table
.4byte _08068DB2 @ case 0
.4byte _08068D44 @ case 1
.4byte _08068D48 @ case 2
.4byte _08068D4C @ case 3
.4byte _08068DB2 @ case 4
.4byte _08068D50 @ case 5
.4byte _08068D58 @ case 6
.4byte _08068D68 @ case 7
.4byte _08068DB2 @ case 8
.4byte _08068DB2 @ case 9
.4byte _08068DA8 @ case 10
_08068D44:
movs r0, #2
b _08068DAA
_08068D48:
movs r0, #0x15
b _08068DAA
_08068D4C:
movs r0, #0x14
b _08068DAA
_08068D50:
movs r0, #3
bl CheckLocalFlag
b _08068DAE
_08068D58:
ldr r0, _08068D64 @ =gUnk_02002A40
adds r0, #0xab
ldrb r0, [r0]
cmp r0, #0x4f
bls _08068DB6
b _08068DB2
.align 2, 0
_08068D64: .4byte gUnk_02002A40
_08068D68:
movs r0, #0x48
bl GetInventoryValue
cmp r0, #0
beq _08068DB6
movs r0, #0x49
bl GetInventoryValue
cmp r0, #0
beq _08068DB6
movs r0, #0x4a
bl GetInventoryValue
cmp r0, #0
beq _08068DB6
movs r0, #0x4b
bl GetInventoryValue
cmp r0, #0
beq _08068DB6
movs r0, #0x4c
bl GetInventoryValue
cmp r0, #0
beq _08068DB6
movs r0, #0x4e
bl GetInventoryValue
cmp r0, #0
beq _08068DB6
movs r0, #0x4f
b _08068DAA
_08068DA8:
movs r0, #0x4d
_08068DAA:
bl GetInventoryValue
_08068DAE:
cmp r0, #0
beq _08068DB6
_08068DB2:
movs r0, #1
str r0, [r4, #0x14]
_08068DB6:
pop {r4, pc}
thumb_func_start sub_08068DB8
sub_08068DB8: @ 0x08068DB8
push {lr}
adds r1, r0, #0
ldr r2, _08068DCC @ =gUnk_08111664
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068DCC: .4byte gUnk_08111664
thumb_func_start sub_08068DD0
sub_08068DD0: @ 0x08068DD0
push {lr}
adds r1, r0, #0
ldr r2, _08068DE4 @ =gUnk_0811167A
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068DE4: .4byte gUnk_0811167A
thumb_func_start sub_08068DE8
sub_08068DE8: @ 0x08068DE8
push {lr}
adds r1, r0, #0
ldr r2, _08068DFC @ =gUnk_08111690
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068DFC: .4byte gUnk_08111690
thumb_func_start sub_08068E00
sub_08068E00: @ 0x08068E00
push {lr}
adds r1, r0, #0
ldr r2, _08068E14 @ =gUnk_081116A6
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068E14: .4byte gUnk_081116A6
thumb_func_start sub_08068E18
sub_08068E18: @ 0x08068E18
push {lr}
adds r1, r0, #0
ldr r2, _08068E2C @ =gUnk_081116BC
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068E2C: .4byte gUnk_081116BC
thumb_func_start sub_08068E30
sub_08068E30: @ 0x08068E30
push {lr}
adds r1, r0, #0
ldr r2, _08068E44 @ =gUnk_081116D2
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068E44: .4byte gUnk_081116D2
thumb_func_start sub_08068E48
sub_08068E48: @ 0x08068E48
push {lr}
adds r1, r0, #0
ldr r2, _08068E5C @ =gUnk_081116E8
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068E5C: .4byte gUnk_081116E8
thumb_func_start sub_08068E60
sub_08068E60: @ 0x08068E60
push {lr}
adds r1, r0, #0
ldr r2, _08068E74 @ =gUnk_081116FE
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068E74: .4byte gUnk_081116FE
thumb_func_start sub_08068E78
sub_08068E78: @ 0x08068E78
push {lr}
adds r1, r0, #0
ldr r2, _08068E8C @ =gUnk_08111714
ldrb r0, [r1, #0xe]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
bl TextboxNoOverlap
pop {pc}
.align 2, 0
_08068E8C: .4byte gUnk_08111714
thumb_func_start sub_08068E90
sub_08068E90: @ 0x08068E90
ldr r2, _08068EAC @ =gLinkState
adds r2, #0xac
ldr r1, _08068EB0 @ =gUnk_08111740
ldrb r0, [r0, #0xe]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
subs r1, #1
movs r0, #1
lsls r0, r1
ldrh r1, [r2]
orrs r0, r1
strh r0, [r2]
bx lr
.align 2, 0
_08068EAC: .4byte gLinkState
_08068EB0: .4byte gUnk_08111740
thumb_func_start sub_08068EB4
sub_08068EB4: @ 0x08068EB4
ldr r0, _08068EC0 @ =gLinkState
adds r0, #0xab
movs r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_08068EC0: .4byte gLinkState
thumb_func_start sub_08068EC4
sub_08068EC4: @ 0x08068EC4
push {r4, lr}
adds r3, r1, #0
ldr r2, _08068EEC @ =gUnk_08111740
ldrb r4, [r0, #0xe]
lsls r1, r4, #2
adds r1, r1, r2
ldr r0, _08068EF0 @ =gLinkState
adds r0, #0xab
ldr r1, [r1]
ldrb r0, [r0]
cmp r1, r0
bne _08068EF8
ldr r1, _08068EF4 @ =gUnk_0811172A
lsls r0, r4, #1
adds r0, r0, r1
ldrh r0, [r0]
strh r0, [r3, #0x10]
movs r0, #1
b _08068EFA
.align 2, 0
_08068EEC: .4byte gUnk_08111740
_08068EF0: .4byte gLinkState
_08068EF4: .4byte gUnk_0811172A
_08068EF8:
movs r0, #0
_08068EFA:
str r0, [r3, #0x14]
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08068F00
sub_08068F00: @ 0x08068F00
push {lr}
ldrb r0, [r0, #0xe]
cmp r0, #1
bne _08068F0E
ldr r0, _08068F10 @ =gUnk_080F3494
bl LoadRoomEntityList
_08068F0E:
pop {pc}
.align 2, 0
_08068F10: .4byte gUnk_080F3494
thumb_func_start sub_08068F14
sub_08068F14: @ 0x08068F14
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xe]
cmp r0, #5
bne _08068F24
movs r0, #0xa0
bl ModHealth
_08068F24:
ldrb r0, [r4, #0xe]
cmp r0, #6
bne _08068F38
movs r0, #0xa0
rsbs r0, r0, #0
bl ModHealth
movs r0, #2
bl ModHealth
_08068F38:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08068F3C
sub_08068F3C: @ 0x08068F3C
push {lr}
ldrb r0, [r0, #0xe]
cmp r0, #6
bne _08068F4A
movs r0, #0xa0
bl ModHealth
_08068F4A:
pop {pc}
thumb_func_start sub_08068F4C
sub_08068F4C: @ 0x08068F4C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _08068F72
adds r0, #1
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #4
bl LoadAnimation
b _08068F78
_08068F72:
adds r0, r4, #0
bl sub_080042B8
_08068F78:
adds r2, r4, #0
adds r2, #0x5a
ldrb r1, [r2]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _08068F94
movs r0, #0xfe
ands r0, r1
strb r0, [r2]
adds r0, r4, #0
movs r1, #0
bl sub_08068BEC
_08068F94:
pop {r4, pc}
.align 2, 0
asm/blockPushed.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08082E9C
sub_08082E9C: @ 0x08082E9C
thumb_func_start BlockPushed
BlockPushed: @ 0x08082E9C
push {lr}
ldr r2, _08082EB0 @ =gUnk_0811F624
ldrb r1, [r0, #0xc]
asm/bobomb.s
+9 -9
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0802C660
sub_0802C660: @ 0x0802C660
thumb_func_start Bobomb
Bobomb: @ 0x0802C660
push {lr}
ldr r1, _0802C66C @ =gUnk_080CD5D4
bl EnemyFunctionHandler
@@ -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
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0808B294
sub_0808B294: @ 0x0808B294
thumb_func_start Bollard
Bollard: @ 0x0808B294
push {lr}
ldr r2, _0808B2A8 @ =gUnk_08121300
ldrb r1, [r0, #0xc]
@@ -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 sub_0802A804
sub_0802A804: @ 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 sub_0800279C
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
+4 -4
View File
@@ -7,12 +7,12 @@
.text
thumb_func_start sub_080333B8
sub_080333B8: @ 0x080333B8
thumb_func_start Bombarossa
Bombarossa: @ 0x080333B8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _080333D0 @ =gUnk_080CEB38
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -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
+5 -5
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0809B3AC
sub_0809B3AC: @ 0x0809B3AC
thumb_func_start Book
Book: @ 0x0809B3AC
push {lr}
ldr r2, _0809B3C0 @ =gUnk_08123D7C
ldrb r1, [r0, #0xc]
@@ -75,7 +75,7 @@ _0809B424:
ldrb r1, [r4, #0xa]
adds r1, #0x39
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
ldrb r1, [r4, #0xb]
cmp r1, #1
beq _0809B46C
@@ -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
@@ -303,7 +303,7 @@ _0809B5D0:
adds r0, #0x39
movs r1, #0
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
bl DeleteThisEntity
_0809B5EA:
pop {r4, pc}
asm/bossDoor.s
+3 -3
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0808C1E4
sub_0808C1E4: @ 0x0808C1E4
thumb_func_start BossDoor
BossDoor: @ 0x0808C1E4
push {lr}
ldr r2, _0808C1F8 @ =gUnk_081214D8
ldrb r1, [r0, #0xc]
@@ -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 -71
View File
@@ -6,76 +6,6 @@
.text
thumb_func_start sub_0803C160
sub_0803C160: @ 0x0803C160
push {r4, lr}
adds r4, r0, #0
ldr r1, _0803C17C @ =gUnk_080CFF78
bl EnemyFunctionHandler
movs r3, #0x18
rsbs r3, r3, #0
adds r0, r4, #0
movs r1, #0
movs r2, #1
bl SetChildOffset
pop {r4, pc}
.align 2, 0
_0803C17C: .4byte gUnk_080CFF78
thumb_func_start sub_0803C180
sub_0803C180: @ 0x0803C180
push {lr}
ldr r2, _0803C194 @ =gUnk_080CFF90
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0803C194: .4byte gUnk_080CFF90
thumb_func_start sub_0803C198
sub_0803C198: @ 0x0803C198
push {r4, lr}
adds r4, r0, #0
adds r0, #0x43
ldrb r0, [r0]
cmp r0, #0
beq _0803C1AC
adds r0, r4, #0
movs r1, #0x1c
bl sub_0804A9FC
_0803C1AC:
ldr r1, _0803C1D8 @ =gUnk_080CFF78
adds r0, r4, #0
bl sub_0804AA30
adds r0, r4, #0
adds r0, #0x41
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _0803C1D4
adds r0, r4, #0
bl sub_0803C5F0
ldr r1, [r4, #0x54]
cmp r1, #0
beq _0803C1D4
ldrb r0, [r1, #0xf]
adds r0, #1
strb r0, [r1, #0xf]
_0803C1D4:
pop {r4, pc}
.align 2, 0
_0803C1D8: .4byte gUnk_080CFF78
thumb_func_start nullsub_168
nullsub_168: @ 0x0803C1DC
bx lr
.align 2, 0
thumb_func_start sub_0803C1E0
sub_0803C1E0: @ 0x0803C1E0
push {r4, lr}
@@ -747,7 +677,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
+16 -16
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]
@@ -55,7 +55,7 @@ sub_0806355C: @ 0x0806355C
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #4
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_08078778
pop {r4, pc}
@@ -81,14 +81,14 @@ sub_08063584: @ 0x08063584
strb r0, [r4, #0xf]
adds r0, r4, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_080635B2:
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _080635D0
_080635B8:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -113,11 +113,11 @@ _080635D0:
adds r1, r0, #0
adds r1, #4
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
ldrb r0, [r4, #0xe]
ldr r1, _08063604 @ =0x00000A01
adds r0, r0, r1
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
_080635FC:
adds r0, r4, #0
bl sub_0806ED78
@@ -140,7 +140,7 @@ sub_08063608: @ 0x08063608
strb r1, [r2, #0xf]
adds r0, r2, #0
movs r1, #4
bl LoadAnimation
bl InitAnimationForceUpdate
_08063626:
pop {pc}
.align 2, 0
@@ -199,7 +199,7 @@ _08063662:
adds r1, r0, #0
adds r1, #4
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_0806F118
b _080636D4
@@ -212,7 +212,7 @@ _080636A4:
adds r0, r4, #0
bl sub_0807DDE4
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
b _080636D4
_080636BA:
adds r0, r4, #0
@@ -225,7 +225,7 @@ _080636BA:
adds r0, #0x69
ldrb r1, [r0]
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_080636D4:
pop {r4, pc}
.align 2, 0
@@ -238,7 +238,7 @@ sub_080636D8: @ 0x080636D8
lsls r1, r1, #3
ldr r2, _080636F0 @ =gUnk_0810CAAC
adds r1, r1, r2
bl sub_0806F1AC
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_080636EC: .4byte gUnk_02002A40
@@ -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]
@@ -278,10 +278,10 @@ sub_0806370C: @ 0x0806370C
strh r0, [r2, #0x32]
adds r0, r2, #0
movs r1, #2
bl LoadAnimation
bl InitAnimationForceUpdate
b _0806373E
_08063738:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_0806373E:
pop {pc}
asm/businessScrub.s
+15 -15
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0802890C
sub_0802890C: @ 0x0802890C
thumb_func_start BusinessScrub
BusinessScrub: @ 0x0802890C
push {lr}
ldr r1, _08028918 @ =gUnk_080CC9C8
bl EnemyFunctionHandler
@@ -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
@@ -535,7 +535,7 @@ sub_08028CE8: @ 0x08028CE8
cmp r0, #0
beq _08028D3C
ldr r0, _08028D38 @ =0x00002904
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
movs r0, #0
bl sub_08078A90
b _08028DCC
@@ -573,7 +573,7 @@ _08028D5C:
_08028D70:
ldrb r0, [r6, #8]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #6
strb r0, [r5, #0xc]
movs r0, #4
@@ -593,14 +593,14 @@ _08028D9C:
ldrb r0, [r6, #8]
ldrb r1, [r6, #9]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #4
b _08028DB6
_08028DAA:
ldrb r0, [r6, #8]
ldrb r1, [r6, #9]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
movs r0, #8
_08028DB6:
strb r0, [r5, #0xe]
@@ -609,7 +609,7 @@ _08028DB6:
b _08028DE2
_08028DC0:
ldr r0, _08028DE4 @ =0x00002903
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
movs r0, #0
bl sub_08078A90
_08028DCC:
@@ -648,7 +648,7 @@ sub_08028DE8: @ 0x08028DE8
_08028E08: .4byte gLinkEntity
_08028E0C:
ldr r0, _08028E3C @ =0x00002902
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
movs r1, #0
movs r0, #4
strb r0, [r4, #0xc]
@@ -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
@@ -841,7 +841,7 @@ _08028F7A:
bl sub_08078A90
_08028F84:
adds r0, r4, #0
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
ldr r1, _08028F94 @ =gTextBox
ldrh r0, [r6, #2]
str r0, [r1, #0x10]
@@ -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
+6 -6
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08045B88
sub_08045B88: @ 0x08045B88
thumb_func_start BusinessScrubPrologue
BusinessScrubPrologue: @ 0x08045B88
push {lr}
ldr r1, _08045B94 @ =gUnk_080D19FC
bl EnemyFunctionHandler
@@ -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/button.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08081AC8
sub_08081AC8: @ 0x08081AC8
thumb_func_start Button
Button: @ 0x08081AC8
push {lr}
ldr r2, _08081ADC @ =gUnk_0811EE38
ldrb r1, [r0, #0xc]
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
+19 -19
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]
@@ -121,11 +121,11 @@ sub_08067228: @ 0x08067228
ands r2, r0
adds r0, r4, #0
movs r1, #0
bl sub_0806FF60
bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e]
adds r0, r4, #0
movs r1, #1
bl sub_0806FF60
bl SetExtraSpriteFrame
adds r0, r4, #0
adds r0, #0x5b
ldrb r0, [r0]
@@ -133,15 +133,15 @@ sub_08067228: @ 0x08067228
ands r2, r0
adds r0, r4, #0
movs r1, #2
bl sub_0806FF60
bl SetExtraSpriteFrame
adds r0, r4, #0
movs r1, #1
movs r2, #0
bl sub_0806FF88
bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0
movs r1, #1
movs r2, #2
bl sub_0806FFD8
bl SetSpriteSubEntryOffsetData2
adds r0, r4, #0
bl sub_0807000C
b _080672AC
@@ -154,15 +154,15 @@ _0806727E:
ands r2, r0
adds r0, r4, #0
movs r1, #0
bl sub_0806FF60
bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e]
adds r0, r4, #0
movs r1, #1
bl sub_0806FF60
bl SetExtraSpriteFrame
adds r0, r4, #0
movs r1, #1
movs r2, #0
bl sub_0806FF88
bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0
bl sub_0807000C
_080672AC:
@@ -217,7 +217,7 @@ _08067300: .4byte gUnk_08110CE8
sub_08067304: @ 0x08067304
push {lr}
ldr r1, _08067310 @ =gUnk_08110D00
bl sub_0806F1AC
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_08067310: .4byte gUnk_08110D00
@@ -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
+9 -9
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
@@ -50,15 +50,15 @@ _08064548:
subs r2, #1
adds r0, r4, #0
movs r1, #0
bl sub_0806FF60
bl SetExtraSpriteFrame
adds r0, r4, #0
movs r1, #1
adds r2, r5, #0
bl sub_0806FF60
bl SetExtraSpriteFrame
adds r0, r4, #0
movs r1, #1
movs r2, #0
bl sub_0806FF88
bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0
bl sub_0807000C
pop {r4, r5, pc}
@@ -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]
@@ -217,7 +217,7 @@ sub_08064688: @ 0x08064688
lsls r1, r1, #3
ldr r2, _080646A0 @ =gUnk_0810F894
adds r1, r1, r2
bl sub_0806F1AC
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806469C: .4byte gUnk_02002A40
asm/castorWildsStatue.s
+8 -8
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}
@@ -558,7 +558,7 @@ sub_08067790: @ 0x08067790
ldr r3, _080677B0 @ =gUnk_08110EF8
adds r2, r2, r3
adds r1, r1, r2
bl sub_0806F1AC
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_080677AC: .4byte gUnk_02002A40
asm/cat.s
+18 -18
View File
@@ -139,7 +139,7 @@ _080678D0:
b _08067900
_080678EA:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldrb r1, [r5]
movs r0, #0x80
ands r0, r1
@@ -210,7 +210,7 @@ _0806796C:
adds r0, r4, #0
bl sub_0806F69C
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08067978:
pop {r4, pc}
.align 2, 0
@@ -219,7 +219,7 @@ _08067978:
sub_0806797C: @ 0x0806797C
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -237,7 +237,7 @@ _08067998:
sub_0806799C: @ 0x0806799C
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldr r0, _080679C0 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
@@ -278,7 +278,7 @@ _080679E6:
b _08067A0A
_080679EE:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_08067BD4
adds r0, r4, #0
@@ -294,7 +294,7 @@ _08067A0A:
sub_08067A0C: @ 0x08067A0C
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -350,7 +350,7 @@ _08067A76:
sub_08067A78: @ 0x08067A78
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -497,7 +497,7 @@ sub_08067B80: @ 0x08067B80
strb r0, [r1]
adds r0, r5, #0
adds r1, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r5, #0
bl sub_08067DDC
ldr r0, _08067BC4 @ =gLinkEntity
@@ -567,7 +567,7 @@ sub_08067C18: @ 0x08067C18
push {lr}
movs r1, #6
strb r1, [r0, #0xc]
bl LoadAnimation
bl InitAnimationForceUpdate
pop {pc}
thumb_func_start sub_08067C24
@@ -584,7 +584,7 @@ sub_08067C24: @ 0x08067C24
bl sub_08067DDC
adds r0, r4, #0
movs r1, #7
bl LoadAnimation
bl InitAnimationForceUpdate
pop {r4, pc}
thumb_func_start sub_08067C44
@@ -641,7 +641,7 @@ _08067CA6:
bne _08067CDA
adds r0, r4, #0
movs r1, #2
bl LoadAnimation
bl InitAnimationForceUpdate
b _08067CEC
.align 2, 0
_08067CB4: .4byte gLinkEntity
@@ -669,12 +669,12 @@ _08067CD6:
_08067CDA:
adds r0, r4, #0
movs r1, #1
bl LoadAnimation
bl InitAnimationForceUpdate
b _08067CEC
_08067CE4:
adds r0, r4, #0
movs r1, #2
bl LoadAnimation
bl InitAnimationForceUpdate
_08067CEC:
movs r0, #0
ldrsb r0, [r5, r0]
@@ -806,7 +806,7 @@ sub_08067DCC: @ 0x08067DCC
adds r2, r0, #0
adds r2, #0x71
strb r1, [r2]
bl LoadAnimation
bl InitAnimationForceUpdate
pop {pc}
.align 2, 0
@@ -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]
@@ -847,11 +847,11 @@ sub_08067DFC: @ 0x08067DFC
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #5
bl LoadAnimation
bl InitAnimationForceUpdate
b _08067E28
_08067E22:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08067E28:
pop {pc}
.align 2, 0
asm/chaser.s
+5 -5
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0802B4D8
sub_0802B4D8: @ 0x0802B4D8
thumb_func_start Chaser
Chaser: @ 0x0802B4D8
push {r4, r5, lr}
adds r5, r0, #0
bl sub_080012DC
@@ -27,7 +27,7 @@ _0802B4F8: .4byte gUnk_080012C8
_0802B4FC:
ldr r4, _0802B514 @ =gUnk_080CD27C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -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
+2 -65
View File
@@ -6,69 +6,6 @@
.text
thumb_func_start sub_08083DD8
sub_08083DD8: @ 0x08083DD8
push {lr}
ldr r2, _08083DEC @ =gUnk_0811F7E8
ldrb r1, [r0, #0xa]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_08083DEC: .4byte gUnk_0811F7E8
thumb_func_start sub_08083DF0
sub_08083DF0: @ 0x08083DF0
push {lr}
ldr r2, _08083E04 @ =gUnk_0811F808
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_08083E04: .4byte gUnk_0811F808
thumb_func_start sub_08083E08
sub_08083E08: @ 0x08083E08
push {lr}
ldr r2, _08083E1C @ =gUnk_0811F818
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_08083E1C: .4byte gUnk_0811F818
thumb_func_start sub_08083E20
sub_08083E20: @ 0x08083E20
push {r4, lr}
adds r4, r0, #0
movs r0, #3
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #7
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
ldrb r1, [r4, #0x19]
movs r0, #0xd
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4, #0x19]
adds r0, r4, #0
bl sub_080842D8
adds r0, r4, #0
bl sub_08078828
pop {r4, pc}
thumb_func_start sub_08083E4C
sub_08083E4C: @ 0x08083E4C
push {r4, lr}
@@ -313,7 +250,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]
@@ -368,7 +305,7 @@ _08084086:
ldrb r0, [r1, #2]
ldrb r1, [r1, #3]
movs r2, #0
bl sub_080A7C00
bl CreateItemEntity
b _080840A4
_0808409C:
adds r1, #8
asm/chuchu.s
+37 -37
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0801EE18
sub_0801EE18: @ 0x0801EE18
thumb_func_start Chuchu
Chuchu: @ 0x0801EE18
push {r4, r5, lr}
adds r5, r0, #0
bl sub_080012DC
@@ -81,7 +81,7 @@ _0801EE9E:
strb r4, [r0]
ldr r4, _0801EED0 @ =gUnk_080CA21C
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -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/chuchuBoss.s
+23 -23
View File
@@ -7,12 +7,12 @@
.text
thumb_func_start sub_08025CA0
sub_08025CA0: @ 0x08025CA0
thumb_func_start ChuchuBoss
ChuchuBoss: @ 0x08025CA0
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08025CB8 @ =gUnk_080CC19C
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -58,7 +58,7 @@ sub_08025CD4: @ 0x08025CD4
strb r3, [r0, #3]
ldr r0, [r4, #0x54]
movs r1, #9
bl LoadAnimation
bl InitAnimationForceUpdate
b _08025D9C
_08025CFE:
adds r5, r4, #0
@@ -228,7 +228,7 @@ _08025DF2:
bne _08025E4C
adds r0, r5, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
b _08025E58
.align 2, 0
_08025E48: .4byte gUnk_080CC1B8
@@ -1095,7 +1095,7 @@ sub_080264AC: @ 0x080264AC
beq _080264D2
ldr r0, [r4, #0x54]
movs r1, #4
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_08027D20
_080264D2:
@@ -1178,7 +1178,7 @@ sub_0802653C: @ 0x0802653C
bl sub_08027548
ldr r0, [r4, #0x54]
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
ldr r0, _0802657C @ =gUnk_02034490
strb r5, [r0]
_08026572:
@@ -1488,7 +1488,7 @@ sub_08026774: @ 0x08026774
strb r0, [r1, #3]
ldr r0, [r4, #0x54]
movs r1, #1
bl LoadAnimation
bl InitAnimationForceUpdate
_080267C6:
adds r0, r4, #0
bl sub_080277F8
@@ -1519,7 +1519,7 @@ sub_080267D0: @ 0x080267D0
bl sub_08027B98
ldr r0, [r4, #0x54]
movs r1, #2
bl LoadAnimation
bl InitAnimationForceUpdate
_08026802:
add sp, #4
pop {r4, pc}
@@ -1611,7 +1611,7 @@ _08026888:
bl sub_08027870
ldr r0, [r4, #0x54]
movs r1, #3
bl LoadAnimation
bl InitAnimationForceUpdate
ldr r0, _080268C4 @ =0x000001A1
bl PlaySFX
_080268BE:
@@ -1654,7 +1654,7 @@ sub_080268EC: @ 0x080268EC
beq _08026912
ldr r0, [r4, #0x54]
movs r1, #4
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_08027D20
_08026912:
@@ -1680,7 +1680,7 @@ sub_08026914: @ 0x08026914
bl sub_08027548
ldr r0, [r4, #0x54]
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08026942:
adds r0, r4, #0
bl sub_080277F8
@@ -1841,7 +1841,7 @@ _08026A3E:
beq _08026A7E
adds r0, r5, #0
movs r1, #6
bl LoadAnimation
bl InitAnimationForceUpdate
b _08026A7E
_08026A6C:
adds r0, r5, #0
@@ -1851,7 +1851,7 @@ _08026A6C:
beq _08026A7E
adds r0, r5, #0
movs r1, #5
bl LoadAnimation
bl InitAnimationForceUpdate
_08026A7E:
lsls r0, r4, #0x18
cmp r0, #0
@@ -2141,7 +2141,7 @@ _08026C9C:
beq _08026CCC
adds r0, r4, #0
movs r1, #8
bl LoadAnimation
bl InitAnimationForceUpdate
b _08026CCC
_08026CBA:
adds r0, r4, #0
@@ -2151,7 +2151,7 @@ _08026CBA:
beq _08026CCC
adds r0, r4, #0
movs r1, #7
bl LoadAnimation
bl InitAnimationForceUpdate
_08026CCC:
adds r0, r5, #0
adds r0, #0x7c
@@ -2417,7 +2417,7 @@ _08026EA0:
strb r6, [r0, #3]
ldr r0, [r4, #0x54]
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
str r6, [sp]
adds r0, r4, #0
movs r1, #0x80
@@ -2605,7 +2605,7 @@ _08026FFE:
beq _0802705C
adds r0, r1, #0
movs r1, #8
bl LoadAnimation
bl InitAnimationForceUpdate
b _0802705C
.align 2, 0
_08027044: .4byte 0x00000155
@@ -2618,7 +2618,7 @@ _08027048:
beq _0802705C
adds r0, r1, #0
movs r1, #7
bl LoadAnimation
bl InitAnimationForceUpdate
_0802705C:
adds r0, r4, #0
bl sub_08027870
@@ -3196,7 +3196,7 @@ _080274AE:
beq _08027532
adds r0, r6, #0
movs r1, #0xc
bl LoadAnimation
bl InitAnimationForceUpdate
b _08027532
_080274E0:
adds r0, r6, #0
@@ -3206,7 +3206,7 @@ _080274E0:
beq _08027532
adds r0, r6, #0
movs r1, #0xb
bl LoadAnimation
bl InitAnimationForceUpdate
b _08027532
_080274F4:
adds r0, r6, #0
@@ -3216,7 +3216,7 @@ _080274F4:
beq _08027532
adds r0, r6, #0
movs r1, #0xa
bl LoadAnimation
bl InitAnimationForceUpdate
b _08027532
_08027508:
ldr r0, [r6, #0x54]
@@ -3248,7 +3248,7 @@ _08027532:
movs r0, #0
strb r0, [r1]
adds r0, r6, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, r5, r6, pc}
thumb_func_start sub_08027548
asm/clothesRack.s
+1 -15
View File
@@ -6,20 +6,6 @@
.text
thumb_func_start sub_0806DD78
sub_0806DD78: @ 0x0806DD78
push {lr}
ldr r2, _0806DD8C @ =gUnk_0811423C
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0806DD8C: .4byte gUnk_0811423C
thumb_func_start sub_0806DD90
sub_0806DD90: @ 0x0806DD90
push {r4, r5, r6, r7, lr}
@@ -173,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
+5 -5
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08038430
sub_08038430: @ 0x08038430
thumb_func_start CloudPiranha
CloudPiranha: @ 0x08038430
push {r4, lr}
adds r4, r0, #0
ldr r1, _0803844C @ =gUnk_080CF4F0
@@ -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_08000F10.s
+2 -2
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_08000F10
sub_08000F10: @ 0x08000F10
thumb_func_start CheckBits
CheckBits: @ 0x08000F10
ldr r3, _08000F50 @ =gUnk_03005E60
bx r3
asm/code_080011C4.s
+7 -7
View File
@@ -139,7 +139,7 @@ EnemyFunctionHandler: @ 0x0800129E
b _080012BA
_080012B2:
adds r0, r4, #0
bl sub_0800279C
bl GetNextFunction
adds r1, r5, #0
_080012BA:
lsls r0, r0, #2
@@ -1153,8 +1153,8 @@ gUnk_0800275C::
.byte 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x00, 0x06, 0x06, 0x06
.byte 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06
thumb_func_start sub_0800279C
sub_0800279C: @ 0x0800279C
thumb_func_start GetNextFunction
GetNextFunction: @ 0x0800279C
movs r1, #0x3a
ldrb r3, [r0, r1]
movs r2, #4
@@ -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
+6 -6
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
@@ -463,16 +463,16 @@ _0800429C:
strb r2, [r0, r1]
bx r3
thumb_func_start LoadAnimation
LoadAnimation: @ 0x080042AC
thumb_func_start InitAnimationForceUpdate
InitAnimationForceUpdate: @ 0x080042AC
push {lr}
bl InitializeAnimation
movs r2, #0xff
strb r2, [r0, #0x1f]
b _080042C0
thumb_func_start sub_080042B8
sub_080042B8: @ 0x080042B8
thumb_func_start UpdateAnimationSingleFrame
UpdateAnimationSingleFrame: @ 0x080042B8
movs r1, #1
non_word_aligned_thumb_func_start sub_080042BA
asm/code_080041E8.s
+6 -6
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
@@ -129,16 +129,16 @@ _0800429C:
strb r2, [r0, r1]
bx r3
thumb_func_start LoadAnimation
LoadAnimation: @ 0x080042AC
thumb_func_start InitAnimationForceUpdate
InitAnimationForceUpdate: @ 0x080042AC
push {lr}
bl InitializeAnimation
movs r2, #0xff
strb r2, [r0, #0x1f]
b _080042C0
thumb_func_start sub_080042B8
sub_080042B8: @ 0x080042B8
thumb_func_start UpdateAnimationSingleFrame
UpdateAnimationSingleFrame: @ 0x080042B8
movs r1, #1
non_word_aligned_thumb_func_start sub_080042BA
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_08016DF8.s
+1 -1
View File
@@ -946,7 +946,7 @@ sub_08017530: @ 0x08017530
beq _08017550
ldr r0, _080175D8 @ =gUnk_020342F8
subs r1, #1
bl sub_0801D5A8
bl ReadBit
cmp r0, #0
bne _08017550
bl DeleteThisEntity
asm/code_08018500.s
+4 -4
View File
@@ -130,7 +130,7 @@ _080185D4:
_080185EC: .4byte gUnk_0811E454
_080185F0:
ldrb r0, [r2, #1]
bl sub_0801E7F4
bl CheckKinstoneFused
_080185F6:
pop {pc}
@@ -326,7 +326,7 @@ sub_08018738: @ 0x08018738
cmp r0, r1
bne _08018760
adds r0, r2, #0
bl sub_0801E7F4
bl CheckKinstoneFused
adds r1, r0, #0
adds r0, r4, #0
bl sub_0801876C
@@ -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
+4 -4
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]
@@ -499,7 +499,7 @@ _0801981A:
b _0801982E
_08019824:
ldrh r0, [r4]
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
bl sub_080533CC
_0801982E:
adds r4, #0xc
@@ -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_0801C370.s
+1 -1
View File
@@ -41,7 +41,7 @@ _0801C398:
lsrs r0, r0, #1
strb r0, [r5, #4]
movs r0, #0xc
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0x10
bl sub_0801D7EC
ldr r4, _0801C478 @ =gUnk_02034CB0
asm/code_0801C85C.s
+6 -6
View File
@@ -1803,8 +1803,8 @@ _0801D5A2:
.align 2, 0
_0801D5A4: .4byte 0x99999999
thumb_func_start sub_0801D5A8
sub_0801D5A8: @ 0x0801D5A8
thumb_func_start ReadBit
ReadBit: @ 0x0801D5A8
lsrs r2, r1, #3
adds r0, r0, r2
ldrb r0, [r0]
@@ -1816,8 +1816,8 @@ sub_0801D5A8: @ 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_0801D714.s
+2 -2
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_0801D714
sub_0801D714: @ 0x0801D714
thumb_func_start LoadPalettesByPaletteGroupIndex
LoadPalettesByPaletteGroupIndex: @ 0x0801D714
push {r4, lr}
ldr r1, _0801D748 @ =gUnk_080FF850
lsls r0, r0, #2
asm/code_0801D79C.s
+12 -12
View File
@@ -1272,7 +1272,7 @@ sub_0801E0E0: @ 0x0801E0E0
_0801E0F8: .4byte gUnk_02022740
_0801E0FC:
adds r0, r2, #0
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
_0801E102:
pop {pc}
@@ -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:
@@ -2196,15 +2196,15 @@ _0801E7F0:
_0801E7F2:
pop {pc}
thumb_func_start sub_0801E7F4
sub_0801E7F4: @ 0x0801E7F4
thumb_func_start CheckKinstoneFused
CheckKinstoneFused: @ 0x0801E7F4
push {lr}
adds r1, r0, #0
subs r0, r1, #1
cmp r0, #0x63
bhi _0801E80C
ldr r0, _0801E808 @ =gUnk_02002C81
bl sub_0801D5A8
bl ReadBit
b _0801E80E
.align 2, 0
_0801E808: .4byte gUnk_02002C81
@@ -2221,7 +2221,7 @@ sub_0801E810: @ 0x0801E810
cmp r0, #0x63
bhi _0801E828
ldr r0, _0801E824 @ =gUnk_02002C8E
bl sub_0801D5A8
bl ReadBit
b _0801E82A
.align 2, 0
_0801E824: .4byte gUnk_02002C8E
@@ -2330,7 +2330,7 @@ sub_0801E8D4: @ 0x0801E8D4
movs r5, #0xa
_0801E8D8:
adds r0, r5, #0
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0801E990
adds r0, r5, #0
@@ -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
@@ -2478,7 +2478,7 @@ _0801E9F6:
cmp r5, #0xff
beq _0801EA14
adds r0, r5, #0
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0801EA10
_0801EA0A:
@@ -2498,7 +2498,7 @@ _0801EA1C:
cmp r5, #0xf2
beq _0801E9D6
adds r0, r5, #0
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0801EA34
movs r5, #0xf1
@@ -2552,7 +2552,7 @@ _0801EA84:
adds r0, r5, r0
ldrb r4, [r0]
adds r0, r4, #0
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
bne _0801EA9C
adds r0, r4, #0
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_0804AA84.s
+1 -1
View File
@@ -158,7 +158,7 @@ _0804ABA4:
ldr r0, _0804AC0C @ =gUnk_080D4138
adds r4, r4, r0
ldrb r0, [r4]
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
ldrb r0, [r4, #1]
bl sub_0801D7EC
ldr r0, _0804AC10 @ =gUnk_02017700
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_0804B058.s
+1 -1
View File
@@ -862,7 +862,7 @@ sub_0804B5D8: @ 0x0804B5D8
sub_0804B5DC: @ 0x0804B5DC
push {r4, r5, r6, lr}
movs r0, #0x2c
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804B5EE
ldr r0, _0804B618 @ =gUnk_080D6340
asm/code_0804B9F8.s
+25 -25
View File
@@ -748,7 +748,7 @@ sub_0804BE50: @ 0x0804BE50
bl SetLocalFlag
_0804BE62:
movs r0, #0x2f
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BE78
ldr r0, _0804BE74 @ =gUnk_080D8B24
@@ -758,7 +758,7 @@ _0804BE62:
_0804BE74: .4byte gUnk_080D8B24
_0804BE78:
movs r0, #0x2b
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BE90
ldr r0, _0804BE8C @ =gUnk_080D8AC4
@@ -768,7 +768,7 @@ _0804BE78:
_0804BE8C: .4byte gUnk_080D8AC4
_0804BE90:
movs r0, #0x26
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BEA8
ldr r0, _0804BEA4 @ =gUnk_080D8A74
@@ -778,7 +778,7 @@ _0804BE90:
_0804BEA4: .4byte gUnk_080D8A74
_0804BEA8:
movs r0, #0x2a
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BEC0
ldr r0, _0804BEBC @ =gUnk_080D8A34
@@ -788,7 +788,7 @@ _0804BEA8:
_0804BEBC: .4byte gUnk_080D8A34
_0804BEC0:
movs r0, #0x25
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BED8
ldr r0, _0804BED4 @ =gUnk_080D8A04
@@ -801,7 +801,7 @@ _0804BED8:
bl LoadRoomEntityList
_0804BEDE:
movs r0, #0x25
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BEF2
ldr r0, _0804BF20 @ =gUnk_080D8BBC
@@ -810,7 +810,7 @@ _0804BEDE:
bl sub_0807BB68
_0804BEF2:
movs r0, #0x26
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BF06
ldr r0, _0804BF28 @ =gUnk_080D8BFA
@@ -819,7 +819,7 @@ _0804BEF2:
bl sub_0807BB68
_0804BF06:
movs r0, #0x2f
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804BF1A
ldr r0, _0804BF30 @ =gUnk_080D8C68
@@ -1376,7 +1376,7 @@ sub_0804C334: @ 0x0804C334
movs r0, #0x1e
bl SetGlobalFlag
movs r0, #0x5b
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804C34C
ldr r0, _0804C374 @ =gUnk_080D9CC8
@@ -2378,7 +2378,7 @@ sub_0804C918: @ 0x0804C918
adds r2, r5, #0
bl sub_08000E96
movs r0, #0x19
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
pop {r4, r5, pc}
.align 2, 0
_0804C940: .4byte gUnk_086D4460
@@ -2778,7 +2778,7 @@ sub_0804CB10: @ 0x0804CB10
sub_0804CB14: @ 0x0804CB14
push {lr}
movs r0, #0x41
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804CB26
ldr r0, _0804CB28 @ =gUnk_080DDE88
@@ -6471,7 +6471,7 @@ sub_0804DE00: @ 0x0804DE00
push {r4, r5, r6, lr}
bl sub_080530C8
movs r0, #0xb
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804DE32
movs r0, #0x19
@@ -6611,14 +6611,14 @@ _0804DF2E:
bl LoadRoomEntityList
_0804DF48:
movs r0, #0x28
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
bne _0804DF58
ldr r0, _0804DF8C @ =gUnk_080EE8FC
bl LoadRoomEntityList
_0804DF58:
movs r0, #0x33
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804DF68
ldr r0, _0804DF90 @ =gUnk_080EE91C
@@ -6644,7 +6644,7 @@ _0804DF98:
bl LoadRoomEntityList
_0804DF9E:
movs r0, #0x1b
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804E02A
ldr r0, _0804DFF8 @ =gUnk_02002A40
@@ -6741,7 +6741,7 @@ _0804E07A:
cmp r0, #4
bls _0804E0B0
movs r0, #0xb
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
bne _0804E0B0
movs r0, #0x2b
@@ -7515,7 +7515,7 @@ sub_0804E614: @ 0x0804E614
sub_0804E618: @ 0x0804E618
push {lr}
movs r0, #0x21
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804E67A
movs r0, #0x42
@@ -8037,7 +8037,7 @@ sub_0804E9D0: @ 0x0804E9D0
bl LoadRoomEntityList
_0804E9EC:
movs r0, #0x12
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804E9FC
ldr r0, _0804EAC8 @ =gUnk_080F3C94
@@ -8401,7 +8401,7 @@ _0804EC5E:
bl LoadRoomEntityList
_0804EC64:
movs r0, #0x4e
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804EC74
ldr r0, _0804EC8C @ =gUnk_080F4F10
@@ -8987,7 +8987,7 @@ sub_0804F0C0: @ 0x0804F0C0
bl SetLocalFlag
_0804F0D6:
movs r0, #0xf
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804F0E6
ldr r0, _0804F118 @ =gUnk_080F61BC
@@ -9465,7 +9465,7 @@ _0804F3EC:
bl LoadRoomEntityList
_0804F406:
movs r0, #0x29
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
bne _0804F42A
ldr r0, _0804F44C @ =gUnk_080F7860
@@ -10214,7 +10214,7 @@ sub_0804FA68: @ 0x0804FA68
movs r0, #0
bl sub_0805ADD8
movs r0, #0x21
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804FA8E
movs r0, #0x80
@@ -10658,7 +10658,7 @@ nullsub_433: @ 0x0804FC48
sub_0804FC4C: @ 0x0804FC4C
push {lr}
movs r0, #0xe
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
bne _0804FC5E
ldr r1, _0804FC64 @ =gRoomVars
@@ -10739,7 +10739,7 @@ sub_0804FCA4: @ 0x0804FCA4
sub_0804FCA8: @ 0x0804FCA8
push {lr}
movs r0, #0x14
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
beq _0804FCBA
ldr r0, _0804FCCC @ =gUnk_080F9FA8
@@ -10926,7 +10926,7 @@ sub_0804FD54: @ 0x0804FD54
sub_0804FD58: @ 0x0804FD58
push {lr}
movs r0, #0x21
bl sub_0801E7F4
bl CheckKinstoneFused
cmp r0, #0
bne _0804FD6A
ldr r0, _0804FD6C @ =gUnk_080FA5D0
asm/code_08050038.s
+2 -2
View File
@@ -678,7 +678,7 @@ _08050546:
movs r0, #5
bl sub_080503A8
movs r0, #9
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r4, #0
_08050586:
movs r0, #0x48
@@ -3990,7 +3990,7 @@ sub_08052010: @ 0x08052010
bl sub_0801D630
bl sub_080A4D34
movs r0, #0xa
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0
movs r1, #0
bl sub_0801D79C
asm/code_080526F8.s
+7 -7
View File
@@ -1394,7 +1394,7 @@ sub_08053178: @ 0x08053178
bne _080531DC
ldr r0, _080531F4 @ =gUnk_02002AA0
ldrb r1, [r5, #1]
bl sub_0801D5A8
bl ReadBit
cmp r0, #0
bne _080531DC
movs r0, #1
@@ -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
@@ -1594,9 +1594,9 @@ sub_08053320: @ 0x08053320
_08053362:
bl sub_08053390
movs r0, #0xb
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0xc
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0
movs r1, #0
bl sub_0801D79C
@@ -2215,7 +2215,7 @@ sub_08053800: @ 0x08053800
strb r2, [r1, #7]
adds r0, r5, #0
adds r0, #0x8a
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
adds r0, r5, #0
adds r0, #0x3a
bl sub_0801D7EC
@@ -2467,7 +2467,7 @@ sub_08053A1C: @ 0x08053A1C
movs r0, #8
strh r0, [r1, #8]
ldr r0, _08053A54 @ =0x00000F07
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
ldr r1, _08053A58 @ =gTextBox
movs r0, #1
strb r0, [r1, #6]
@@ -3519,7 +3519,7 @@ sub_08054288: @ 0x08054288
lsls r0, r0, #3
adds r0, r0, r1
ldrh r0, [r0, #6]
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
pop {pc}
.align 2, 0
_08054298: .4byte gUnk_080FD5B4
asm/code_0805436C.s
+4 -4
View File
@@ -98,13 +98,13 @@ _08054406:
beq _08054410
_0805440A:
adds r0, r5, #0
bl sub_08054414
bl ForceEquipItem
_08054410:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_08054414
sub_08054414: @ 0x08054414
thumb_func_start ForceEquipItem
ForceEquipItem: @ 0x08054414
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
subs r0, r4, #1
@@ -3450,7 +3450,7 @@ sub_08055DC0: @ 0x08055DC0
cmp r0, #0
bne _08055DDC
ldr r0, _08055DE4 @ =0x00000A01
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
ldr r1, _08055DE8 @ =gUnk_02000080
ldrb r0, [r1, #6]
adds r0, #1
asm/code_08056418.s
+1 -14870
View File
File diff suppressed because it is too large Load Diff
asm/code_0805E744.s
+3 -3
View File
@@ -1058,7 +1058,7 @@ sub_0805EE88: @ 0x0805EE88
ands r1, r0
lsrs r0, r1, #2
adds r0, #0x2f
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
_0805EEAC:
pop {pc}
.align 2, 0
@@ -2695,7 +2695,7 @@ _0805FB28:
lsls r0, r0, #8
ldrb r1, [r1, #0x15]
adds r0, r0, r1
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
b _0805FBA4
.align 2, 0
_0805FB40: .4byte gUnk_02000080
@@ -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
+11 -11
View File
@@ -455,7 +455,7 @@ sub_0806F078: @ 0x0806F078
cmp r0, #0
beq _0806F096
adds r0, r2, #0
bl LoadAnimation
bl InitAnimationForceUpdate
b _0806F09C
_0806F096:
adds r0, r2, #0
@@ -610,8 +610,8 @@ _0806F1A0:
_0806F1A4: .4byte gUnk_02002A40
_0806F1A8: .4byte 0x000001C1
thumb_func_start sub_0806F1AC
sub_0806F1AC: @ 0x0806F1AC
thumb_func_start ShowNPCDialogue
ShowNPCDialogue: @ 0x0806F1AC
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
@@ -779,7 +779,7 @@ _0806F304:
b _0806F320
_0806F30C:
adds r0, r4, #0
bl sub_0801E7F4
bl CheckKinstoneFused
b _0806F320
_0806F314:
adds r0, r4, #0
@@ -821,7 +821,7 @@ _0806F34E:
bl TextboxNoOverlap
b _0806F35E
_0806F35A:
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
_0806F35E:
pop {r3}
mov r8, r3
@@ -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
+12 -5690
View File
File diff suppressed because it is too large Load Diff
asm/code_08070698.s
+5590
View File
File diff suppressed because it is too large Load Diff
asm/code_080732D0.s
+43 -43
View File
@@ -10,7 +10,7 @@
sub_080732D0: @ 0x080732D0
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_080002B8
cmp r0, #0x28
@@ -54,7 +54,7 @@ _08073328:
sub_0807332C: @ 0x0807332C
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldr r0, _08073344 @ =gLinkState
adds r0, #0x39
ldrb r0, [r0]
@@ -130,7 +130,7 @@ _080733B8: .4byte gUnk_03001000
sub_080733BC: @ 0x080733BC
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldrh r1, [r4, #0x2e]
movs r0, #0xf
ands r0, r1
@@ -354,7 +354,7 @@ _08073516:
bl PlaySFX
_08073576:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
_08073580: .4byte gLinkState
@@ -579,7 +579,7 @@ _0807371C: .4byte gUnk_0811BC28
_08073720: .4byte gArea
_08073724:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
b _0807372E
_0807372C:
strh r0, [r6, #8]
@@ -604,7 +604,7 @@ _08073736:
cmp r0, r1
bne _08073760
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
b _08073762
.align 2, 0
_0807375C: .4byte gUnk_0811BC30
@@ -665,7 +665,7 @@ _080737BA:
sub_080737BC: @ 0x080737BC
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0806F69C
ldr r0, [r4, #0x34]
@@ -759,7 +759,7 @@ _08073860:
str r0, [r4, #0x20]
_0807387A:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
@@ -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
@@ -820,7 +820,7 @@ _080738F0:
adds r0, r4, #0
bl sub_08003FC4
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
_08073900: .4byte 0xFFFFE800
@@ -1188,7 +1188,7 @@ sub_08073B8C: @ 0x08073B8C
cmp r0, #0
bne _08073BB8
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08073BB8:
ldrb r1, [r4, #0x10]
movs r0, #0x7f
@@ -1276,7 +1276,7 @@ _08073C58:
orrs r0, r1
strb r0, [r2, #0x10]
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08073C66:
pop {pc}
@@ -1560,7 +1560,7 @@ _08073E90:
bl sub_0806F948
_08073E9E:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0807B068
movs r0, #0x10
@@ -1787,7 +1787,7 @@ _08074048:
movs r3, #0
bl sub_0805EC9C
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, pc}
thumb_func_start sub_08074060
@@ -1845,7 +1845,7 @@ _080740C8: .4byte gLinkState
_080740CC: .4byte 0x0000080C
_080740D0:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_080740D6:
pop {r4, pc}
@@ -1853,7 +1853,7 @@ _080740D6:
sub_080740D8: @ 0x080740D8
push {r4, r5, r6, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _080740EA
@@ -3519,7 +3519,7 @@ _08074D20:
adds r0, r5, #0
bl sub_08003FC4
adds r0, r5, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, r5, r6, pc}
.align 2, 0
@@ -3866,7 +3866,7 @@ _08074F88: .4byte 0x00000737
sub_08074F8C: @ 0x08074F8C
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r3, r4, #0
adds r3, #0x5a
ldrb r0, [r3]
@@ -3918,7 +3918,7 @@ _08074FEA:
sub_08074FEC: @ 0x08074FEC
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -4005,7 +4005,7 @@ _08075088: .4byte 0x0000080C
sub_0807508C: @ 0x0807508C
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
movs r1, #0x80
lsls r1, r1, #6
adds r0, r4, #0
@@ -4099,7 +4099,7 @@ _08075138: .4byte 0x00000734
sub_0807513C: @ 0x0807513C
push {r4, r5, lr}
adds r5, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r4, r5, #0
adds r4, #0x5a
ldrb r0, [r4]
@@ -4164,7 +4164,7 @@ _080751B0: .4byte 0x000003C9
sub_080751B4: @ 0x080751B4
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -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]
@@ -5273,7 +5273,7 @@ sub_08075A0C: @ 0x08075A0C
_08075A3E:
movs r0, #0xf
adds r1, r6, #0
bl sub_08054414
bl ForceEquipItem
ldr r0, _08075A64 @ =gLinkState
ldr r1, [r0, #0x30]
ldr r2, _08075A68 @ =0xFF7FFFFF
@@ -5281,7 +5281,7 @@ _08075A3E:
str r1, [r0, #0x30]
movs r0, #0xf
adds r1, r6, #0
bl sub_08054414
bl ForceEquipItem
adds r0, r4, #0
adds r1, r5, #0
bl sub_08077E78
@@ -5305,7 +5305,7 @@ _08075A6C:
movs r0, #0x10
strb r0, [r4, #1]
adds r1, r6, #0
bl sub_08054414
bl ForceEquipItem
ldrb r1, [r5, #0x14]
movs r0, #6
ands r0, r1
@@ -5435,7 +5435,7 @@ _08075B86:
bne _08075BB8
movs r0, #0xf
adds r1, r4, #0
bl sub_08054414
bl ForceEquipItem
ldr r0, [r5, #0x30]
ldr r1, _08075BB4 @ =0xFF7FFFFF
ands r0, r1
@@ -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
+11 -11
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]
@@ -1892,7 +1892,7 @@ sub_08077AEC: @ 0x08077AEC
cmp r1, #2
beq _08077B12
movs r0, #0xf
bl sub_08054414
bl ForceEquipItem
_08077B12:
pop {pc}
.align 2, 0
asm/code_08077B98.s
+14 -14
View File
@@ -353,7 +353,7 @@ _08077E0A:
strh r1, [r0, #0x12]
lsls r1, r2, #0x18
lsrs r1, r1, #0x18
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_08077E54
pop {r4, pc}
@@ -365,7 +365,7 @@ UpdateItemAnim: @ 0x08077E24
push {r4, lr}
adds r4, r0, #0
ldr r0, _08077E38 @ =gLinkEntity
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_08077E54
pop {r4, pc}
@@ -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
@@ -2771,7 +2771,7 @@ _08079042:
ands r2, r0
adds r0, r4, #0
adds r1, r2, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08079062:
pop {r4, r5, r6, pc}
@@ -3951,7 +3951,7 @@ _0807991E:
cmp r0, #0
bne _0807992E
ldr r0, _08079934 @ =gLinkEntity
bl sub_080042B8
bl UpdateAnimationSingleFrame
_0807992E:
pop {r4, r5, pc}
.align 2, 0
@@ -4216,7 +4216,7 @@ _08079AF0:
cmp r0, r3
bne _08079B10
ldr r0, _08079B1C @ =gLinkEntity
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08079B10:
ldr r0, _08079B20 @ =gLinkState
strb r4, [r0]
@@ -7284,7 +7284,7 @@ _0807B218: .4byte 0x000002C2
sub_0807B21C: @ 0x0807B21C
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldr r0, [r4, #0x20]
cmp r0, #0
bge _0807B236
@@ -7323,11 +7323,11 @@ _0807B260: .4byte 0xFFFF8000
sub_0807B264: @ 0x0807B264
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
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
@@ -7369,7 +7369,7 @@ sub_0807B2B8: @ 0x0807B2B8
ldr r1, _0807B2F0 @ =0xFFFFE000
bl sub_08003FC4
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _0807B2EC
@@ -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
+1 -53
View File
@@ -72,7 +72,7 @@ CheckLocalFlagByOffset: @ 0x0807CB10
ldr r0, _0807CB20 @ =gGlobalFlags
adds r2, r2, r1
adds r1, r2, #0
bl sub_0801D5A8
bl ReadBit
pop {pc}
.align 2, 0
_0807CB20: .4byte gGlobalFlags
@@ -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
+17 -221
View File
@@ -4,210 +4,6 @@
.syntax unified
.text
thumb_func_start CheckRoomFlag
CheckRoomFlag: @ 0x0807CC3C
push {lr}
adds r1, r0, #0
ldr r0, _0807CC48 @ =gUnk_02034364
bl sub_0801D5A8
pop {pc}
.align 2, 0
_0807CC48: .4byte gUnk_02034364
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 sub_08000F10
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 sub_08000F10
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
@@ -2024,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
@@ -2587,7 +2383,7 @@ _0807DEB0:
beq _0807DEC2
adds r0, r4, #0
adds r1, r3, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_0807DEC2:
adds r0, r4, #0
adds r0, #0x82
@@ -3332,7 +3128,7 @@ sub_0807E40C: @ 0x0807E40C
adds r4, r1, #0
ldr r0, [r4]
ldrh r0, [r0, #2]
bl sub_0801E7F4
bl CheckKinstoneFused
str r0, [r4, #0x14]
ldr r2, _0807E428 @ =gUnk_02033280
ldrb r1, [r2, #7]
@@ -4090,7 +3886,7 @@ sub_0807E930: @ 0x0807E930
adds r1, #0x80
strh r2, [r1]
ldrh r1, [r3, #2]
bl LoadAnimation
bl InitAnimationForceUpdate
pop {pc}
thumb_func_start sub_0807E944
@@ -4149,7 +3945,7 @@ _0807E990:
strb r0, [r2, #0x18]
ldr r0, [r2]
ldrh r0, [r0, #2]
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
b _0807E9C2
_0807E9AE:
ldr r0, _0807E9CC @ =gTextBox
@@ -4304,7 +4100,7 @@ sub_0807EAB4: @ 0x0807EAB4
push {lr}
ldr r0, [r1]
ldrh r0, [r0, #2]
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
pop {pc}
thumb_func_start sub_0807EAC0
@@ -4323,7 +4119,7 @@ sub_0807EAD0: @ 0x0807EAD0
adds r4, r1, #0
ldr r0, [r4]
ldrh r0, [r0, #2]
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
ldr r1, _0807EAEC @ =gTextBox
movs r0, #1
strb r0, [r1, #6]
@@ -4346,13 +4142,13 @@ sub_0807EAF0: @ 0x0807EAF0
ldr r1, [r1]
adds r1, r1, r0
ldrh r0, [r1, #2]
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
b _0807EB16
.align 2, 0
_0807EB0C: .4byte gUnk_02033280
_0807EB10:
movs r0, #0
bl TextboxTryNoOverlap
bl TextboxNoOverlapFollow
_0807EB16:
pop {pc}
@@ -5439,7 +5235,7 @@ _0807F280:
_0807F28C:
adds r0, r4, #0
adds r1, r5, #0
bl sub_08054414
bl ForceEquipItem
pop {r4, r5, pc}
.align 2, 0
_0807F298: .4byte 0x0000FFFF
@@ -5634,7 +5430,7 @@ sub_0807F3D8: @ 0x0807F3D8
ldr r1, [r1, #4]
adds r1, r1, r0
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
adds r0, #0x58
ldrb r0, [r0]
@@ -6085,7 +5881,7 @@ _0807F704: .4byte gLinkState
sub_0807F708: @ 0x0807F708
push {lr}
ldr r1, [r1, #4]
bl sub_0806F1AC
bl ShowNPCDialogue
pop {pc}
.align 2, 0
@@ -6104,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
@@ -8192,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
@@ -8365,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_080A3480.s
+4 -4
View File
@@ -268,9 +268,9 @@ _080A365E:
movs r0, #0
bl sub_0801DA90
movs r0, #0xb
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0xc
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0
movs r1, #0
bl sub_0801D79C
@@ -348,7 +348,7 @@ sub_080A36F8: @ 0x080A36F8
ldr r0, _080A375C @ =gUnk_08127CEC
adds r4, r4, r0
ldrb r0, [r4]
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
ldrb r0, [r4, #1]
bl sub_0801D7EC
ldr r0, _080A3760 @ =gUnk_02021F30
@@ -703,7 +703,7 @@ _080A39C8:
bl sub_080A3210
bl sub_080A4D34
movs r0, #0xa
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0
movs r1, #0
bl sub_0801D79C
asm/code_080A3BD0.s
+9 -9
View File
@@ -17,7 +17,7 @@ sub_080A3BD0: @ 0x080A3BD0
strb r1, [r0]
bl sub_080A4D34
movs r0, #0xcb
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
movs r0, #0x75
bl sub_0801D7EC
bl sub_080A4494
@@ -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]
@@ -1758,7 +1758,7 @@ _080A495A:
_080A4962:
adds r0, r3, #0
adds r0, #0xce
bl sub_0801D5A8
bl ReadBit
cmp r0, #0
beq _080A4970
movs r4, #1
@@ -2242,7 +2242,7 @@ sub_080A4D34: @ 0x080A4D34
push {lr}
bl sub_08053320
movs r0, #0xb5
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
ldr r1, _080A4D50 @ =gUnk_02002A40
adds r2, r1, #0
adds r2, #0xaa
@@ -2371,7 +2371,7 @@ sub_080A4DB8: @ 0x080A4DB8
ldrb r0, [r4]
cmp r0, #0
beq _080A4E4A
bl sub_0801D714
bl LoadPalettesByPaletteGroupIndex
_080A4E4A:
ldrb r0, [r4, #1]
cmp r0, #0
@@ -2975,7 +2975,7 @@ _080A52EC:
orrs r1, r0
lsrs r1, r1, #0x1f
ldrb r0, [r2]
bl sub_08054414
bl ForceEquipItem
_080A530A:
movs r0, #0x6a
bl PlaySFX
asm/code_080A5574.s
+136 -136
View File
File diff suppressed because it is too large Load Diff
asm/code_080AD90C.s
+50 -50
View File
@@ -211,7 +211,7 @@ sub_080ADA6C: @ 0x080ADA6C
ldrb r1, [r4, #0x14]
lsrs r1, r1, #1
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
pop {r4, pc}
.align 2, 0
_080ADAA4: .4byte gUnk_08132B28
@@ -236,7 +236,7 @@ sub_080ADAA8: @ 0x080ADAA8
b _080ADAD2
_080ADACC:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_080ADAD2:
pop {r4, pc}
@@ -271,7 +271,7 @@ _080ADAFC:
adds r1, #4
_080ADB0C:
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
b _080ADC08
.align 2, 0
_080ADB14: .4byte gLinkEntity
@@ -426,7 +426,7 @@ sub_080ADC14: @ 0x080ADC14
lsrs r1, r1, #1
adds r1, #4
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
b _080ADC5C
.align 2, 0
_080ADC40: .4byte gLinkState
@@ -440,7 +440,7 @@ _080ADC48:
b _080ADC5C
_080ADC56:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_080ADC5C:
pop {r4, pc}
.align 2, 0
@@ -463,7 +463,7 @@ sub_080ADC60: @ 0x080ADC60
b _080ADC82
_080ADC7C:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_080ADC82:
pop {pc}
@@ -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/cow.s
-448
View File
@@ -1,448 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08068F98
sub_08068F98: @ 0x08068F98
push {r4, lr}
adds r4, r0, #0
ldr r1, _08068FBC @ =gUnk_08111914
ldrb r0, [r4, #0xc]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_0806ED78
adds r0, r4, #0
bl sub_0806920C
pop {r4, pc}
.align 2, 0
_08068FBC: .4byte gUnk_08111914
thumb_func_start sub_08068FC0
sub_08068FC0: @ 0x08068FC0
push {r4, lr}
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xb]
strb r0, [r4, #0x14]
movs r0, #0x40
strh r0, [r4, #0x24]
adds r1, r4, #0
adds r1, #0x6d
movs r0, #0xff
strb r0, [r1]
adds r0, r4, #0
bl sub_0805ACC0
adds r2, r0, #0
cmp r2, #0
bne _08068FF4
ldrh r0, [r4, #0x2e]
adds r1, r4, #0
adds r1, #0x68
strh r0, [r1]
ldrh r0, [r4, #0x32]
adds r1, #2
strh r0, [r1]
b _08069000
_08068FF4:
lsrs r1, r2, #0x10
adds r0, r4, #0
adds r0, #0x68
strh r1, [r0]
adds r0, #2
strh r2, [r0]
_08069000:
adds r0, r4, #0
bl sub_0801E99C
adds r1, r4, #0
adds r1, #0x6c
strb r0, [r1]
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl LoadAnimation
pop {r4, pc}
thumb_func_start sub_08069018
sub_08069018: @ 0x08069018
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xd]
cmp r0, #0
bne _0806903A
adds r0, #1
strb r0, [r4, #0xd]
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x3c
strb r0, [r4, #0xf]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl LoadAnimation
_0806903A:
adds r0, r4, #0
bl sub_080042B8
ldrb r0, [r4, #0xf]
subs r0, #1
strb r0, [r4, #0xf]
lsls r0, r0, #0x18
lsrs r1, r0, #0x18
cmp r1, #0
bne _0806905E
ldrb r0, [r4, #0xe]
cmp r0, #0
bne _08069058
movs r0, #2
b _0806905A
_08069058:
movs r0, #3
_0806905A:
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
_0806905E:
adds r0, r4, #0
bl sub_0806924C
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08069068
sub_08069068: @ 0x08069068
push {r4, r5, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xd]
cmp r0, #0
bne _080690A4
adds r0, #1
strb r0, [r4, #0xd]
bl Random
movs r1, #2
ands r1, r0
subs r1, #1
ldrb r0, [r4, #0x14]
adds r1, r1, r0
movs r0, #3
ands r1, r0
strb r1, [r4, #0x14]
lsls r1, r1, #3
strb r1, [r4, #0x15]
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x3c
strb r0, [r4, #0xf]
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl LoadAnimation
_080690A4:
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_080042B8
movs r0, #0x2e
ldrsh r1, [r4, r0]
adds r2, r4, #0
adds r2, #0x68
movs r3, #0
ldrsh r0, [r2, r3]
subs r1, r1, r0
cmp r1, #0x10
ble _080690CC
ldrh r0, [r2]
adds r0, #0x10
strh r0, [r4, #0x2e]
movs r0, #1
strb r0, [r4, #0xf]
_080690CC:
movs r3, #0x10
rsbs r3, r3, #0
cmp r1, r3
bge _080690DE
ldrh r0, [r2]
subs r0, #0x10
strh r0, [r4, #0x2e]
movs r0, #1
strb r0, [r4, #0xf]
_080690DE:
movs r5, #0x32
ldrsh r1, [r4, r5]
adds r2, r4, #0
adds r2, #0x6a
movs r5, #0
ldrsh r0, [r2, r5]
subs r1, r1, r0
cmp r1, #0x10
ble _080690FA
ldrh r0, [r2]
adds r0, #0x10
strh r0, [r4, #0x32]
movs r0, #1
strb r0, [r4, #0xf]
_080690FA:
cmp r1, r3
bge _08069108
ldrh r0, [r2]
subs r0, #0x10
strh r0, [r4, #0x32]
movs r0, #1
strb r0, [r4, #0xf]
_08069108:
ldrb r0, [r4, #0xf]
subs r0, #1
strb r0, [r4, #0xf]
lsls r0, r0, #0x18
lsrs r1, r0, #0x18
cmp r1, #0
bne _0806911C
movs r0, #3
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
_0806911C:
adds r0, r4, #0
bl sub_0806924C
pop {r4, r5, pc}
thumb_func_start sub_08069124
sub_08069124: @ 0x08069124
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
ldr r1, _08069144 @ =gUnk_08111928
ldrb r0, [r4, #0xd]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_0806924C
pop {r4, pc}
.align 2, 0
_08069144: .4byte gUnk_08111928
thumb_func_start sub_08069148
sub_08069148: @ 0x08069148
push {r4, lr}
adds r4, r0, #0
bl Random
movs r1, #3
ands r0, r1
adds r0, #3
strb r0, [r4, #0xf]
movs r0, #1
strb r0, [r4, #0xd]
ldrb r1, [r4, #0x14]
adds r1, #8
adds r0, r4, #0
bl LoadAnimation
pop {r4, pc}
thumb_func_start sub_08069168
sub_08069168: @ 0x08069168
push {lr}
adds r2, r0, #0
adds r0, #0x5a
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
bge _08069186
movs r0, #2
strb r0, [r2, #0xd]
ldrb r1, [r2, #0x14]
adds r1, #0xc
adds r0, r2, #0
bl LoadAnimation
_08069186:
pop {pc}
thumb_func_start sub_08069188
sub_08069188: @ 0x08069188
push {lr}
adds r2, r0, #0
adds r3, r2, #0
adds r3, #0x5a
ldrb r1, [r3]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _080691B8
movs r0, #0
strb r0, [r3]
ldrb r0, [r2, #0xf]
subs r0, #1
strb r0, [r2, #0xf]
lsls r0, r0, #0x18
cmp r0, #0
bne _080691B8
movs r0, #3
strb r0, [r2, #0xd]
ldrb r1, [r2, #0x14]
adds r1, #0x10
adds r0, r2, #0
bl LoadAnimation
_080691B8:
pop {pc}
.align 2, 0
thumb_func_start sub_080691BC
sub_080691BC: @ 0x080691BC
push {lr}
adds r2, r0, #0
adds r0, #0x5a
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
bge _080691DE
movs r1, #0
movs r0, #1
strb r0, [r2, #0xc]
strb r1, [r2, #0xd]
ldrb r1, [r2, #0x14]
adds r1, #4
adds r0, r2, #0
bl LoadAnimation
_080691DE:
pop {pc}
thumb_func_start sub_080691E0
sub_080691E0: @ 0x080691E0
push {r4, lr}
adds r4, r0, #0
bl UpdateFuseInteraction
cmp r0, #0
beq _080691F4
movs r1, #0
movs r0, #1
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
_080691F4:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_080691F8
sub_080691F8: @ 0x080691F8
push {lr}
ldrb r1, [r0, #0xa]
lsls r1, r1, #3
ldr r2, _08069208 @ =gUnk_08111938
adds r1, r1, r2
bl sub_0806F1AC
pop {pc}
.align 2, 0
_08069208: .4byte gUnk_08111938
thumb_func_start sub_0806920C
sub_0806920C: @ 0x0806920C
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08069234 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
rsbs r0, r0, #0
lsrs r5, r0, #0x1f
adds r0, r4, #0
adds r0, #0x6d
ldrb r0, [r0]
cmp r5, r0
beq _08069244
cmp r5, #0
bne _08069238
adds r0, r4, #0
bl sub_08078778
b _08069244
.align 2, 0
_08069234: .4byte gLinkState
_08069238:
adds r0, r4, #0
adds r0, #0x6c
ldrb r1, [r0]
adds r0, r4, #0
bl sub_080787A8
_08069244:
adds r0, r4, #0
adds r0, #0x6d
strb r5, [r0]
pop {r4, r5, pc}
thumb_func_start sub_0806924C
sub_0806924C: @ 0x0806924C
push {r4, lr}
adds r4, r0, #0
adds r0, #0x39
movs r2, #0
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806929C
ldr r0, _08069278 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
beq _08069284
cmp r2, #2
bne _0806927C
movs r0, #4
strb r0, [r4, #0xc]
adds r0, r4, #0
bl sub_0806F118
b _0806928E
.align 2, 0
_08069278: .4byte gLinkState
_0806927C:
adds r0, r4, #0
bl sub_080691F8
b _0806928E
_08069284:
adds r0, r4, #0
bl sub_080691F8
bl sub_080791D0
_0806928E:
movs r0, #0xd4
bl PlaySFX
adds r1, r4, #0
adds r1, #0x39
movs r0, #0
strb r0, [r1]
_0806929C:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_080692A0
sub_080692A0: @ 0x080692A0
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xc]
cmp r0, #0
bne _080692C6
adds r0, #1
strb r0, [r2, #0xc]
ldrb r1, [r2, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #0xf
bl LoadAnimation
b _080692CC
_080692C6:
adds r0, r2, #0
bl sub_080042B8
_080692CC:
pop {pc}
.align 2, 0
asm/crenalBeanSprout.s
+7 -7
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0809631C
sub_0809631C: @ 0x0809631C
thumb_func_start CrenalBeanSprout
CrenalBeanSprout: @ 0x0809631C
push {lr}
ldr r2, _08096330 @ =gUnk_08123168
ldrb r1, [r0, #0xc]
@@ -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]
@@ -547,7 +547,7 @@ sub_08096740: @ 0x08096740
sub_08096758: @ 0x08096758
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -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
@@ -962,7 +962,7 @@ sub_08096A78: @ 0x08096A78
lsrs r1, r1, #1
adds r1, #8
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_08004168
ldrh r0, [r4, #0x32]
asm/crow.s
+8 -8
View File
@@ -7,12 +7,12 @@
.text
thumb_func_start sub_080327F4
sub_080327F4: @ 0x080327F4
thumb_func_start Crow
Crow: @ 0x080327F4
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0803280C @ =gUnk_080CE978
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -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
+12 -12
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]
@@ -60,7 +60,7 @@ sub_0806E4EC: @ 0x0806E4EC
strb r0, [r5, #0xe]
adds r0, r5, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_0806E50E:
ldrb r0, [r5, #0xe]
subs r0, #1
@@ -98,7 +98,7 @@ _0806E552:
adds r0, r5, #0
bl sub_0806E65C
adds r0, r5, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, r5, pc}
.align 2, 0
_0806E560: .4byte gUnk_081145C8
@@ -137,7 +137,7 @@ _0806E590:
str r0, [r4, #0x20]
adds r0, r4, #0
movs r1, #1
bl LoadAnimation
bl InitAnimationForceUpdate
_0806E5AA:
movs r1, #0xa0
lsls r1, r1, #6
@@ -164,7 +164,7 @@ _0806E5D4:
adds r0, r4, #0
bl sub_0806E65C
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
@@ -198,7 +198,7 @@ _0806E612:
ands r1, r5
adds r1, #2
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_0806E622:
adds r0, r4, #0
adds r0, #0x5a
@@ -215,7 +215,7 @@ _0806E638:
adds r0, r4, #0
bl sub_0806E65C
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {r4, r5, pc}
.align 2, 0
@@ -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]
@@ -317,11 +317,11 @@ sub_0806E6E0: @ 0x0806E6E0
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #1
bl LoadAnimation
bl InitAnimationForceUpdate
b _0806E70C
_0806E706:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_0806E70C:
pop {pc}
.align 2, 0
asm/cuccoAggr.s
+10 -10
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08038CA4
sub_08038CA4: @ 0x08038CA4
thumb_func_start CuccoAggr
CuccoAggr: @ 0x08038CA4
push {r4, r5, lr}
adds r5, r0, #0
bl sub_080012DC
@@ -27,7 +27,7 @@ _08038CC4: .4byte gUnk_080012C8
_08038CC8:
ldr r4, _08038CF4 @ =gUnk_080CF778
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -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/cuccoChickAggr.s
+3 -3
View File
@@ -7,12 +7,12 @@
.text
thumb_func_start sub_08022918
sub_08022918: @ 0x08022918
thumb_func_start CuccoChickAggr
CuccoChickAggr: @ 0x08022918
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08022930 @ =gUnk_080CBB64
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
asm/curtain.s
+4 -4
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_080481C0
sub_080481C0: @ 0x080481C0
thumb_func_start Curtain
Curtain: @ 0x080481C0
push {lr}
ldr r1, _080481CC @ =gUnk_080D1CC8
bl EnemyFunctionHandler
@@ -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
+8 -8
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]
@@ -55,7 +55,7 @@ _0806BDE6:
adds r1, r0, #0
adds r1, #4
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_0806F118
b _0806BE3A
@@ -68,7 +68,7 @@ _0806BE1C:
b _0806BE3A
_0806BE26:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl UpdateFuseInteraction
cmp r0, #0
@@ -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]
@@ -109,11 +109,11 @@ sub_0806BE54: @ 0x0806BE54
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #2
bl LoadAnimation
bl InitAnimationForceUpdate
b _0806BE80
_0806BE7A:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_0806BE80:
pop {pc}
.align 2, 0
asm/darkNut.s
+21 -21
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08020B80
sub_08020B80: @ 0x08020B80
thumb_func_start DarkNut
DarkNut: @ 0x08020B80
push {r4, lr}
adds r4, r0, #0
ldr r1, _08020B9C @ =gUnk_080CAA98
@@ -298,7 +298,7 @@ _08020DB0:
sub_08020DB4: @ 0x08020DB4
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -351,7 +351,7 @@ _08020E1A:
adds r0, r4, #0
bl sub_080AEF88
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08020E26:
pop {r4, pc}
@@ -359,7 +359,7 @@ _08020E26:
sub_08020E28: @ 0x08020E28
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -385,7 +385,7 @@ sub_08020E48: @ 0x08020E48
b _08020E76
_08020E5C:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -402,7 +402,7 @@ _08020E76:
sub_08020E78: @ 0x08020E78
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -486,7 +486,7 @@ _08020F26:
sub_08020F28: @ 0x08020F28
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -577,7 +577,7 @@ _08020FCC:
b _08020FE2
_08020FDC:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08020FE2:
pop {pc}
@@ -585,7 +585,7 @@ _08020FE2:
sub_08020FE4: @ 0x08020FE4
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -608,7 +608,7 @@ _0802100C:
sub_08021010: @ 0x08021010
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -673,7 +673,7 @@ _08021088:
b _080210A4
_08021090:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
ldrb r0, [r5]
cmp r0, #4
bne _080210A4
@@ -690,7 +690,7 @@ _080210A4:
sub_080210A8: @ 0x080210A8
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r2, r4, #0
adds r2, #0x5a
ldrb r1, [r2]
@@ -721,7 +721,7 @@ _080210E2:
sub_080210E4: @ 0x080210E4
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r2, r4, #0
adds r2, #0x5a
ldrb r1, [r2]
@@ -812,7 +812,7 @@ _08021190:
b _0802119E
_08021198:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_0802119E:
pop {pc}
@@ -828,7 +828,7 @@ sub_080211A0: @ 0x080211A0
b _080211CE
_080211B4:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -845,7 +845,7 @@ _080211CE:
sub_080211D0: @ 0x080211D0
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0802159C
adds r0, r4, #0
@@ -864,7 +864,7 @@ _080211F2:
sub_080211F4: @ 0x080211F4
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_08021600
adds r0, r4, #0
@@ -902,7 +902,7 @@ _0802122C:
ldrb r1, [r0]
adds r1, r1, r2
adds r0, r3, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08021244:
pop {r4, pc}
.align 2, 0
@@ -926,7 +926,7 @@ sub_0802124C: @ 0x0802124C
b _08021272
_0802126C:
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_08021272:
pop {r4, pc}
@@ -1278,7 +1278,7 @@ _080214E8:
_080214F0: .4byte gUnk_020000B0
_080214F4:
adds r0, r5, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_080214FA:
pop {r4, r5, pc}
asm/deathFx.s
+5 -5
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0808161C
sub_0808161C: @ 0x0808161C
thumb_func_start DeathFx
DeathFx: @ 0x0808161C
push {lr}
ldr r2, _08081630 @ =gUnk_0811EBFC
ldrb r1, [r0, #0xc]
@@ -64,7 +64,7 @@ _08081674:
bl sub_080AE008
adds r0, r4, #0
movs r1, #0
bl LoadAnimation
bl InitAnimationForceUpdate
ldr r0, _08081698 @ =0x00000129
bl PlaySFX
b _0808170C
@@ -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]
@@ -173,7 +173,7 @@ _0808175E:
sub_08081760: @ 0x08081760
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
asm/din.s
+8 -8
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]
@@ -58,7 +58,7 @@ _080647C2:
bl sub_0806F5A4
adds r1, r0, #0
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
b _08064824
.align 2, 0
_080647FC: .4byte gLinkEntity
@@ -78,7 +78,7 @@ _0806480A:
adds r0, #0x68
ldrb r1, [r0]
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08064824:
pop {r4, pc}
.align 2, 0
@@ -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]
@@ -129,11 +129,11 @@ sub_08064860: @ 0x08064860
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #6
bl LoadAnimation
bl InitAnimationForceUpdate
b _0806488C
_08064886:
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
_0806488C:
pop {pc}
.align 2, 0
asm/dog.s
+23 -23
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
@@ -89,7 +89,7 @@ _08069B72:
bl sub_0805E3A0
adds r0, r5, #0
movs r1, #0xa
bl LoadAnimation
bl InitAnimationForceUpdate
ldrb r0, [r5, #0x10]
ands r4, r0
cmp r4, #0
@@ -153,7 +153,7 @@ _08069C3C: .4byte gRoomControls
sub_08069C40: @ 0x08069C40
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_08069F90
cmp r0, #0
@@ -236,7 +236,7 @@ sub_08069CB8: @ 0x08069CB8
beq _08069CF6
ldrb r1, [r5]
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08069CF6:
pop {r4, r5, pc}
.align 2, 0
@@ -281,7 +281,7 @@ _08069D3C:
cmp r2, r1
beq _08069D4E
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08069D4E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -301,7 +301,7 @@ sub_08069D54: @ 0x08069D54
cmp r0, #0
beq _08069DD8
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_080AEF88
ldrh r1, [r4, #0x2a]
@@ -377,7 +377,7 @@ _08069DF6:
sub_08069DF8: @ 0x08069DF8
push {r4, lr}
adds r4, r0, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_08069F90
cmp r0, #0
@@ -435,7 +435,7 @@ sub_08069E50: @ 0x08069E50
adds r0, r4, #0
bl sub_0806A028
adds r0, r4, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
adds r6, r4, #0
adds r6, #0x58
ldrb r0, [r6]
@@ -459,7 +459,7 @@ _08069E88:
cmp r2, r1
beq _08069EA0
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08069EA0:
movs r0, #0x36
bl GetInventoryValue
@@ -469,7 +469,7 @@ _08069EA0:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #0x29
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_080788E0
movs r0, #0xd1
@@ -496,7 +496,7 @@ _08069EDC:
thumb_func_start sub_08069EE0
sub_08069EE0: @ 0x08069EE0
push {lr}
bl sub_080042B8
bl UpdateAnimationSingleFrame
pop {pc}
thumb_func_start sub_08069EE8
@@ -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
@@ -558,15 +558,15 @@ _08069F46:
subs r2, #1
adds r0, r4, #0
movs r1, #0
bl sub_0806FF60
bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e]
adds r0, r4, #0
movs r1, #1
bl sub_0806FF60
bl SetExtraSpriteFrame
adds r0, r4, #0
movs r1, #1
movs r2, #0
bl sub_0806FF88
bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0
bl sub_0807000C
pop {r4, pc}
@@ -586,7 +586,7 @@ sub_08069F6C: @ 0x08069F6C
cmp r1, r0
beq _08069F8C
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_08069F8C:
pop {r4, pc}
.align 2, 0
@@ -733,7 +733,7 @@ sub_0806A080: @ 0x0806A080
ldr r3, _0806A0A0 @ =gUnk_08111E34
adds r2, r2, r3
adds r1, r1, r2
bl sub_0806F1AC
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806A09C: .4byte gUnk_02002A40
@@ -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
+5 -5
View File
@@ -7,12 +7,12 @@
.text
thumb_func_start sub_08021FA8
sub_08021FA8: @ 0x08021FA8
thumb_func_start DoorMimic
DoorMimic: @ 0x08021FA8
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _08021FD4 @ =gUnk_080CB734
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r5
ldr r1, [r0]
@@ -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/dust.s
+3 -3
View File
@@ -7,12 +7,12 @@
.text
thumb_func_start sub_08044118
sub_08044118: @ 0x08044118
thumb_func_start Dust
Dust: @ 0x08044118
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08044130 @ =gUnk_080D1588
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
asm/enemy49.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0803CE80
sub_0803CE80: @ 0x0803CE80
thumb_func_start Enemy49
Enemy49: @ 0x0803CE80
push {lr}
ldr r2, _0803CE94 @ =gUnk_080D0448
ldrb r1, [r0, #0xc]
asm/enemy4D.s
+5 -5
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_0803EAEC
sub_0803EAEC: @ 0x0803EAEC
thumb_func_start Enemy4D
Enemy4D: @ 0x0803EAEC
push {lr}
ldr r1, _0803EAF8 @ =gUnk_080D0880
bl EnemyFunctionHandler
@@ -113,7 +113,7 @@ sub_0803EB44: @ 0x0803EB44
ldrb r1, [r4, #0x14]
lsls r1, r1, #2
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
adds r0, r4, #0
bl sub_0803EE8C
_0803EBB2:
@@ -316,7 +316,7 @@ sub_0803ED04: @ 0x0803ED04
ldrb r1, [r4, #0x14]
adds r1, #0x20
adds r0, r4, #0
bl LoadAnimation
bl InitAnimationForceUpdate
_0803ED3C:
pop {r4, pc}
.align 2, 0
@@ -364,7 +364,7 @@ sub_0803ED7C: @ 0x0803ED7C
cmp r0, #0
bne _0803ED94
adds r0, r2, #0
bl sub_080042B8
bl UpdateAnimationSingleFrame
b _0803EDD0
_0803ED94:
ldrb r0, [r2, #0xe]
asm/enemy50.s
+14 -14
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start sub_08040B2C
sub_08040B2C: @ 0x08040B2C
thumb_func_start Enemy50
Enemy50: @ 0x08040B2C
push {r4, r5, lr}
adds r5, r0, #0
ldrb r0, [r5, #0xa]
@@ -33,7 +33,7 @@ _08040B4E:
_08040B5C:
ldr r4, _08040B80 @ =gUnk_080D0DC4
adds r0, r5, #0
bl sub_0800279C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
@@ -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]

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