Rename scripts

This commit is contained in:
octorock
2021-12-26 23:22:16 +01:00
parent 11bb0e7656
commit 2ccf89a1fb
643 changed files with 8481 additions and 7693 deletions
+2 -2
View File
@@ -515,7 +515,7 @@ _0809D5E6:
adds r4, r0, #0
cmp r4, #0
beq _0809D62E
ldr r1, _0809D668 @ =script_0800B0AC
ldr r1, _0809D668 @ =script_EzloTalkOcarina
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 script_0800B0AC
_0809D668: .4byte script_EzloTalkOcarina
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 @ =script_08015AC4
ldr r1, _08045CA0 @ =script_BusinessScrubIntro
adds r0, r4, #0
bl StartCutscene
adds r0, r4, #0
bl sub_0807DD50
pop {r4, pc}
.align 2, 0
_08045CA0: .4byte script_08015AC4
_08045CA0: .4byte script_BusinessScrubIntro
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 @ =script_08009ECC
ldr r6, _0807523C @ =script_BedInLinksRoom
b _08075244
.align 2, 0
_08075230: .4byte gPlayerScriptExecutionContext
_08075234: .4byte gPlayerEntity
_08075238: .4byte gPlayerState
_0807523C: .4byte script_08009ECC
_0807523C: .4byte script_BedInLinksRoom
_08075240:
strb r4, [r3]
ldr r6, _08075290 @ =script_08009EF0
ldr r6, _08075290 @ =script_BedAtSimons
_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 script_08009EF0
_08075290: .4byte script_BedAtSimons
_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 @ =script_0800A0B4
ldr r0, _080A028C @ =script_PlayerGetElement
bl StartPlayerScript
ldr r1, _080A0284 @ =gScreen
adds r2, r1, #0
@@ -108,7 +108,7 @@ _080A027C: .4byte gHitbox_6
_080A0280: .4byte 0x0000FF40
_080A0284: .4byte gScreen
_080A0288: .4byte 0x0000FDFF
_080A028C: .4byte script_0800A0B4
_080A028C: .4byte script_PlayerGetElement
thumb_func_start sub_080A0290
sub_080A0290: @ 0x080A0290
+2 -2
View File
@@ -85,7 +85,7 @@ _0809AB70:
adds r1, #0x63
movs r0, #0x20
strb r0, [r1]
ldr r1, _0809ABA0 @ =script_08012DD8
ldr r1, _0809ABA0 @ =script_Object89Mazaal
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 script_08012DD8
_0809ABA0: .4byte script_Object89Mazaal
thumb_func_start sub_0809ABA4
sub_0809ABA4: @ 0x0809ABA4
+4 -4
View File
@@ -16,12 +16,12 @@
adds r0, r5, #0
adds r0, #0x84
ldr r0, [r0]
ldr r1, _080650FC @ =script_080143C0
ldr r1, _080650FC @ =script_StockwellDogFood
bl InitScriptExecutionContext
b _080651A6
.align 2, 0
_080650F8: .4byte gRoomVars
_080650FC: .4byte script_080143C0
_080650FC: .4byte script_StockwellDogFood
_08065100:
adds r2, r5, #0
adds r2, #0x5a
@@ -65,7 +65,7 @@ _0806513C:
adds r0, r5, #0
adds r0, #0x84
ldr r0, [r0]
ldr r1, _08065174 @ =script_08014384
ldr r1, _08065174 @ =script_StockwellBuy
bl InitScriptExecutionContext
_0806515E:
adds r0, r7, #0
@@ -78,7 +78,7 @@ _0806515E:
str r0, [r1, #0x10]
b _080651A6
.align 2, 0
_08065174: .4byte script_08014384
_08065174: .4byte script_StockwellBuy
_08065178: .4byte gMessage
_0806517C:
ldrb r1, [r2]