Prefix script files with script_ instead of gUnk_

This commit is contained in:
octorock
2021-03-06 14:08:28 +01:00
parent 09087886c6
commit 33b1445deb
418 changed files with 1004 additions and 986 deletions
+2 -2
View File
@@ -515,7 +515,7 @@ _0809D5E6:
adds r4, r0, #0
cmp r4, #0
beq _0809D62E
ldr r1, _0809D668 @ =gUnk_0800B0AC
ldr r1, _0809D668 @ =script_0800B0AC
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
@@ -545,7 +545,7 @@ _0809D658: .4byte gPlayerEntity
_0809D65C: .4byte 0xFFF80000
_0809D660: .4byte gRoomControls
_0809D664: .4byte gUnk_02034490
_0809D668: .4byte gUnk_0800B0AC
_0809D668: .4byte script_0800B0AC
thumb_func_start sub_0809D66C
sub_0809D66C: @ 0x0809D66C
+2 -2
View File
@@ -142,14 +142,14 @@ sub_08045C3C: @ 0x08045C3C
bl sub_08046030
adds r0, r4, #0
bl sub_08095C48
ldr r1, _08045CA0 @ =gUnk_08015AC4
ldr r1, _08045CA0 @ =script_08015AC4
adds r0, r4, #0
bl StartCutscene
adds r0, r4, #0
bl sub_0807DD50
pop {r4, pc}
.align 2, 0
_08045CA0: .4byte gUnk_08015AC4
_08045CA0: .4byte script_08015AC4
thumb_func_start sub_08045CA4
sub_08045CA4: @ 0x08045CA4
+4 -4
View File
@@ -4223,16 +4223,16 @@ sub_080751E8: @ 0x080751E8
cmp r7, #0
bne _08075240
strb r7, [r3]
ldr r6, _0807523C @ =gUnk_08009ECC
ldr r6, _0807523C @ =script_08009ECC
b _08075244
.align 2, 0
_08075230: .4byte gPlayerScriptExecutionContext
_08075234: .4byte gPlayerEntity
_08075238: .4byte gPlayerState
_0807523C: .4byte gUnk_08009ECC
_0807523C: .4byte script_08009ECC
_08075240:
strb r4, [r3]
ldr r6, _08075290 @ =gUnk_08009EF0
ldr r6, _08075290 @ =script_08009EF0
_08075244:
ldr r0, _08075294 @ =gPlayerState
adds r0, #0x39
@@ -4270,7 +4270,7 @@ _08075270:
_0807528C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08075290: .4byte gUnk_08009EF0
_08075290: .4byte script_08009EF0
_08075294: .4byte gPlayerState
_08075298: .4byte gPlayerEntity
+2 -2
View File
@@ -78,7 +78,7 @@ sub_080A01E0: @ 0x080A01E0
adds r0, #0x38
strb r3, [r0]
_080A0246:
ldr r0, _080A028C @ =gUnk_0800A0B4
ldr r0, _080A028C @ =script_0800A0B4
bl StartPlayerScript
ldr r1, _080A0284 @ =gScreen
adds r2, r1, #0
@@ -108,7 +108,7 @@ _080A027C: .4byte gUnk_080FD1A0
_080A0280: .4byte 0x0000FF40
_080A0284: .4byte gScreen
_080A0288: .4byte 0x0000FDFF
_080A028C: .4byte gUnk_0800A0B4
_080A028C: .4byte script_0800A0B4
thumb_func_start sub_080A0290
sub_080A0290: @ 0x080A0290
+2 -2
View File
@@ -300,7 +300,7 @@ _08034E8A:
beq _08034EBC
movs r0, #3
strb r0, [r4, #0xc]
ldr r1, _08034EB4 @ =gUnk_08012E20
ldr r1, _08034EB4 @ =script_08012E20
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
@@ -309,7 +309,7 @@ _08034E8A:
b _08034EBC
.align 2, 0
_08034EB0: .4byte gScreenTransition
_08034EB4: .4byte gUnk_08012E20
_08034EB4: .4byte script_08012E20
_08034EB8:
bl DeleteThisEntity
_08034EBC:
+10 -10
View File
@@ -204,7 +204,7 @@ sub_08094B94: @ 0x08094B94
bl CopyPosition
ldr r0, _08094BD8 @ =0x0000FFD0
strh r0, [r4, #0x36]
ldr r1, _08094BDC @ =gUnk_0800AEDC
ldr r1, _08094BDC @ =script_0800AEDC
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
@@ -223,7 +223,7 @@ _08094BD2:
.align 2, 0
_08094BD4: .4byte gPlayerEntity
_08094BD8: .4byte 0x0000FFD0
_08094BDC: .4byte gUnk_0800AEDC
_08094BDC: .4byte script_0800AEDC
thumb_func_start sub_08094BE0
sub_08094BE0: @ 0x08094BE0
@@ -1073,7 +1073,7 @@ sub_08095244: @ 0x08095244
adds r0, r5, #0
adds r1, r4, #0
bl PositionRelative
ldr r1, _08095284 @ =gUnk_0801183C
ldr r1, _08095284 @ =script_0801183C
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
@@ -1083,7 +1083,7 @@ _0809527C:
pop {r4, r5, pc}
.align 2, 0
_08095280: .4byte 0xFFF00000
_08095284: .4byte gUnk_0801183C
_08095284: .4byte script_0801183C
thumb_func_start sub_08095288
sub_08095288: @ 0x08095288
@@ -1374,7 +1374,7 @@ sub_080954AC: @ 0x080954AC
adds r0, r5, #0
adds r1, r4, #0
bl CopyPosition
ldr r1, _080954D8 @ =gUnk_08015B14
ldr r1, _080954D8 @ =script_08015B14
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
@@ -1383,7 +1383,7 @@ sub_080954AC: @ 0x080954AC
_080954D6:
pop {r4, r5, pc}
.align 2, 0
_080954D8: .4byte gUnk_08015B14
_080954D8: .4byte script_08015B14
thumb_func_start sub_080954DC
sub_080954DC: @ 0x080954DC
@@ -1821,7 +1821,7 @@ sub_08095810: @ 0x08095810
adds r0, r5, #0
adds r1, r4, #0
bl ResolveEntityOnTop
ldr r1, _08095848 @ =gUnk_08011940
ldr r1, _08095848 @ =script_08011940
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
@@ -1830,7 +1830,7 @@ sub_08095810: @ 0x08095810
_08095844:
pop {r4, r5, pc}
.align 2, 0
_08095848: .4byte gUnk_08011940
_08095848: .4byte script_08011940
thumb_func_start sub_0809584C
sub_0809584C: @ 0x0809584C
@@ -1984,7 +1984,7 @@ sub_08095954: @ 0x08095954
bl PositionRelative
ldr r0, _080959B0 @ =0x0000FFFD
strh r0, [r4, #0x36]
ldr r1, _080959B4 @ =gUnk_08012C48
ldr r1, _080959B4 @ =script_08012C48
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
@@ -2003,7 +2003,7 @@ sub_08095954: @ 0x08095954
.align 2, 0
_080959AC: .4byte gUnk_08122AF8
_080959B0: .4byte 0x0000FFFD
_080959B4: .4byte gUnk_08012C48
_080959B4: .4byte script_08012C48
_080959B8:
ldr r0, _080959C8 @ =gActiveScriptInfo
ldr r1, [r0]
+2 -2
View File
@@ -85,7 +85,7 @@ _0809AB70:
adds r1, #0x63
movs r0, #0x20
strb r0, [r1]
ldr r1, _0809ABA0 @ =gUnk_08012DD8
ldr r1, _0809ABA0 @ =script_08012DD8
adds r0, r5, #0
bl StartCutscene
adds r1, r5, #0
@@ -94,7 +94,7 @@ _0809AB70:
_0809AB9C:
pop {r4, r5, pc}
.align 2, 0
_0809ABA0: .4byte gUnk_08012DD8
_0809ABA0: .4byte script_08012DD8
thumb_func_start sub_0809ABA4
sub_0809ABA4: @ 0x0809ABA4
+6 -6
View File
@@ -54,7 +54,7 @@ sub_08065080: @ 0x08065080
movs r1, #0
movs r2, #0
bl sub_08078850
ldr r1, _080650C8 @ =gUnk_080142B0
ldr r1, _080650C8 @ =script_080142B0
adds r0, r4, #0
bl StartCutscene
adds r4, #0x84
@@ -62,7 +62,7 @@ sub_08065080: @ 0x08065080
pop {r4, pc}
.align 2, 0
_080650C4: .4byte gUnk_0810FDA0
_080650C8: .4byte gUnk_080142B0
_080650C8: .4byte script_080142B0
thumb_func_start sub_080650CC
sub_080650CC: @ 0x080650CC
@@ -83,12 +83,12 @@ sub_080650CC: @ 0x080650CC
adds r0, r5, #0
adds r0, #0x84
ldr r0, [r0]
ldr r1, _080650FC @ =gUnk_080143C0
ldr r1, _080650FC @ =script_080143C0
bl sub_0807DB88
b _080651A6
.align 2, 0
_080650F8: .4byte gRoomVars
_080650FC: .4byte gUnk_080143C0
_080650FC: .4byte script_080143C0
_08065100:
adds r2, r5, #0
adds r2, #0x5a
@@ -132,7 +132,7 @@ _0806513C:
adds r0, r5, #0
adds r0, #0x84
ldr r0, [r0]
ldr r1, _08065174 @ =gUnk_08014384
ldr r1, _08065174 @ =script_08014384
bl sub_0807DB88
_0806515E:
adds r0, r7, #0
@@ -145,7 +145,7 @@ _0806515E:
str r0, [r1, #0x10]
b _080651A6
.align 2, 0
_08065174: .4byte gUnk_08014384
_08065174: .4byte script_08014384
_08065178: .4byte gTextBox
_0806517C:
ldrb r1, [r2]