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

started naming script stuff

This commit is contained in:
Henny022p 2021-03-04 19:49:46 +01:00 committed by octorock
parent 1a8fad358a
commit a35c22e940
35 changed files with 804 additions and 779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/castleMaid.s
View File

@ -343,10 +343,10 @@ _08064776:
lsls r0, r0, #0x10
cmp r0, #0
beq _08064788
ldr r1, _0806478C @ =gUnk_02033280
ldr r1, _0806478C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08064788:
pop {r4, r5, r6, pc}
.align 2, 0
_0806478C: .4byte gUnk_02033280
_0806478C: .4byte gActiveScriptInfo

4
asm/castorWildsStatue.s
View File

@ -503,13 +503,13 @@ _08067734:
cmp r0, #0
beq _08067748
_08067742:
ldr r1, _0806774C @ =gUnk_02033280
ldr r1, _0806774C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08067748:
pop {pc}
.align 2, 0
_0806774C: .4byte gUnk_02033280
_0806774C: .4byte gActiveScriptInfo
thumb_func_start CastorWildsStatue_Fusion
CastorWildsStatue_Fusion: @ 0x08067750

4
asm/code_0805436C.s
View File

@ -875,7 +875,7 @@ _08054F60: .4byte 0x00004074
sub_08054F64: @ 0x08054F64
push {lr}
ldrb r0, [r0, #0xb]
ldr r3, _08054F7C @ =gUnk_02033280
ldr r3, _08054F7C @ =gActiveScriptInfo
ldr r2, [r3]
adds r1, r2, #0
ands r1, r0
@ -885,7 +885,7 @@ sub_08054F64: @ 0x08054F64
strb r0, [r3, #6]
b _08054F8C
.align 2, 0
_08054F7C: .4byte gUnk_02033280
_08054F7C: .4byte gActiveScriptInfo
_08054F80:
bics r2, r1
str r2, [r3]

8
asm/code_080732D0.s
View File

@ -3874,7 +3874,7 @@ sub_08074F8C: @ 0x08074F8C
bne _08074FAC
movs r0, #0
strb r0, [r3]
ldr r2, _08074FDC @ =gUnk_02033280
ldr r2, _08074FDC @ =gActiveScriptInfo
ldr r0, [r2]
movs r1, #4
orrs r0, r1
@ -3904,7 +3904,7 @@ _08074FAC:
lsls r0, r0, #3
b _08074FE8
.align 2, 0
_08074FDC: .4byte gUnk_02033280
_08074FDC: .4byte gActiveScriptInfo
_08074FE0: .4byte gPlayerState
_08074FE4:
movs r0, #0x80
@ -4310,13 +4310,13 @@ _080752D0:
cmp r0, #0
beq _080752E2
_080752DC:
ldr r1, _080752E4 @ =gUnk_02033280
ldr r1, _080752E4 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_080752E2:
pop {r4, r5, pc}
.align 2, 0
_080752E4: .4byte gUnk_02033280
_080752E4: .4byte gActiveScriptInfo
thumb_func_start sub_080752E8
sub_080752E8: @ 0x080752E8

100
asm/code_0807F0D8.s
View File

@ -125,7 +125,7 @@ sub_0807F1A0: @ 0x0807F1A0
movs r4, #0x32
ldrsh r3, [r3, r4]
bl sub_0807DEDC
ldr r2, _0807F1C0 @ =gUnk_02033280
ldr r2, _0807F1C0 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -133,7 +133,7 @@ sub_0807F1A0: @ 0x0807F1A0
pop {r4, pc}
.align 2, 0
_0807F1BC: .4byte gPlayerEntity
_0807F1C0: .4byte gUnk_02033280
_0807F1C0: .4byte gActiveScriptInfo
thumb_func_start sub_0807F1C4
sub_0807F1C4: @ 0x0807F1C4
@ -271,7 +271,7 @@ sub_0807F2A8: @ 0x0807F2A8
ldr r0, [r0]
cmp r0, #0
bne _0807F2C8
ldr r2, _0807F2C4 @ =gUnk_02033280
ldr r2, _0807F2C4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -279,15 +279,15 @@ sub_0807F2A8: @ 0x0807F2A8
b _0807F2CE
.align 2, 0
_0807F2C0: .4byte gPlayerState
_0807F2C4: .4byte gUnk_02033280
_0807F2C4: .4byte gActiveScriptInfo
_0807F2C8:
ldr r1, _0807F2D0 @ =gUnk_02033280
ldr r1, _0807F2D0 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F2CE:
pop {pc}
.align 2, 0
_0807F2D0: .4byte gUnk_02033280
_0807F2D0: .4byte gActiveScriptInfo
thumb_func_start sub_0807F2D4
sub_0807F2D4: @ 0x0807F2D4
@ -300,21 +300,21 @@ sub_0807F2D4: @ 0x0807F2D4
lsrs r1, r0, #0x18
cmp r1, #0
beq _0807F2F8
ldr r2, _0807F2F4 @ =gUnk_02033280
ldr r2, _0807F2F4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
b _0807F2FC
.align 2, 0
_0807F2F4: .4byte gUnk_02033280
_0807F2F4: .4byte gActiveScriptInfo
_0807F2F8:
ldr r0, _0807F300 @ =gUnk_02033280
ldr r0, _0807F300 @ =gActiveScriptInfo
strb r1, [r0, #6]
_0807F2FC:
pop {pc}
.align 2, 0
_0807F300: .4byte gUnk_02033280
_0807F300: .4byte gActiveScriptInfo
thumb_func_start sub_0807F304
sub_0807F304: @ 0x0807F304
@ -328,7 +328,7 @@ sub_0807F304: @ 0x0807F304
lsrs r1, r0, #0x18
cmp r1, #0
beq _0807F32C
ldr r2, _0807F328 @ =gUnk_02033280
ldr r2, _0807F328 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -336,14 +336,14 @@ sub_0807F304: @ 0x0807F304
b _0807F330
.align 2, 0
_0807F324: .4byte gPlayerEntity
_0807F328: .4byte gUnk_02033280
_0807F328: .4byte gActiveScriptInfo
_0807F32C:
ldr r0, _0807F334 @ =gUnk_02033280
ldr r0, _0807F334 @ =gActiveScriptInfo
strb r1, [r0, #6]
_0807F330:
pop {pc}
.align 2, 0
_0807F334: .4byte gUnk_02033280
_0807F334: .4byte gActiveScriptInfo
thumb_func_start sub_0807F338
sub_0807F338: @ 0x0807F338
@ -509,14 +509,14 @@ _0807F44C:
strb r0, [r3]
str r2, [r1, #4]
_0807F452:
ldr r2, _0807F460 @ =gUnk_02033280
ldr r2, _0807F460 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807F460: .4byte gUnk_02033280
_0807F460: .4byte gActiveScriptInfo
thumb_func_start sub_0807F464
sub_0807F464: @ 0x0807F464
@ -589,13 +589,13 @@ _0807F4BC:
strh r0, [r4, #0x2e]
b _0807F4F0
_0807F4EA:
ldr r1, _0807F4F4 @ =gUnk_02033280
ldr r1, _0807F4F4 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F4F0:
pop {r4, r5, r6, pc}
.align 2, 0
_0807F4F4: .4byte gUnk_02033280
_0807F4F4: .4byte gActiveScriptInfo
thumb_func_start sub_0807F4F8
sub_0807F4F8: @ 0x0807F4F8
@ -665,13 +665,13 @@ _0807F548:
strh r0, [r4, #0x32]
b _0807F57C
_0807F576:
ldr r1, _0807F580 @ =gUnk_02033280
ldr r1, _0807F580 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F57C:
pop {r4, r5, pc}
.align 2, 0
_0807F580: .4byte gUnk_02033280
_0807F580: .4byte gActiveScriptInfo
thumb_func_start sub_0807F584
sub_0807F584: @ 0x0807F584
@ -691,14 +691,14 @@ sub_0807F594: @ 0x0807F594
ldrb r0, [r0]
cmp r0, #0
beq _0807F5A6
ldr r1, _0807F5AC @ =gUnk_02033280
ldr r1, _0807F5AC @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F5A6:
pop {pc}
.align 2, 0
_0807F5A8: .4byte gPlayerState
_0807F5AC: .4byte gUnk_02033280
_0807F5AC: .4byte gActiveScriptInfo
thumb_func_start sub_0807F5B0
sub_0807F5B0: @ 0x0807F5B0
@ -757,7 +757,7 @@ _0807F602:
ldrsh r0, [r4, r2]
cmp r3, r0
bne _0807F628
ldr r2, _0807F624 @ =gUnk_02033280
ldr r2, _0807F624 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -765,15 +765,15 @@ _0807F602:
b _0807F62E
.align 2, 0
_0807F620: .4byte gRoomControls
_0807F624: .4byte gUnk_02033280
_0807F624: .4byte gActiveScriptInfo
_0807F628:
ldr r1, _0807F630 @ =gUnk_02033280
ldr r1, _0807F630 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F62E:
pop {r4, pc}
.align 2, 0
_0807F630: .4byte gUnk_02033280
_0807F630: .4byte gActiveScriptInfo
thumb_func_start sub_0807F634
sub_0807F634: @ 0x0807F634
@ -831,7 +831,7 @@ sub_0807F680: @ 0x0807F680
movs r3, #1
_0807F69A:
str r3, [r2, #0x14]
ldr r2, _0807F6B0 @ =gUnk_02033280
ldr r2, _0807F6B0 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -840,7 +840,7 @@ _0807F69A:
.align 2, 0
_0807F6A8: .4byte gPlayerEntity
_0807F6AC: .4byte gRoomControls
_0807F6B0: .4byte gUnk_02033280
_0807F6B0: .4byte gActiveScriptInfo
thumb_func_start sub_0807F6B4
sub_0807F6B4: @ 0x0807F6B4
@ -859,7 +859,7 @@ sub_0807F6B4: @ 0x0807F6B4
movs r3, #1
_0807F6CE:
str r3, [r2, #0x14]
ldr r2, _0807F6E4 @ =gUnk_02033280
ldr r2, _0807F6E4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -868,7 +868,7 @@ _0807F6CE:
.align 2, 0
_0807F6DC: .4byte gPlayerEntity
_0807F6E0: .4byte gRoomControls
_0807F6E4: .4byte gUnk_02033280
_0807F6E4: .4byte gActiveScriptInfo
thumb_func_start sub_0807F6E8
sub_0807F6E8: @ 0x0807F6E8
@ -1018,7 +1018,7 @@ _0807F7D2:
movs r2, #1
_0807F7E4:
str r2, [r4, #0x14]
ldr r2, _0807F7FC @ =gUnk_02033280
ldr r2, _0807F7FC @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -1027,7 +1027,7 @@ _0807F7E4:
.align 2, 0
_0807F7F4: .4byte gRoomVars
_0807F7F8: .4byte gSave
_0807F7FC: .4byte gUnk_02033280
_0807F7FC: .4byte gActiveScriptInfo
thumb_func_start sub_0807F800
sub_0807F800: @ 0x0807F800
@ -1049,7 +1049,7 @@ _0807F80C:
ldr r1, _0807F834 @ =gRoomVars
movs r0, #0
strb r0, [r1, #6]
ldr r2, _0807F838 @ =gUnk_02033280
ldr r2, _0807F838 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -1057,7 +1057,7 @@ _0807F80C:
pop {r4, pc}
.align 2, 0
_0807F834: .4byte gRoomVars
_0807F838: .4byte gUnk_02033280
_0807F838: .4byte gActiveScriptInfo
thumb_func_start sub_0807F83C
sub_0807F83C: @ 0x0807F83C
@ -1144,14 +1144,14 @@ sub_0807F8D0: @ 0x0807F8D0
push {lr}
ldr r1, [r1, #4]
bl sub_08003FC4
ldr r2, _0807F8E4 @ =gUnk_02033280
ldr r2, _0807F8E4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807F8E4: .4byte gUnk_02033280
_0807F8E4: .4byte gActiveScriptInfo
thumb_func_start sub_0807F8E8
sub_0807F8E8: @ 0x0807F8E8
@ -1314,14 +1314,14 @@ _0807F9C4: @ jump table
.4byte _0807FA24 @ case 22
.4byte _0807FA24 @ case 23
_0807FA24:
ldr r1, _0807FA2C @ =gUnk_02033280
ldr r1, _0807FA2C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
b _0807FA3A
.align 2, 0
_0807FA2C: .4byte gUnk_02033280
_0807FA2C: .4byte gActiveScriptInfo
_0807FA30:
ldr r2, _0807FA3C @ =gUnk_02033280
ldr r2, _0807FA3C @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -1329,7 +1329,7 @@ _0807FA30:
_0807FA3A:
pop {pc}
.align 2, 0
_0807FA3C: .4byte gUnk_02033280
_0807FA3C: .4byte gActiveScriptInfo
thumb_func_start sub_0807FA40
sub_0807FA40: @ 0x0807FA40
@ -1374,14 +1374,14 @@ _0807FA60: @ jump table
.4byte _0807FAC0 @ case 22
.4byte _0807FAC0 @ case 23
_0807FAC0:
ldr r1, _0807FAC8 @ =gUnk_02033280
ldr r1, _0807FAC8 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
b _0807FAD6
.align 2, 0
_0807FAC8: .4byte gUnk_02033280
_0807FAC8: .4byte gActiveScriptInfo
_0807FACC:
ldr r2, _0807FAD8 @ =gUnk_02033280
ldr r2, _0807FAD8 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -1389,7 +1389,7 @@ _0807FACC:
_0807FAD6:
pop {pc}
.align 2, 0
_0807FAD8: .4byte gUnk_02033280
_0807FAD8: .4byte gActiveScriptInfo
thumb_func_start sub_0807FADC
sub_0807FADC: @ 0x0807FADC
@ -1427,13 +1427,13 @@ _0807FB16:
bl sub_0808C688
b _0807FB22
_0807FB1C:
ldr r1, _0807FB24 @ =gUnk_02033280
ldr r1, _0807FB24 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807FB22:
pop {r4, pc}
.align 2, 0
_0807FB24: .4byte gUnk_02033280
_0807FB24: .4byte gActiveScriptInfo
thumb_func_start sub_0807FB28
sub_0807FB28: @ 0x0807FB28
@ -1460,13 +1460,13 @@ _0807FB3A:
.align 2, 0
_0807FB54: .4byte 0x00007FFF
_0807FB58:
ldr r1, _0807FB60 @ =gUnk_02033280
ldr r1, _0807FB60 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807FB5E:
pop {r4, pc}
.align 2, 0
_0807FB60: .4byte gUnk_02033280
_0807FB60: .4byte gActiveScriptInfo
thumb_func_start sub_0807FB64
sub_0807FB64: @ 0x0807FB64
@ -1552,13 +1552,13 @@ sub_0807FBD4: @ 0x0807FBD4
bl sub_080040A8
cmp r0, #0
beq _0807FBF4
ldr r1, _0807FBF8 @ =gUnk_02033280
ldr r1, _0807FBF8 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807FBF4:
pop {r4, pc}
.align 2, 0
_0807FBF8: .4byte gUnk_02033280
_0807FBF8: .4byte gActiveScriptInfo
thumb_func_start sub_0807FBFC
sub_0807FBFC: @ 0x0807FBFC

12
asm/code_080A5574.s
View File

@ -3709,7 +3709,7 @@ sub_080A7250: @ 0x080A7250
movs r2, #0x80
lsls r2, r2, #1
bl MemCopy
ldr r0, _080A7310 @ =gUnk_02033280
ldr r0, _080A7310 @ =gActiveScriptInfo
movs r2, #0xd5
lsls r2, r2, #2
adds r1, r4, r2
@ -3750,7 +3750,7 @@ _080A7300: .4byte gUnk_02032F14
_080A7304: .4byte gUnk_02001A00
_080A7308: .4byte gRoomControls
_080A730C: .4byte gUnk_03000420
_080A7310: .4byte gUnk_02033280
_080A7310: .4byte gActiveScriptInfo
_080A7314: .4byte gScreenTransition
_080A7318: .4byte gPlayerState
_080A731C: .4byte gUnk_02017654
@ -3775,7 +3775,7 @@ sub_080A7328: @ 0x080A7328
movs r1, #0x80
lsls r1, r1, #1
bl MemClear32
ldr r4, _080A7398 @ =gUnk_02033280
ldr r4, _080A7398 @ =gActiveScriptInfo
adds r0, r4, #0
movs r1, #0xc
bl MemClear32
@ -3803,7 +3803,7 @@ _080A7388: .4byte gFadeControl
_080A738C: .4byte gMenu
_080A7390: .4byte gRoomControls
_080A7394: .4byte gUnk_03000420
_080A7398: .4byte gUnk_02033280
_080A7398: .4byte gActiveScriptInfo
_080A739C: .4byte gUnk_02024490
_080A73A0: .4byte gUnk_02032EC0
_080A73A4: .4byte gScreenTransition
@ -3836,7 +3836,7 @@ _080A73B4:
movs r1, #0xea
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7480 @ =gUnk_02033280
ldr r1, _080A7480 @ =gActiveScriptInfo
movs r2, #0xc
bl MemCopy
movs r1, #0xaa
@ -3899,7 +3899,7 @@ _080A7470: .4byte gUnk_02032EC0
_080A7474: .4byte gPlayerState
_080A7478: .4byte gUnk_02025EB0
_080A747C: .4byte gUnk_0200B650
_080A7480: .4byte gUnk_02033280
_080A7480: .4byte gActiveScriptInfo
_080A7484: .4byte gUnk_03000420
_080A7488: .4byte gUnk_02001A00
_080A748C: .4byte gUnk_02024490

8
asm/figurineDevice.s
View File

@ -1386,7 +1386,7 @@ _0808863E:
movs r0, #0
str r0, [r4, #0x14]
_08088642:
ldr r2, _08088654 @ =gUnk_02033280
ldr r2, _08088654 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -1394,7 +1394,7 @@ _08088642:
pop {r4, pc}
.align 2, 0
_08088650: .4byte gPlayerEntity
_08088654: .4byte gUnk_02033280
_08088654: .4byte gActiveScriptInfo
thumb_func_start sub_08088658
sub_08088658: @ 0x08088658
@ -1414,7 +1414,7 @@ sub_08088658: @ 0x08088658
movs r0, #0
str r0, [r4, #0x14]
_08088678:
ldr r2, _08088688 @ =gUnk_02033280
ldr r2, _08088688 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -1422,4 +1422,4 @@ _08088678:
pop {r4, pc}
.align 2, 0
_08088684: .4byte gPlayerEntity
_08088688: .4byte gUnk_02033280
_08088688: .4byte gActiveScriptInfo

4
asm/fourElements.s
View File

@ -114,7 +114,7 @@ _080A028C: .4byte gUnk_0800A0B4
sub_080A0290: @ 0x080A0290
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _080A02BC @ =gUnk_02033280
ldr r5, _080A02BC @ =gActiveScriptInfo
ldr r0, [r5]
movs r1, #4
ands r0, r1
@ -133,7 +133,7 @@ sub_080A0290: @ 0x080A0290
strh r0, [r4, #0x36]
b _080A02CA
.align 2, 0
_080A02BC: .4byte gUnk_02033280
_080A02BC: .4byte gActiveScriptInfo
_080A02C0:
movs r1, #2
strb r1, [r4, #0xc]

8
asm/gorman.s
View File

@ -272,7 +272,7 @@ sub_0806991C: @ 0x0806991C
ldrb r0, [r0]
orrs r1, r0
strb r1, [r5, #0x14]
ldr r2, _080699A8 @ =gUnk_02033280
ldr r2, _080699A8 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -282,7 +282,7 @@ sub_0806991C: @ 0x0806991C
_0806999C: .4byte gUnk_08111C5C
_080699A0: .4byte gRoomControls
_080699A4: .4byte gUnk_08111C74
_080699A8: .4byte gUnk_02033280
_080699A8: .4byte gActiveScriptInfo
thumb_func_start sub_080699AC
sub_080699AC: @ 0x080699AC
@ -342,7 +342,7 @@ sub_080699AC: @ 0x080699AC
ldrb r0, [r0]
orrs r1, r0
strb r1, [r5, #0x14]
ldr r2, _08069A38 @ =gUnk_02033280
ldr r2, _08069A38 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -352,7 +352,7 @@ sub_080699AC: @ 0x080699AC
_08069A2C: .4byte gUnk_08111C84
_08069A30: .4byte gRoomControls
_08069A34: .4byte gUnk_08111C8C
_08069A38: .4byte gUnk_02033280
_08069A38: .4byte gActiveScriptInfo
thumb_func_start sub_08069A3C
sub_08069A3C: @ 0x08069A3C

4
asm/goronMerchant.s
View File

@ -50,7 +50,7 @@ _08069766:
movs r0, #0
_0806976E:
str r0, [r7, #0x14]
ldr r2, _08069780 @ =gUnk_02033280
ldr r2, _08069780 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -58,4 +58,4 @@ _0806976E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806977C: .4byte 0x00002C1E
_08069780: .4byte gUnk_02033280
_08069780: .4byte gActiveScriptInfo

4
asm/guardWithSpear.s
View File

@ -139,13 +139,13 @@ _08064168:
lsls r0, r0, #0x10
cmp r0, #0
beq _0806417A
ldr r1, _0806417C @ =gUnk_02033280
ldr r1, _0806417C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0806417A:
pop {r4, r5, r6, pc}
.align 2, 0
_0806417C: .4byte gUnk_02033280
_0806417C: .4byte gActiveScriptInfo
thumb_func_start sub_08064180
sub_08064180: @ 0x08064180

8
asm/kid.s
View File

@ -897,13 +897,13 @@ _0806274A:
.align 2, 0
_08062778: .4byte gRoomControls
_0806277C:
ldr r1, _08062784 @ =gUnk_02033280
ldr r1, _08062784 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08062782:
pop {r4, r5, pc}
.align 2, 0
_08062784: .4byte gUnk_02033280
_08062784: .4byte gActiveScriptInfo
thumb_func_start sub_08062788
sub_08062788: @ 0x08062788
@ -1228,13 +1228,13 @@ _08062A30:
lsls r0, r0, #0x10
cmp r0, #0
beq _08062A42
ldr r1, _08062A44 @ =gUnk_02033280
ldr r1, _08062A44 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08062A42:
pop {r4, r5, r6, pc}
.align 2, 0
_08062A44: .4byte gUnk_02033280
_08062A44: .4byte gActiveScriptInfo
thumb_func_start sub_08062A48
sub_08062A48: @ 0x08062A48

8
asm/minishEzlo.s
View File

@ -300,7 +300,7 @@ _08063186:
adds r1, #0x80
movs r0, #0x11
strh r0, [r1]
ldr r2, _080631B8 @ =gUnk_02033280
ldr r2, _080631B8 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -308,7 +308,7 @@ _08063186:
b _080631DC
.align 2, 0
_080631B4: .4byte 0x0000033F
_080631B8: .4byte gUnk_02033280
_080631B8: .4byte gActiveScriptInfo
_080631BC:
lsls r0, r3, #1
adds r0, r2, r0
@ -324,11 +324,11 @@ _080631CA:
adds r0, r4, #0
movs r3, #0
bl sub_0805EC9C
ldr r1, _080631E4 @ =gUnk_02033280
ldr r1, _080631E4 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_080631DC:
pop {r4, r5, r6, pc}
.align 2, 0
_080631E0: .4byte 0xFFFE0000
_080631E4: .4byte gUnk_02033280
_080631E4: .4byte gActiveScriptInfo

4
asm/object6.s
View File

@ -730,7 +730,7 @@ _08082E44:
rsbs r0, r0, #0
cmp r1, r0
ble _08082E5E
ldr r0, _08082E68 @ =gUnk_02033280
ldr r0, _08082E68 @ =gActiveScriptInfo
ldr r1, [r0]
movs r2, #2
orrs r1, r2
@ -741,7 +741,7 @@ _08082E5E:
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
_08082E68: .4byte gUnk_02033280
_08082E68: .4byte gActiveScriptInfo
thumb_func_start sub_08082E6C
sub_08082E6C: @ 0x08082E6C

16
asm/object6A.s
View File

@ -127,12 +127,12 @@ sub_08094B0C: @ 0x08094B0C
.align 2, 0
_08094B2C: .4byte 0x0000FFE0
_08094B30:
ldr r0, _08094B38 @ =gUnk_02033280
ldr r0, _08094B38 @ =gActiveScriptInfo
strb r3, [r0, #6]
_08094B34:
pop {pc}
.align 2, 0
_08094B38: .4byte gUnk_02033280
_08094B38: .4byte gActiveScriptInfo
thumb_func_start sub_08094B3C
sub_08094B3C: @ 0x08094B3C
@ -155,13 +155,13 @@ sub_08094B3C: @ 0x08094B3C
.align 2, 0
_08094B5C: .4byte 0x0000FFF3
_08094B60:
ldr r1, _08094B68 @ =gUnk_02033280
ldr r1, _08094B68 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08094B66:
pop {pc}
.align 2, 0
_08094B68: .4byte gUnk_02033280
_08094B68: .4byte gActiveScriptInfo
thumb_func_start sub_08094B6C
sub_08094B6C: @ 0x08094B6C
@ -2005,7 +2005,7 @@ _080959AC: .4byte gUnk_08122AF8
_080959B0: .4byte 0x0000FFFD
_080959B4: .4byte gUnk_08012C48
_080959B8:
ldr r0, _080959C8 @ =gUnk_02033280
ldr r0, _080959C8 @ =gActiveScriptInfo
ldr r1, [r0]
movs r2, #0x80
lsls r2, r2, #1
@ -2014,7 +2014,7 @@ _080959B8:
_080959C4:
pop {r4, r5, pc}
.align 2, 0
_080959C8: .4byte gUnk_02033280
_080959C8: .4byte gActiveScriptInfo
thumb_func_start sub_080959CC
sub_080959CC: @ 0x080959CC
@ -2550,7 +2550,7 @@ _08095DB8:
sub_08095DBC: @ 0x08095DBC
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _08095DF0 @ =gUnk_02033280
ldr r5, _08095DF0 @ =gActiveScriptInfo
ldr r0, [r5]
movs r1, #0x10
ands r0, r1
@ -2574,7 +2574,7 @@ _08095DE6:
bl sub_0807DDAC
b _08095E74
.align 2, 0
_08095DF0: .4byte gUnk_02033280
_08095DF0: .4byte gActiveScriptInfo
_08095DF4:
ldrb r0, [r4, #0xc]
cmp r0, #0

12
asm/object97.s
View File

@ -950,11 +950,11 @@ sub_0809E0D4: @ 0x0809E0D4
ldrb r0, [r1, #0xc]
cmp r0, #1
bhi _0809E0FE
ldr r0, _0809E0F8 @ =gUnk_02033280
ldr r0, _0809E0F8 @ =gActiveScriptInfo
strb r2, [r0, #6]
b _0809E1BC
.align 2, 0
_0809E0F8: .4byte gUnk_02033280
_0809E0F8: .4byte gActiveScriptInfo
_0809E0FC:
ldr r1, _0809E124 @ =gPlayerEntity
_0809E0FE:
@ -971,13 +971,13 @@ _0809E0FE:
bl sub_0807DEDC
ldr r0, _0809E128 @ =0x00000123
bl SoundReq
ldr r0, _0809E12C @ =gUnk_02033280
ldr r0, _0809E12C @ =gActiveScriptInfo
strb r4, [r0, #6]
b _0809E1BC
.align 2, 0
_0809E124: .4byte gPlayerEntity
_0809E128: .4byte 0x00000123
_0809E12C: .4byte gUnk_02033280
_0809E12C: .4byte gActiveScriptInfo
_0809E130:
ldr r1, [r5, #0x54]
cmp r1, #0
@ -1047,7 +1047,7 @@ _0809E170:
bl SoundReq
b _0809E1BC
_0809E1B6:
ldr r1, _0809E1C4 @ =gUnk_02033280
ldr r1, _0809E1C4 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0809E1BC:
@ -1055,7 +1055,7 @@ _0809E1BC:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0809E1C4: .4byte gUnk_02033280
_0809E1C4: .4byte gActiveScriptInfo
thumb_func_start sub_0809E1C8
sub_0809E1C8: @ 0x0809E1C8

4
asm/objectB9.s
View File

@ -193,7 +193,7 @@ _080A132E:
.align 2, 0
_080A136C: .4byte gPlayerState
_080A1370:
ldr r1, _080A1384 @ =gUnk_02033280
ldr r1, _080A1384 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_080A1376:
@ -204,7 +204,7 @@ _080A1376:
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A1384: .4byte gUnk_02033280
_080A1384: .4byte gActiveScriptInfo
thumb_func_start sub_080A1388
sub_080A1388: @ 0x080A1388

4
asm/percy.s
View File

@ -100,13 +100,13 @@ _0806B5EE:
.align 2, 0
_0806B5FC: .4byte gPlayerEntity
_0806B600:
ldr r1, _0806B608 @ =gUnk_02033280
ldr r1, _0806B608 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0806B606:
pop {r4, pc}
.align 2, 0
_0806B608: .4byte gUnk_02033280
_0806B608: .4byte gActiveScriptInfo
thumb_func_start sub_0806B60C
sub_0806B60C: @ 0x0806B60C

4
asm/phonograph.s
View File

@ -214,7 +214,7 @@ _0806EA86:
strh r1, [r0]
strh r1, [r6]
_0806EAA4:
ldr r1, _0806EAB8 @ =gUnk_02033280
ldr r1, _0806EAB8 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0806EAAA:
@ -224,7 +224,7 @@ _0806EAAA:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806EAB4: .4byte 0x80010000
_0806EAB8: .4byte gUnk_02033280
_0806EAB8: .4byte gActiveScriptInfo
thumb_func_start sub_0806EABC
sub_0806EABC: @ 0x0806EABC

8
asm/picolyteBottles.s
View File

@ -392,7 +392,7 @@ _0806E1C0:
ldr r1, _0806E1D8 @ =gScreenTransition
ldrh r0, [r4]
strh r0, [r1, #6]
ldr r2, _0806E1DC @ =gUnk_02033280
ldr r2, _0806E1DC @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -401,7 +401,7 @@ _0806E1C0:
.align 2, 0
_0806E1D4: .4byte 0x0000421C
_0806E1D8: .4byte gScreenTransition
_0806E1DC: .4byte gUnk_02033280
_0806E1DC: .4byte gActiveScriptInfo
thumb_func_start sub_0806E1E0
sub_0806E1E0: @ 0x0806E1E0
@ -476,11 +476,11 @@ sub_0806E250: @ 0x0806E250
movs r0, #1
str r0, [r4, #0x14]
_0806E266:
ldr r2, _0806E274 @ =gUnk_02033280
ldr r2, _0806E274 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_0806E274: .4byte gUnk_02033280
_0806E274: .4byte gActiveScriptInfo

4
asm/postman.s
View File

@ -19,12 +19,12 @@ sub_0806076C: @ 0x0806076C
ldr r0, [r7, #0x34]
cmp r0, #0
bge _08060790
ldr r1, _0806078C @ =gUnk_02033280
ldr r1, _0806078C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
b _080608D8
.align 2, 0
_0806078C: .4byte gUnk_02033280
_0806078C: .4byte gActiveScriptInfo
_08060790:
adds r4, r7, #0
adds r4, #0x69

28
asm/rem.s
View File

@ -201,7 +201,7 @@ _0806A568:
movs r0, #8
movs r1, #2
bl sub_08080964
ldr r2, _0806A5B4 @ =gUnk_02033280
ldr r2, _0806A5B4 @ =gActiveScriptInfo
ldr r0, [r2]
movs r1, #0x80
lsls r1, r1, #1
@ -227,7 +227,7 @@ _0806A590:
_0806A5B0:
pop {r4, r5, pc}
.align 2, 0
_0806A5B4: .4byte gUnk_02033280
_0806A5B4: .4byte gActiveScriptInfo
_0806A5B8: .4byte 0x0000011B
thumb_func_start nullsub_503
@ -305,7 +305,7 @@ sub_0806A630: @ 0x0806A630
movs r1, #0x12
bl InitializeAnimation
_0806A646:
ldr r0, _0806A670 @ =gUnk_02033280
ldr r0, _0806A670 @ =gActiveScriptInfo
ldr r0, [r0]
movs r1, #0x80
lsls r1, r1, #1
@ -327,7 +327,7 @@ _0806A65A:
_0806A66E:
pop {r4, pc}
.align 2, 0
_0806A670: .4byte gUnk_02033280
_0806A670: .4byte gActiveScriptInfo
thumb_func_start sub_0806A674
sub_0806A674: @ 0x0806A674
@ -370,7 +370,7 @@ _0806A6A0:
bl InitializeAnimation
b _0806A82A
_0806A6BE:
ldr r0, _0806A6E0 @ =gUnk_02033280
ldr r0, _0806A6E0 @ =gActiveScriptInfo
ldr r0, [r0]
movs r1, #0x80
lsls r1, r1, #1
@ -387,7 +387,7 @@ _0806A6BE:
strb r0, [r1]
b _0806A82A
.align 2, 0
_0806A6E0: .4byte gUnk_02033280
_0806A6E0: .4byte gActiveScriptInfo
_0806A6E4:
ldr r0, [r4, #0x50]
adds r0, #0x58
@ -581,7 +581,7 @@ sub_0806A830: @ 0x0806A830
movs r1, #2
bl sub_0805E3A0
_0806A84E:
ldr r0, _0806A88C @ =gUnk_02033280
ldr r0, _0806A88C @ =gActiveScriptInfo
ldr r0, [r0]
movs r1, #0x80
lsls r1, r1, #2
@ -611,7 +611,7 @@ _0806A860:
_0806A88A:
pop {r4, pc}
.align 2, 0
_0806A88C: .4byte gUnk_02033280
_0806A88C: .4byte gActiveScriptInfo
thumb_func_start sub_0806A890
sub_0806A890: @ 0x0806A890
@ -721,13 +721,13 @@ sub_0806A958: @ 0x0806A958
ldrb r0, [r0, #0xc]
cmp r0, #5
beq _0806A966
ldr r1, _0806A968 @ =gUnk_02033280
ldr r1, _0806A968 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0806A966:
pop {pc}
.align 2, 0
_0806A968: .4byte gUnk_02033280
_0806A968: .4byte gActiveScriptInfo
thumb_func_start sub_0806A96C
sub_0806A96C: @ 0x0806A96C
@ -758,14 +758,14 @@ _0806A992:
strb r3, [r4]
movs r0, #1
str r0, [r1, #0x14]
ldr r2, _0806A9AC @ =gUnk_02033280
ldr r2, _0806A9AC @ =gActiveScriptInfo
ldrb r1, [r2, #7]
orrs r0, r1
strb r0, [r2, #7]
_0806A9A8:
pop {r4, pc}
.align 2, 0
_0806A9AC: .4byte gUnk_02033280
_0806A9AC: .4byte gActiveScriptInfo
thumb_func_start sub_0806A9B0
sub_0806A9B0: @ 0x0806A9B0
@ -996,7 +996,7 @@ _0806AB5C:
cmp r0, #0
bge _0806AB6A
_0806AB64:
ldr r1, _0806AB70 @ =gUnk_02033280
ldr r1, _0806AB70 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0806AB6A:
@ -1004,7 +1004,7 @@ _0806AB6A:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806AB70: .4byte gUnk_02033280
_0806AB70: .4byte gActiveScriptInfo
thumb_func_start sub_0806AB74
sub_0806AB74: @ 0x0806AB74

8
asm/stockwell.s
View File

@ -635,14 +635,14 @@ sub_080654FC: @ 0x080654FC
ands r0, r1
cmp r0, #0
beq _08065518
ldr r1, _08065514 @ =gUnk_02033280
ldr r1, _08065514 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
b _08065522
.align 2, 0
_08065514: .4byte gUnk_02033280
_08065514: .4byte gActiveScriptInfo
_08065518:
ldr r2, _08065524 @ =gUnk_02033280
ldr r2, _08065524 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@ -650,7 +650,7 @@ _08065518:
_08065522:
pop {pc}
.align 2, 0
_08065524: .4byte gUnk_02033280
_08065524: .4byte gActiveScriptInfo
thumb_func_start sub_08065528
sub_08065528: @ 0x08065528

4
asm/windTribespeople.s
View File

@ -152,14 +152,14 @@ _0806CA7E:
ldrh r0, [r4, #0x10]
cmp r0, #0
beq _0806CA8A
ldr r1, _0806CA90 @ =gUnk_02033280
ldr r1, _0806CA90 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0806CA8A:
pop {r4, pc}
.align 2, 0
_0806CA8C: .4byte gUnk_08113B38
_0806CA90: .4byte gUnk_02033280
_0806CA90: .4byte gActiveScriptInfo
thumb_func_start WindTribespeople_Fusion
WindTribespeople_Fusion: @ 0x0806CA94

2
include/greatFairy.h
View File

@ -41,7 +41,7 @@ extern const s16 GreatFairy_RippleOffsets[10];
extern u32 gUnk_02034350;
extern RoomVars gRoomVars;
extern Screen gScreen;
extern struct_02033280 gUnk_02033280;
extern struct_02033280 gActiveScriptInfo;
extern u8 gUnk_0812079C[8];
extern s16 gSineTable[];
extern s8 gUnk_081207AC[];

6
include/script.h
View File

@ -3,12 +3,12 @@
#include "global.h"
typedef struct {
u16* unk_00;
typedef struct ScriptExecutionContext {
u16* scriptInstructionPointer;
u32 unk_04;
u32 unk_08;
u8 unk_0C[0x4]; // unused
u16 unk_10;
u16 wait;
u16 unk_12;
u32 unk_14;
u8 unk_18;

8
include/structures.h
View File

@ -121,13 +121,13 @@ extern struct_02024490 gUnk_02024490;
typedef struct {
u32 unk_00;
u16 unk_04;
u8 unk_06;
u8 unk_07;
u16 commandIndex;
u8 commandSize;
u8 flags;
u8 unk_08;
} struct_02033280;
extern struct_02033280 gUnk_02033280;
extern struct_02033280 gActiveScriptInfo;
typedef struct {
u16 unk_00;

2
linker.ld
View File

@ -112,7 +112,7 @@ SECTIONS {
. = 0x00032EC0; gUnk_02032EC0 = .;
. = 0x00032EDC; gUnk_02032EDC = .;
. = 0x00032F14; gUnk_02032F14 = .;
. = 0x00033280; gUnk_02033280 = .;
. = 0x00033280; gActiveScriptInfo = .;
. = 0x00033290; gUnk_02033290 = .;
. = 0x00033A90; gArea = .;
. = 0x00033AB8; gUnk_02033AB8 = .;

2
src/npc/ezloCap.c
View File

@ -172,7 +172,7 @@ void sub_0806DAAC(Entity* this, u32* param_2) {
u32 uVar1;
uVar1 = CheckKinstoneFused(sub_0806DA3C(this));
param_2[5] = uVar1;
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
}
// maybe actually execute the kinstone fusion?

2
src/npc/goron.c
View File

@ -99,7 +99,7 @@ u32 sub_08069480(Entity* this) {
void sub_0806948C(Entity* this, u32* param_1) {
param_1[5] = CheckKinstoneFused((sub_08069480(this) << 24) >> 24);
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
}
void sub_080694B0(Entity* this) {

2
src/npc/postman.c
View File

@ -207,7 +207,7 @@ void sub_08060700(Entity* entity, ScriptExecutionContext* context) {
u32 x = coords->x + gRoomControls.roomOriginX;
u32 y = coords->y + gRoomControls.roomOriginY;
sub_0807DEDC(entity, context, x, y);
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
}
void sub_0806075C(Entity* this) {

2
src/npc/townsperson.c
View File

@ -241,7 +241,7 @@ void sub_08061E90(Entity* this, Entity* arg1) {
arg1->spriteIndex = 1;
}
if (--arg1->spriteIndex != 0) {
gUnk_02033280.unk_06 = 0;
gActiveScriptInfo.commandSize = 0;
}
}

4
src/npc/zelda.c
View File

@ -164,12 +164,12 @@ void sub_08066E80(Entity* ent, u8* param_2) {
case 4:
UpdateAnimationSingleFrame(ent);
if (ent->frames.b.f3) {
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
return;
}
}
ent->field_0x80.HWORD = ent->animIndex;
gUnk_02033280.unk_06 = 0;
gActiveScriptInfo.commandSize = 0;
}
void sub_08066F94(void) {

2
src/object/greatFairy.c
View File

@ -170,7 +170,7 @@ void GreatFairy_WingsUpdate(Entity* this) {
this->action = 2;
sub_0805EC60(this);
gRoomVars.greatFairyState |= 32;
gUnk_02033280.unk_00 |= 4;
gActiveScriptInfo.unk_00 |= 4;
} else {
sub_0805EC9C(this, this->nonPlanarMovement, 256, 0);
}

1279
src/script.c
View File

File diff suppressed because it is too large Load Diff