mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-09 12:04:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Identify player functions and update asm.h

Browse Source
This commit is contained in:
theo3
2021-12-28 12:08:30 -08:00
parent 9456e38606
commit 0f65f8fd50
442 changed files with 697 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ambientClouds.s
+2 -2
View File
@@ -116,7 +116,7 @@ _0808921C:
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl sub_08016A30
bl ResolveCollisionLayer
adds r0, r4, #0
movs r1, #0x15
bl ChangeObjPalette
@@ -222,7 +222,7 @@ _0808991A:
movs r0, #1
strb r0, [r5]
adds r0, r4, #0
bl sub_08016A30
bl ResolveCollisionLayer
adds r0, r4, #0
movs r1, #0x15
bl ChangeObjPalette
asm/armos.s
+1 -1
View File
@@ -459,7 +459,7 @@ _080304F0:
sub_080304F4: @ 0x080304F4
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_080309A8
ldrb r0, [r4, #0xe]
asm/bird.s
+5 -5
View File
@@ -196,7 +196,7 @@ _0809D2D6:
strh r0, [r1]
bl sub_08079184
bl sub_08078B48
bl sub_080791D0
bl ResetPlayerAnimationAndAction
bl sub_08077B20
adds r0, r7, #0
adds r0, #0x26
@@ -220,7 +220,7 @@ _0809D2D6:
strb r3, [r0]
_0809D3A8:
adds r0, r5, #0
bl sub_0806F69C
bl LinearMoveUpdate
mov r0, r8
movs r2, #0
ldrsh r1, [r0, r2]
@@ -499,7 +499,7 @@ _0809D5E6:
movs r1, #1
orrs r0, r1
strb r0, [r6, #0x18]
bl sub_080791D0
bl ResetPlayerAnimationAndAction
bl ResetPlayerEventPriority
ldr r1, _0809D664 @ =gUnk_02034490
movs r0, #0
@@ -524,7 +524,7 @@ _0809D5E6:
bl SetGlobalFlag
_0809D62E:
adds r0, r5, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r0, #0
ldrsh r1, [r7, r0]
adds r0, r5, #0
@@ -692,7 +692,7 @@ _0809D76C:
_0809D774: .4byte gRoomControls
_0809D778: .4byte gUnk_02034490
_0809D77C:
bl sub_080791D0
bl ResetPlayerAnimationAndAction
_0809D780:
pop {r4, pc}
.align 2, 0
asm/blockPushed.s
+1 -1
View File
@@ -243,7 +243,7 @@ _08083090: .4byte 0x0000010F
sub_08083094: @ 0x08083094
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_0800445C
ldrb r0, [r4, #0xe]
asm/bombarossa.s
+1 -1
View File
@@ -162,7 +162,7 @@ sub_0803350C: @ 0x0803350C
cmp r0, #0
bne _08033520
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
_08033520:
adds r2, r4, #0
adds r2, #0x76
asm/bossDoor.s
+2 -2
View File
@@ -221,7 +221,7 @@ _0808C382:
sub_0808C384: @ 0x0808C384
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -296,7 +296,7 @@ _0808C410: .4byte gUnk_081214F4
sub_0808C414: @ 0x0808C414
push {r4, r5, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/chestSpawner.s
+1 -1
View File
@@ -371,7 +371,7 @@ sub_080840A8: @ 0x080840A8
ldr r0, _08084148 @ =0x0000FFF8
strh r0, [r5, #0x36]
adds r0, r5, #0
bl sub_08016A30
bl ResolveCollisionLayer
adds r0, r5, #0
movs r1, #0x11
movs r2, #0
asm/cloudPiranha.s
+1 -1
View File
@@ -607,6 +607,6 @@ _080388A8:
subs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
_080388B2:
pop {r4, r5, r6, pc}
asm/code_080043E8.s
+4 -4
View File
@@ -179,9 +179,9 @@ sub_0800451C: @ 0x0800451C
cmp r1, #0xb
beq sub_08004542
cmp r1, #0xa
beq sub_0800455E
beq ResetCollisionLayer
cmp r1, #9
beq sub_0800455E
beq ResetCollisionLayer
cmp r1, #0x26
beq _0800457A
cmp r1, #0x27
@@ -205,8 +205,8 @@ sub_08004542: @ 0x08004542
strb r1, [r0, #0x19]
bx lr
non_word_aligned_thumb_func_start sub_0800455E
sub_0800455E: @ 0x0800455E
non_word_aligned_thumb_func_start ResetCollisionLayer
ResetCollisionLayer: @ 0x0800455E
movs r1, #0x38
movs r2, #1
strb r2, [r0, r1]
asm/code_08016984.s
+2 -2
View File
@@ -69,8 +69,8 @@ UpdateSpriteForCollisionLayer: @ 0x08016A04
_08016A28:
.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40
thumb_func_start sub_08016A30
sub_08016A30: @ 0x08016A30
thumb_func_start ResolveCollisionLayer
ResolveCollisionLayer: @ 0x08016A30
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #0x38
asm/code_0801967C.s
+1 -1
View File
@@ -3099,7 +3099,7 @@ sub_0801AD6C: @ 0x0801AD6C
adds r0, #0x38
strb r3, [r0]
adds r0, r5, #0
bl sub_08016A30
bl ResolveCollisionLayer
ldr r1, _0801ADD8 @ =gUnk_081091E4
ldrb r0, [r5, #8]
adds r0, r0, r1
asm/code_0804AA84.s
+2 -2
View File
@@ -187,8 +187,8 @@ _0804ACEC: .4byte gFadeControl
_0804ACF0: .4byte gArea
_0804ACF4: .4byte gUnk_02032EDC
thumb_func_start sub_0804ACF8
sub_0804ACF8: @ 0x0804ACF8
thumb_func_start RespawnAsMinish
RespawnAsMinish: @ 0x0804ACF8
push {lr}
bl sub_0804AD18
cmp r0, #0
asm/code_08077698.s
+2 -2
View File
@@ -137,7 +137,7 @@ sub_08077758: @ 0x08077758
.align 2, 0
_08077794: .4byte gPlayerState
_08077798:
bl sub_0807A108
bl DeleteClones
_0807779C:
movs r0, #0
_0807779E:
@@ -165,7 +165,7 @@ sub_080777A0: @ 0x080777A0
adds r1, #0xa0
movs r0, #1
strb r0, [r1]
bl sub_0807A108
bl DeleteClones
_080777CC:
movs r0, #1
b _0807787C
asm/code_08078778.s
+18 -18
View File
@@ -391,7 +391,7 @@ sub_08078AF0: @ 0x08078AF0
movs r1, #2
orrs r0, r1
strb r0, [r2, #0x11]
bl sub_0807A108
bl DeleteClones
pop {r4, pc}
.align 2, 0
_08078B40: .4byte gPlayerState
@@ -1239,7 +1239,7 @@ sub_0807919C: @ 0x0807919C
ands r0, r1
cmp r0, #0
bne _080791B4
bl sub_080791BC
bl SetPlayerActionNormal
b _080791B8
.align 2, 0
_080791B0: .4byte gPlayerState
@@ -1249,8 +1249,8 @@ _080791B8:
pop {pc}
.align 2, 0
thumb_func_start sub_080791BC
sub_080791BC: @ 0x080791BC
thumb_func_start SetPlayerActionNormal
SetPlayerActionNormal: @ 0x080791BC
ldr r0, _080791CC @ =gPlayerEntity
movs r2, #0
movs r1, #1
@@ -1261,8 +1261,8 @@ sub_080791BC: @ 0x080791BC
.align 2, 0
_080791CC: .4byte gPlayerEntity
thumb_func_start sub_080791D0
sub_080791D0: @ 0x080791D0
thumb_func_start ResetPlayerAnimationAndAction
ResetPlayerAnimationAndAction: @ 0x080791D0
push {lr}
ldr r3, _0807920C @ =gPlayerState
ldr r0, [r3, #0x30]
@@ -1318,8 +1318,8 @@ sub_0807921C: @ 0x0807921C
ldr r1, _08079254 @ =0xFECBF6FA
ands r0, r1
str r0, [r2, #0x30]
bl sub_08079938
bl sub_080791BC
bl ResolvePlayerAnimation
bl SetPlayerActionNormal
adds r0, r4, #0
bl sub_0805E374
pop {r4, pc}
@@ -2248,8 +2248,8 @@ _0807992E:
_08079930: .4byte gPlayerState
_08079934: .4byte gPlayerEntity
thumb_func_start sub_08079938
sub_08079938: @ 0x08079938
thumb_func_start ResolvePlayerAnimation
ResolvePlayerAnimation: @ 0x08079938
push {r4, lr}
ldr r3, _08079954 @ =gPlayerState
ldr r2, [r3, #0x30]
@@ -2865,8 +2865,8 @@ _08079DFC: .4byte gPlayerEntity
_08079E00: .4byte gPlayerState
_08079E04: .4byte 0x00000193
thumb_func_start sub_08079E08
sub_08079E08: @ 0x08079E08
thumb_func_start UpdatePlayerMovement
UpdatePlayerMovement: @ 0x08079E08
push {r4, lr}
ldr r0, _08079E50 @ =gPlayerEntity
ldrh r2, [r0, #0x24]
@@ -3279,8 +3279,8 @@ _0807A104:
adds r0, r2, #0
pop {r4, r5, pc}
thumb_func_start sub_0807A108
sub_0807A108: @ 0x0807A108
thumb_func_start DeleteClones
DeleteClones: @ 0x0807A108
push {lr}
ldr r1, _0807A148 @ =gPlayerClones
movs r0, #0
@@ -5131,8 +5131,8 @@ _0807AEDE:
.align 2, 0
_0807AEE0: .4byte gScreenTransition
thumb_func_start sub_0807AEE4
sub_0807AEE4: @ 0x0807AEE4
thumb_func_start UpdatePlayerSkills
UpdatePlayerSkills: @ 0x0807AEE4
push {r4, lr}
ldr r0, _0807AFE4 @ =gPlayerState
adds r4, r0, #0
@@ -5471,7 +5471,7 @@ sub_0807B144: @ 0x0807B144
ldr r1, _0807B170 @ =gPlayerState
movs r0, #0x81
strb r0, [r1, #2]
bl sub_080791BC
bl SetPlayerActionNormal
pop {pc}
.align 2, 0
_0807B170: .4byte gPlayerState
@@ -5501,7 +5501,7 @@ sub_0807B178: @ 0x0807B178
ldr r1, _0807B1A4 @ =gPlayerState
movs r0, #0x81
strb r0, [r1, #2]
bl sub_080791BC
bl SetPlayerActionNormal
pop {pc}
.align 2, 0
_0807B1A4: .4byte gPlayerState
asm/code_0807F0D8.s
+1 -1
View File
@@ -485,7 +485,7 @@ sub_0807FF6C: @ 0x0807FF6C
adds r0, #4
strh r1, [r0]
bl ResetPlayer
bl sub_080791D0
bl ResetPlayerAnimationAndAction
ldr r0, _0807FFCC @ =gUnk_03004030
ldrb r0, [r0, #8]
cmp r0, #0
asm/code_080A29BC.s
+4 -4
View File
@@ -211,7 +211,7 @@ _080A2C04:
_080A2C0E:
ldrh r5, [r4, #0x32]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrh r1, [r4, #0x32]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
@@ -232,7 +232,7 @@ _080A2C38: .4byte gPlayerEntity
_080A2C3C:
ldrh r5, [r4, #0x2e]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrh r1, [r4, #0x2e]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
@@ -253,7 +253,7 @@ _080A2C64: .4byte gPlayerEntity
_080A2C68:
ldrh r5, [r4, #0x32]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrh r1, [r4, #0x32]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
@@ -274,7 +274,7 @@ _080A2C90: .4byte gPlayerEntity
_080A2C94:
ldrh r5, [r4, #0x2e]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrh r1, [r4, #0x2e]
lsls r0, r5, #0x10
asrs r0, r0, #0x10
asm/code_080A5574.s
+1 -1
View File
@@ -4234,7 +4234,7 @@ sub_080A6DF8: @ 0x080A6DF8
.align 2, 0
_080A6E14: .4byte gMenu
_080A6E18:
bl sub_080791D0
bl ResetPlayerAnimationAndAction
ldr r0, _080A6E3C @ =gPlayerEntity
adds r1, r0, #0
adds r1, #0x58
asm/crenalBeanSprout.s
+1 -1
View File
@@ -643,7 +643,7 @@ _08096802:
bl sub_080045D4
strb r0, [r4, #0x15]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
_0809681C:
movs r1, #0x80
lsls r1, r1, #7
asm/crow.s
+1 -1
View File
@@ -431,7 +431,7 @@ sub_08032AF4: @ 0x08032AF4
sub_08032B10: @ 0x08032B10
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r1, r4, #0
adds r1, #0x38
movs r0, #3
asm/cuccoAggr.s
+2 -2
View File
@@ -430,7 +430,7 @@ _08038FE0:
adds r0, r4, #0
bl sub_080390F8
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl GetNextFrame
b _08039018
@@ -439,7 +439,7 @@ _08038FF4: .4byte 0x0000FFFF
_08038FF8: .4byte gPlayerEntity
_08038FFC:
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
asm/deathFx.s
+1 -1
View File
@@ -190,7 +190,7 @@ _0808177E:
cmp r0, #0
beq _0808178C
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
_0808178C:
pop {r4, pc}
.align 2, 0
asm/doubleBookshelf.s
+1 -1
View File
@@ -136,7 +136,7 @@ sub_0809B034: @ 0x0809B034
sub_0809B050: @ 0x0809B050
push {r4, r5, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/dust.s
+1 -1
View File
@@ -633,7 +633,7 @@ _08044570:
bl sub_080045D4
strb r0, [r6, #0x15]
adds r0, r6, #0
bl sub_0806F69C
bl LinearMoveUpdate
b _080445BE
.align 2, 0
_080445A8: .4byte gPlayerState
asm/enemy50.s
+2 -2
View File
@@ -1050,7 +1050,7 @@ _08041250:
adds r1, #1
strb r0, [r1]
adds r0, r2, #0
bl sub_08016A30
bl ResolveCollisionLayer
adds r6, #2
movs r0, #6
ands r6, r0
@@ -1077,7 +1077,7 @@ _080412C8:
adds r0, #0x38
strb r3, [r0]
adds r0, r4, #0
bl sub_08016A30
bl ResolveCollisionLayer
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
asm/figurineDevice.s
+1 -1
View File
@@ -167,7 +167,7 @@ _08087CCA:
beq _08087D1A
movs r0, #0
strb r0, [r1]
bl sub_080791D0
bl ResetPlayerAnimationAndAction
movs r0, #0x5e
bl CheckLocalFlag
cmp r0, #0
asm/gleerok.s
+1 -1
View File
@@ -2883,7 +2883,7 @@ _0802E552:
lsls r0, r0, #8
strh r0, [r1, #0x24]
ldr r0, [r2, #0x3c]
bl sub_0806F69C
bl LinearMoveUpdate
movs r6, #0
movs r0, #0x3c
add r0, sb
asm/gyorgBossObject.s
+1 -1
View File
@@ -808,7 +808,7 @@ sub_080A1C04: @ 0x080A1C04
cmp r0, #0
bne _080A1C52
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_080A1E54
ldrb r0, [r4, #0xf]
asm/gyorgChild.s
+2 -2
View File
@@ -181,7 +181,7 @@ _0804877A:
sub_0804877C: @ 0x0804877C
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _080487AA
@@ -387,7 +387,7 @@ _08048900: .4byte gPlayerEntity
sub_08048904: @ 0x08048904
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl GetNextFrame
ldrb r0, [r4, #0x14]
asm/lilypadLarge.s
+8 -8
View File
@@ -183,7 +183,7 @@ _08085634:
cmp r0, #1
bne _08085654
adds r0, r6, #0
bl sub_0800455E
bl ResetCollisionLayer
b _0808565A
.align 2, 0
_0808564C: .4byte gPlayerEntity
@@ -768,7 +768,7 @@ sub_08085A98: @ 0x08085A98
adds r4, r0, #0
bl sub_08085EFC
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_08085F1C
ldr r1, [r4, #0x78]
@@ -901,14 +901,14 @@ _08085BAE:
b _08085BE8
_08085BB4:
adds r0, r5, #0
bl sub_0800455E
bl ResetCollisionLayer
adds r0, r5, #0
bl sub_080002B8
cmp r0, #0xd
bne _08085BE8
ldr r4, _08085C50 @ =gPlayerEntity
adds r0, r4, #0
bl sub_0800455E
bl ResetCollisionLayer
adds r0, r5, #0
bl sub_08085CDC
adds r0, r4, #0
@@ -934,7 +934,7 @@ _08085BE8:
cmp r0, #0
bne _08085C58
adds r0, r4, #0
bl sub_0800455E
bl ResetCollisionLayer
adds r0, r5, #0
bl sub_08085F1C
movs r0, #1
@@ -988,13 +988,13 @@ sub_08085C5C: @ 0x08085C5C
cmp r0, #0
beq _08085CAE
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrh r0, [r4, #0x24]
strh r0, [r5, #0x24]
ldrb r0, [r4, #0x15]
strb r0, [r5, #0x15]
adds r0, r5, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldr r2, _08085CA4 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #2
@@ -1006,7 +1006,7 @@ sub_08085C5C: @ 0x08085C5C
cmp r0, #1
bne _08085CA8
adds r0, r5, #0
bl sub_0800455E
bl ResetCollisionLayer
b _08085CAE
.align 2, 0
_08085CA0: .4byte gPlayerEntity
asm/loadRoomEntity.s
+1 -1
View File
@@ -85,7 +85,7 @@ _0804AE94:
_0804AEA0: .4byte gRoomControls
_0804AEA4:
adds r0, r5, #0
bl sub_08016A30
bl ResolveCollisionLayer
_0804AEAA:
adds r0, r5, #0
_0804AEAC:
asm/macroPlayer.s
+7 -7
View File
@@ -304,7 +304,7 @@ sub_0808CD00: @ 0x0808CD00
cmp r0, #0
beq _0808CD24
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
b _0808CD3E
_0808CD24:
ldrb r0, [r4, #0xc]
@@ -339,7 +339,7 @@ sub_0808CD44: @ 0x0808CD44
cmp r0, #0
beq _0808CD68
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
b _0808CD82
_0808CD68:
ldrb r0, [r4, #0xc]
@@ -374,7 +374,7 @@ sub_0808CD88: @ 0x0808CD88
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x2e
ldrsh r0, [r4, r1]
cmp r0, #0x7f
@@ -459,7 +459,7 @@ sub_0808CE38: @ 0x0808CE38
adds r4, r0, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x32
ldrsh r0, [r4, r1]
cmp r0, #0xc7
@@ -485,7 +485,7 @@ sub_0808CE68: @ 0x0808CE68
adds r4, r0, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x32
ldrsh r0, [r4, r1]
cmp r0, #0xc7
@@ -511,7 +511,7 @@ sub_0808CE98: @ 0x0808CE98
adds r4, r0, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r0, #0x32
ldrsh r1, [r4, r0]
movs r0, #0x90
@@ -532,7 +532,7 @@ sub_0808CEC0: @ 0x0808CEC0
adds r4, r0, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x32
ldrsh r0, [r4, r1]
cmp r0, #0xc7
asm/minecart.s
+1 -1
View File
@@ -92,7 +92,7 @@ _08091C94: .4byte gPlayerEntity
sub_08091C98: @ 0x08091C98
push {r4, r5, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldr r5, _08091CC0 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
asm/minecartDoor.s
+2 -2
View File
@@ -160,7 +160,7 @@ _08096BF4: .4byte 0x0000010B
sub_08096BF8: @ 0x08096BF8
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -256,7 +256,7 @@ _08096CAE:
sub_08096CB0: @ 0x08096CB0
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/non_matching/eu/HandlePlayerLife.inc
+1 -1
View File
@@ -51,7 +51,7 @@ _0801708A:
ldrb r0, [r0]
cmp r0, #0
bne _080170A4
bl sub_0807A108
bl DeleteClones
_080170A4:
bl sub_08079B24
cmp r0, #0
asm/non_matching/eu/sub_0802AC40.inc
+1 -1
View File
@@ -3,7 +3,7 @@
adds r4, r0, #0
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r5, r4, #0
adds r5, #0x7a
ldrb r0, [r5]
asm/non_matching/fallingBoulder/sub_0802C334.inc
+1 -1
View File
@@ -154,7 +154,7 @@ _0802C442:
_0802C45C: .4byte gRoomControls
_0802C460:
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x36
ldrsh r0, [r4, r1]
subs r0, r0, r5
asm/non_matching/itemGustJar/sub_08076F64.inc
+2 -2
View File
@@ -99,7 +99,7 @@ _0807701C:
eors r1, r2
strb r1, [r0, #0x15]
strh r5, [r0, #0x24]
bl sub_08079E08
bl UpdatePlayerMovement
b _08077110
.align 2, 0
_08077044: .4byte gPlayerState
@@ -151,7 +151,7 @@ _0807708C:
strb r0, [r2, #0x15]
movs r0, #0x80
strh r0, [r2, #0x24]
bl sub_08079E08
bl UpdatePlayerMovement
b _08077110
.align 2, 0
_080770B0: .4byte gPlayerState
asm/non_matching/itemMoleMitts/sub_080772A8.inc
+1 -1
View File
@@ -73,7 +73,7 @@ _0807732E:
ldrsh r0, [r5, r1]
cmp r0, #0
beq _08077344
bl sub_08079E08
bl UpdatePlayerMovement
_08077344:
ldrb r1, [r4, #0xe]
movs r0, #0x10
asm/non_matching/itemSword/sub_08075900.inc
+1 -1
View File
@@ -54,7 +54,7 @@ _08075962:
movs r0, #0xc0
lsls r0, r0, #2
strh r0, [r4, #0x24]
bl sub_08079E08
bl UpdatePlayerMovement
ldr r0, _08075994 @ =gScreenTransition
ldr r0, [r0]
movs r1, #3
asm/non_matching/mazaal/sub_0803473C.inc
+1 -1
View File
@@ -59,7 +59,7 @@ _08034798:
_080347A8:
strb r0, [r3, #0x15]
adds r0, r3, #0
bl sub_0806F69C
bl LinearMoveUpdate
_080347B0:
pop {r4, r5, pc}
.align 2, 0
asm/non_matching/mazaal/sub_080347B4.inc
+1 -1
View File
@@ -33,7 +33,7 @@ _080347E0:
_080347F0:
strb r0, [r2, #0x15]
adds r0, r2, #0
bl sub_0806F69C
bl LinearMoveUpdate
_080347F8:
pop {r4, r5, pc}
.align 2, 0
asm/non_matching/mazaal/sub_0803AA98.inc
+1 -1
View File
@@ -24,7 +24,7 @@
cmp r0, #0
bne _0803AB0A
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_0803B6F4
cmp r0, #0
asm/non_matching/player/PlayerNormal.inc
+4 -4
View File
@@ -91,7 +91,7 @@ _08070842:
ands r4, r1
cmp r4, #0
beq _08070852
bl sub_08079938
bl ResolvePlayerAnimation
b _08070BE4
_08070852:
adds r0, r5, #0
@@ -320,7 +320,7 @@ _08070A26:
b _08070BE4
_08070A32:
adds r0, r5, #0
bl sub_08073904
bl DoJump
bl RunQueuedAction
cmp r0, #0
beq _08070A42
@@ -357,7 +357,7 @@ _08070A7C:
movs r0, #0xff
strb r0, [r5, #0x15]
_08070A80:
bl sub_08079E08
bl UpdatePlayerMovement
adds r0, r5, #0
adds r0, #0x5a
ldrb r1, [r0]
@@ -465,7 +465,7 @@ _08070B1E:
lsls r0, r0, #2
strb r0, [r5, #0x15]
_08070B52:
bl sub_0807A108
bl DeleteClones
_08070B56:
movs r4, #0
ldr r3, _08070BB8 @ =gPlayerState
asm/non_matching/player/sub_08070DC4.inc
+4 -4
View File
@@ -4,7 +4,7 @@
bl UpdateAnimationSingleFrame
adds r0, r4, #0
bl sub_080085B0
bl sub_08079E08
bl UpdatePlayerMovement
bl UpdateFloorType
bl RunQueuedAction
cmp r0, #0
@@ -31,7 +31,7 @@
beq _08070E1C
_08070E10:
strb r5, [r6, #2]
bl sub_080791D0
bl ResetPlayerAnimationAndAction
b _08070E76
.align 2, 0
_08070E18: .4byte gPlayerState
@@ -60,8 +60,8 @@ _08070E32:
beq _08070E56
movs r0, #7
strb r0, [r6, #0x11]
bl sub_08079938
bl sub_080791BC
bl ResolvePlayerAnimation
bl SetPlayerActionNormal
b _08070E76
_08070E56:
movs r0, #1
asm/non_matching/player/sub_08072D54.inc
+5 -5
View File
@@ -11,7 +11,7 @@
cmp r0, #0
beq _08072D7A
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
b _08072E80
@@ -140,10 +140,10 @@ _08072E6C:
cmp r0, #0
beq _08072E7A
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
b _08072E7E
_08072E7A:
bl sub_08079E08
bl UpdatePlayerMovement
_08072E7E:
movs r0, #0
_08072E80:
@@ -164,7 +164,7 @@ _08072E80:
cmp r0, #1
bne _08072EAA
adds r0, r4, #0
bl sub_0800455E
bl ResetCollisionLayer
b _08072EB0
_08072EAA:
adds r0, r4, #0
@@ -187,7 +187,7 @@ _08072EB0:
ands r0, r1
cmp r0, #0
bne _08072F10
bl sub_080791BC
bl SetPlayerActionNormal
b _08072F10
.align 2, 0
_08072EDC: .4byte gPlayerState
asm/non_matching/player/sub_08073584.inc
+2 -2
View File
@@ -36,7 +36,7 @@ _080735C0:
strb r1, [r6, #2]
bl sub_0807921C
adds r0, r4, #0
bl sub_08073904
bl DoJump
movs r0, #0xe6
lsls r0, r0, #3
strh r0, [r6, #8]
@@ -114,7 +114,7 @@ _0807365A:
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
bl sub_08079E08
bl UpdatePlayerMovement
ldrb r2, [r4, #0x14]
lsls r3, r2, #2
ldrb r1, [r4, #0x15]
asm/non_matching/player/sub_080740D8.inc
+1 -1
View File
@@ -102,7 +102,7 @@ _0807418C:
cmp r0, #0
beq _080741AC
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
b _080741B0
.align 2, 0
_080741A4: .4byte gRoomControls
asm/non_matching/playerItem11/sub_08018E68.inc
+1 -1
View File
@@ -38,7 +38,7 @@ _08018EA8:
cmp r0, #0xff
beq _08018F46
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0x15]
cmp r0, #8
beq _08018EEA
asm/non_matching/playerItem12/sub_080701F8.inc
+1 -1
View File
@@ -57,7 +57,7 @@ _08070268:
adds r0, r5, #0
bl GetNextFrame
adds r0, r5, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _08070280
asm/non_matching/playerItem13/sub_080AD040.inc
+1 -1
View File
@@ -54,7 +54,7 @@ _080AD088:
cmp r0, #0x74
bne _080AD0B4
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
b _080AD0C8
.align 2, 0
_080AD0B0: .4byte gUnk_081320C4
asm/non_matching/playerItem15/sub_080A310C.inc
+1 -1
View File
@@ -26,7 +26,7 @@ _080A312A:
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
adds r0, #1
strb r0, [r4, #0xe]
asm/non_matching/playerItem3/sub_0801B680.inc
+1 -1
View File
@@ -48,7 +48,7 @@ _0801B6D0:
strb r0, [r4, #0x15]
_0801B6DC:
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r5, #0
adds r0, r4, #0
bl sub_0801B864
asm/non_matching/playerItemBow/sub_0801917C.inc
+1 -1
View File
@@ -31,7 +31,7 @@ _0801919C:
strb r0, [r4, #0x18]
_080191BA:
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
adds r0, #0x40
ldrb r1, [r0]
asm/object10.s
+1 -1
View File
@@ -369,7 +369,7 @@ _08084AEA:
.align 2, 0
_08084AF4: .4byte gPlayerState
_08084AF8:
bl sub_0807A108
bl DeleteClones
adds r0, r4, #0
movs r1, #0x30
movs r2, #0
asm/object12.s
+1 -1
View File
@@ -159,7 +159,7 @@ _080850C8:
sub_080850CC: @ 0x080850CC
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/object20.s
+1 -1
View File
@@ -29,7 +29,7 @@ sub_08087824: @ 0x08087824
cmp r0, #0
bne _08087836
adds r0, r4, #0
bl sub_08016A30
bl ResolveCollisionLayer
_08087836:
movs r0, #1
strb r0, [r4, #0xc]
asm/object21.s
+1 -1
View File
@@ -53,7 +53,7 @@ _080879EA:
cmp r0, #0
beq _08087A0C
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrh r1, [r4, #0x24]
movs r2, #0x24
ldrsh r0, [r4, r2]
asm/object35.s
+2 -2
View File
@@ -230,7 +230,7 @@ _0808BA0C: .4byte 0x0000010B
sub_0808BA10: @ 0x0808BA10
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -281,7 +281,7 @@ _0808BA68:
sub_0808BA6C: @ 0x0808BA6C
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/object36.s
+1 -1
View File
@@ -289,7 +289,7 @@ _0808BD34:
bl GetFacingDirection
strb r0, [r5, #0x15]
adds r0, r5, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r0, #0x2e
ldrsh r1, [r4, r0]
movs r0, #0x32
asm/object43.s
+1 -1
View File
@@ -364,7 +364,7 @@ _0808E162:
strb r0, [r4, #0x15]
_0808E17A:
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _0808E1BA
asm/object4B.s
+1 -1
View File
@@ -137,7 +137,7 @@ sub_0808F858: @ 0x0808F858
cmp r0, #0
beq _0808F884
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x80
lsls r1, r1, #6
adds r0, r4, #0
asm/object64.s
+1 -1
View File
@@ -43,7 +43,7 @@ sub_08093E3C: @ 0x08093E3C
cmp r0, #0
bne _08093E6A
adds r0, r4, #0
bl sub_08016A30
bl ResolveCollisionLayer
_08093E6A:
ldrb r1, [r4, #0xa]
adds r0, r4, #0
asm/object67.s
+1 -1
View File
@@ -337,7 +337,7 @@ _080943A8:
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x80
lsls r1, r1, #7
adds r0, r4, #0
asm/object79.s
+1 -1
View File
@@ -243,7 +243,7 @@ sub_08098130: @ 0x08098130
ldrh r0, [r0]
strh r0, [r4, #0x24]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldr r0, [r4, #0x30]
ldr r1, _08098164 @ =0xFFEC0000
adds r0, r0, r1
asm/object91.s
+1 -1
View File
@@ -933,7 +933,7 @@ _0809CAC4:
sub_0809CAC8: @ 0x0809CAC8
push {r4, r5, lr}
adds r5, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldr r2, _0809CB3C @ =gRoomControls
ldrh r0, [r2, #8]
movs r1, #0xe4
asm/object96.s
+1 -1
View File
@@ -125,7 +125,7 @@ sub_0809D860: @ 0x0809D860
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldr r1, [r6, #0x14]
adds r0, r5, #0
bl sub_080044EC
asm/object97.s
+2 -2
View File
@@ -330,7 +330,7 @@ sub_0809DBE4: @ 0x0809DBE4
sub_0809DC14: @ 0x0809DC14
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
movs r1, #0x80
lsls r1, r1, #6
adds r0, r4, #0
@@ -1099,7 +1099,7 @@ sub_0809E1F0: @ 0x0809E1F0
strh r2, [r1, #0x24]
_0809E208:
adds r0, r1, #0
bl sub_0806F69C
bl LinearMoveUpdate
pop {pc}
thumb_func_start sub_0809E210
asm/object98.s
+1 -1
View File
@@ -109,7 +109,7 @@ sub_0809E3E4: @ 0x0809E3E4
cmp r0, #0
bne _0809E40E
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
_0809E40E:
adds r2, r4, #0
adds r2, #0x74
asm/objectBlockingStairs.s
+2 -2
View File
@@ -351,7 +351,7 @@ sub_08093178: @ 0x08093178
adds r4, r0, #0
bl sub_0800445C
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
@@ -501,7 +501,7 @@ sub_08093280: @ 0x08093280
adds r4, r0, #0
bl sub_0800445C
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/objectOnPillar.s
+1 -1
View File
@@ -442,7 +442,7 @@ _08097140: .4byte 0x00004036
sub_08097144: @ 0x08097144
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_0800445C
adds r0, r4, #0
asm/pullableLever.s
+1 -1
View File
@@ -187,7 +187,7 @@ sub_08091338: @ 0x08091338
lsls r0, r0, #3
strb r0, [r4, #0x15]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_08091660
_0809135C:
asm/pullableMushroom.s
+2 -2
View File
@@ -517,7 +517,7 @@ _0808ADE2:
lsls r0, r0, #3
strh r0, [r1, #0x24]
ldr r0, [r4, #0x54]
bl sub_0806F69C
bl LinearMoveUpdate
_0808ADEE:
pop {r4, pc}
@@ -964,7 +964,7 @@ _0808B154:
cmp r7, #0x3f
bhi _0808B162
adds r0, r5, #0
bl sub_0806F69C
bl LinearMoveUpdate
_0808B162:
add sp, #0x88
pop {r4, r5, r6, r7, pc}
asm/pushableFurniture.s
+1 -1
View File
@@ -408,7 +408,7 @@ _0808FC58:
sub_0808FC5C: @ 0x0808FC5C
push {r4, r5, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/pushableGrave.s
+1 -1
View File
@@ -280,7 +280,7 @@ sub_080977A0: @ 0x080977A0
subs r0, #1
strb r0, [r4, #0xe]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_0800445C
b _080977E4
asm/pushableRock.s
+1 -1
View File
@@ -146,7 +146,7 @@ sub_0808A5E0: @ 0x0808A5E0
ldrh r0, [r0]
strh r0, [r4, #0x24]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl GetNextFrame
ldrb r1, [r5]
asm/pushableStatue.s
+1 -1
View File
@@ -525,7 +525,7 @@ _080895BC: .4byte gUnk_080B4488
sub_080895C0: @ 0x080895C0
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r1, r4, #0
adds r1, #0x86
ldrh r0, [r1]
asm/specialFx.s
+4 -4
View File
@@ -46,7 +46,7 @@ sub_080844E0: @ 0x080844E0
cmp r0, #0
bne _08084516
adds r0, r5, #0
bl sub_08016A30
bl ResolveCollisionLayer
_08084516:
ldrb r0, [r5, #0xa]
cmp r0, #0x20
@@ -187,7 +187,7 @@ sub_080845F8: @ 0x080845F8
lsrs r0, r0, #3
strb r0, [r4, #0x15]
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
_08084626:
adds r0, r4, #0
bl sub_08084630
@@ -283,7 +283,7 @@ sub_080846B0: @ 0x080846B0
strh r0, [r4, #0x24]
_080846CA:
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_080845DC
b _08084718
@@ -434,7 +434,7 @@ _080847CC: .4byte 0xFFFFE000
sub_080847D0: @ 0x080847D0
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_080845DC
pop {r4, pc}
asm/steam.s
+1 -1
View File
@@ -43,7 +43,7 @@ Steam: @ 0x08098168
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl sub_08016A30
bl ResolveCollisionLayer
ldr r1, _080981CC @ =gScreen
adds r2, r1, #0
adds r2, #0x66
asm/takkuri.s
+1 -1
View File
@@ -522,7 +522,7 @@ sub_0803BF2C: @ 0x0803BF2C
sub_0803BF48: @ 0x0803BF48
push {r4, lr}
adds r4, r0, #0
bl sub_0806F69C
bl LinearMoveUpdate
adds r1, r4, #0
adds r1, #0x38
movs r0, #3
asm/whirlwind.s
+1 -1
View File
@@ -261,7 +261,7 @@ sub_08092E94: @ 0x08092E94
cmp r0, #0
bne _08092ECE
adds r0, r4, #0
bl sub_0800455E
bl ResetCollisionLayer
ldrb r2, [r4, #0x1b]
movs r1, #0x3f
adds r0, r1, #0
asm/wizzrobeWind.s
+1 -1
View File
@@ -711,7 +711,7 @@ _0802FA02:
cmp r0, #0
beq _0802FA3E
adds r0, r4, #0
bl sub_0806F69C
bl LinearMoveUpdate
ldrb r0, [r6]
cmp r0, #0
bne _0802FA3E
data/scripts/cloudTops/script_PlayerAtSiroc.inc
+1 -1
View File
@@ -7,5 +7,5 @@ SCRIPT_START script_PlayerAtSiroc
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/ezlo/script_EzloCap.inc
+1 -1
View File
@@ -74,7 +74,7 @@ script_08012824:
SetPlayerIdle
_0807E9DC
CallWithArg sub_0807F5B0, 0x0000003c
Call sub_080791D0
Call ResetPlayerAnimationAndAction
EndBlock
SetSyncFlag 0x00000008
WaitForSyncFlagAndClear 0x00000004
data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc
+1 -1
View File
@@ -18,7 +18,7 @@ script_0801248A:
_0807E80C 0x00000000
WaitForFadeFinish
_0807E858 0x0000
Call sub_080791BC
Call SetPlayerActionNormal
LoadRoomEntityList gUnk_080F4D70
Call DeleteAllEnemies
SetEntityPositionRelative 0x0388, 0x0168
data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc
+1 -1
View File
@@ -8,5 +8,5 @@ SCRIPT_START script_PlayerDefeatedOctoroks
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc
+1 -1
View File
@@ -8,6 +8,6 @@ SCRIPT_START script_PlayerEzloBeingBullied
DoPostScriptAction 0x0004
Wait 0x003c
SetSyncFlag 0x00000001
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
.2byte 0x0000
data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc
+1 -1
View File
@@ -1,5 +1,5 @@
@ Get Ezlo cap Player
SCRIPT_START script_PlayerGetEzloCap
DoPostScriptAction 0x0015
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/intro/script_PlayerIntro.inc
+1 -1
View File
@@ -20,5 +20,5 @@ SCRIPT_START script_PlayerIntro
Call sub_08053250
EnablePlayerControl
Call sub_0807DF50
Call sub_080791D0
Call ResetPlayerAnimationAndAction
SCRIPT_END
data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc
+1 -1
View File
@@ -34,7 +34,7 @@ SCRIPT_START script_ZeldaTalkToSmith
BeginBlock
SetGlobalFlag 0x0013
Call sub_0807DF50
Call sub_080791D0
Call ResetPlayerAnimationAndAction
EnablePlayerControl
EndBlock
SCRIPT_END
data/scripts/cutscene/introAssembly/script_PlayerEnters.inc
+1 -1
View File
@@ -15,6 +15,6 @@ SCRIPT_START script_PlayerEnters
DoPostScriptAction 0x0000
Wait 0x000f
SetSyncFlag 0x00000020
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
.2byte 0x0000
data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc
+1 -1
View File
@@ -8,6 +8,6 @@ SCRIPT_START script_PlayerGetSword
MessageFromTargetPos 0x0501, 0x000e
WaitUntilTextboxCloses
SetSyncFlag 0x00000020
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
.2byte 0x0000
data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc
+1 -1
View File
@@ -29,5 +29,5 @@ script_08009EA4:
Call sub_08053250
EnablePlayerControl
Call sub_0807DF50
Call sub_080791D0
Call ResetPlayerAnimationAndAction
SCRIPT_END
data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc
+1 -1
View File
@@ -6,6 +6,6 @@ SCRIPT_START script_PlayerAtIntroBusinessScrub4
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000004
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
.2byte 0x0000
data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc
+1 -1
View File
@@ -5,5 +5,5 @@ SCRIPT_START script_PlayerIntroBusinessScrub1
SetAnimationState 0x0002
DoPostScriptAction 0x0000
SetSyncFlag 0x00000010
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc
+1 -1
View File
@@ -5,5 +5,5 @@ SCRIPT_START script_PlayerIntroBusinessScrub2
SetAnimationState 0x0002
DoPostScriptAction 0x0000
SetSyncFlag 0x00000010
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc
+1 -1
View File
@@ -5,5 +5,5 @@ SCRIPT_START script_PlayerIntroBusinessScrub3
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000010
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+1 -1
View File
@@ -28,7 +28,7 @@ SCRIPT_START script_Npc4EMonsters
CallWithArg DeleteManager36, 0x00000002
_0807F0C8 0x0000, 0x0000
Call sub_0806DC3C
Call sub_080791BC
Call SetPlayerActionNormal
CallWithArg EquipItem, 0x0000000d
CallWithArg sub_0807F29C, gUnk_080049F6
_0807F0B4 0x0001
data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
+1 -1
View File
@@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EVaatiAttacking
MessageFromTargetPos 0x1047, 0x0000
WaitUntilTextboxCloses
Call sub_0806DC3C
Call sub_080791BC
Call SetPlayerActionNormal
CallWithArg EquipItem, 0x0000000d
CallWithArg sub_0807F29C, gUnk_080049F6
Wait 0x001e
data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc
+1 -1
View File
@@ -6,5 +6,5 @@ SCRIPT_START script_PlayerAtIntroCeremony
SetSyncFlag 0x00000400
ClearSyncFlag 0x00000002
EndBlock
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/introCeremony/script_PlayerFainting.inc
+1 -1
View File
@@ -13,5 +13,5 @@ SCRIPT_START script_PlayerFainting
EndBlock
Call WaitForFrameHiBit
WaitForSyncFlag 0x80000000
Call sub_080791BC
Call SetPlayerActionNormal
SCRIPT_END

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