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

Rename objects

Browse Source
This commit is contained in:
octorock
2022-07-23 12:43:43 +02:00
parent ccba86d292
commit 852effa474
671 changed files with 5779 additions and 5277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/scripts.inc
+39 -39
View File
@@ -37,11 +37,11 @@
.2byte 0x0400
.endm
.macro BeginBlock
.macro BeginBlock
.2byte 0x0401
.endm
.macro EndBlock
.macro EndBlock
.2byte 0x0402
.endm
@@ -130,7 +130,7 @@
.2byte \s
.endm
.macro HasRoomItemForSale
.macro HasRoomItemForSale
.2byte 0x0411
.endm
@@ -167,11 +167,11 @@
.2byte \dimension
.endm
.macro CheckEntityInteractType
.macro CheckEntityInteractType
.2byte 0x0418
.endm
.macro FacePlayerAndCheckDist
.macro FacePlayerAndCheckDist
.2byte 0x0419
.endm
@@ -185,7 +185,7 @@
.2byte \s
.endm
.macro CheckTextboxResult
.macro CheckTextboxResult
.2byte 0x041c
.endm
@@ -229,11 +229,11 @@
.4byte \w
.endm
.macro CheckPlayerMinish
.macro CheckPlayerMinish
.2byte 0x0424
.endm
.macro EntityHasHeight
.macro EntityHasHeight
.2byte 0x0425
.endm
@@ -312,15 +312,15 @@
.2byte 0x0434
.endm
.macro WaitForPlayerEnterRoom
.macro WaitForPlayerEnterRoom
.2byte 0x0435
.endm
.macro WaitFor_1
.macro WaitFor_1
.2byte 0x0436
.endm
.macro WaitForFadeFinish
.macro WaitForFadeFinish
.2byte 0x0437
.endm
@@ -334,7 +334,7 @@
.4byte \w
.endm
.macro FadeInvert
.macro FadeInvert
.2byte 0x043a
.endm
@@ -343,19 +343,19 @@
.2byte \s
.endm
.macro SetFade4
.macro SetFade4
.2byte 0x043c
.endm
.macro SetFade5
.macro SetFade5
.2byte 0x043d
.endm
.macro SetFade6
.macro SetFade6
.2byte 0x043e
.endm
.macro SetFade7
.macro SetFade7
.2byte 0x043f
.endm
@@ -378,15 +378,15 @@
.2byte 0x0442
.endm
.macro SetPlayerIdle
.macro SetPlayerIdle
.2byte 0x0443
.endm
.macro EnablePlayerControl
.macro EnablePlayerControl
.2byte 0x0444
.endm
.macro DisablePlayerControl
.macro DisablePlayerControl
.2byte 0x0445
.endm
@@ -405,19 +405,19 @@
.2byte \s
.endm
.macro _0807E8E4_0
.macro _0807E8E4_0
.2byte 0x0449
.endm
.macro _0807E8E4_1
.macro _0807E8E4_1
.2byte 0x044a
.endm
.macro _0807E8E4_2
.macro _0807E8E4_2
.2byte 0x044b
.endm
.macro _0807E8E4_3
.macro _0807E8E4_3
.2byte 0x044c
.endm
@@ -431,7 +431,7 @@
.4byte \value
.endm
.macro SetVariableToFrame
.macro SetVariableToFrame
.2byte 0x044f
.endm
@@ -440,7 +440,7 @@
.2byte \s
.endm
.macro TriggerInteract
.macro TriggerInteract
.2byte 0x0451
.endm
@@ -449,11 +449,11 @@
.2byte \s
.endm
.macro _0807E9D4
.macro _0807E9D4
.2byte 0x0453
.endm
.macro _0807E9DC
.macro _0807E9DC
.2byte 0x0454
.endm
@@ -462,11 +462,11 @@
.2byte \s
.endm
.macro _0807E9F0
.macro _0807E9F0
.2byte 0x0456
.endm
.macro _0807EA4C
.macro _0807EA4C
.2byte 0x0457
.endm
@@ -475,7 +475,7 @@
.2byte \s
.endm
.macro WaitUntilTextboxCloses
.macro WaitUntilTextboxCloses
.2byte 0x0459
.endm
@@ -526,7 +526,7 @@
RecursiveArgs .2byte \labels
.endm
.macro MessageNoOverlapVar
.macro MessageNoOverlapVar
.2byte 0x045e
.endm
@@ -540,7 +540,7 @@
.endif
.endm
.macro _0807EB38
.macro _0807EB38
.2byte 0x0460
.endm
@@ -555,11 +555,11 @@
.2byte \b
.endm
.macro FacePlayer
.macro FacePlayer
.2byte 0x0463
.endm
.macro FaceAwayFromPlayer
.macro FaceAwayFromPlayer
.2byte 0x0464
.endm
@@ -595,7 +595,7 @@
.2byte \y
.endm
.macro MoveEntityToPlayer
.macro MoveEntityToPlayer
.2byte 0x046b
.endm
@@ -647,11 +647,11 @@
.2byte \b
.endm
.macro _0807EE30
.macro _0807EE30
.2byte 0x0475
.endm
.macro _0807EEB4
.macro _0807EEB4
.2byte 0x0476
.endm
@@ -742,11 +742,11 @@
.2byte \s
.endm
.macro CameraTargetEntity
.macro CameraTargetEntity
.2byte 0x0487
.endm
.macro CameraTargetPlayer
.macro CameraTargetPlayer
.2byte 0x0488
.endm
asm/non_matching/sub_080560B8.inc → asm/non_matching/InitSaveHeader.inc
+2 -2
View File
@@ -5,7 +5,7 @@
bne _080560F8
movs r0, #0x80
lsls r0, r0, #0x12
bl Read_02000000
bl ReadSaveHeader
adds r1, r0, #0
movs r0, #1
rsbs r0, r0, #0
@@ -26,7 +26,7 @@ _080560E4:
movs r2, #0x10
bl MemCopy
adds r0, r4, #0
bl Write_02000000
bl WriteSaveHeader
_080560F8:
ldr r2, _0805612C @ =gUnk_02000010
ldr r1, [r2]
asm/non_matching/beanstalkSubtask/UpdatePlayerCollision.inc
+1 -1
View File
@@ -702,7 +702,7 @@ _08019D76:
adds r0, #0x38
ldrb r1, [r0]
adds r0, r7, #0
bl sub_080A7C8C
bl OpenSmallChest
movs r0, #2
b _0801A2A6
.align 2, 0
asm/non_matching/common/sub_0801E31C.inc
+1 -1
View File
@@ -174,7 +174,7 @@ _0801E45E:
adds r0, r0, r1
ldr r1, _0801E494 @ =0x04000040
ldr r2, _0801E498 @ =0xA2600001
bl sub_0805622C
bl SetVBlankDMA
add sp, #0x20
pop {r3, r4, r5}
mov r8, r3
asm/non_matching/common/sub_0801E49C.inc
+1 -1
View File
@@ -196,7 +196,7 @@ _0801E60A:
adds r0, r0, r1
ldr r1, _0801E644 @ =0x04000040
ldr r2, _0801E648 @ =0xA2600001
bl sub_0805622C
bl SetVBlankDMA
add sp, #8
pop {r3, r4, r5}
mov r8, r3
asm/non_matching/common/sub_0801E82C.inc
+2 -2
View File
@@ -4,7 +4,7 @@
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r1, _0801E8AC @ =gUnk_02002B54
ldr r1, _0801E8AC @ =gSave+0x114
movs r5, #0
adds r2, r1, #4
_0801E83C:
@@ -65,5 +65,5 @@ _0801E890:
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801E8AC: .4byte gUnk_02002B54
_0801E8AC: .4byte gSave+0x114
.syntax divided
asm/non_matching/object6A/sub_08095EAC.inc → asm/non_matching/cutsceneMiscObject/sub_08095EAC.inc
View File
asm/non_matching/figurineDevice/sub_08088328.inc
+8 -8
View File
@@ -44,7 +44,7 @@ _08087D0C:
bl sub_08088160
cmp r0, #0
beq _08087D2C
ldr r0, _08087D28 @ =gUnk_02002B0E
ldr r0, _08087D28 @ =gSave+0xce
adds r1, r4, #0
bl ReadBit
cmp r0, #0
@@ -52,7 +52,7 @@ _08087D0C:
movs r5, #1
b _08087D2E
.align 2, 0
_08087D28: .4byte gUnk_02002B0E
_08087D28: .4byte gSave+0xce
_08087D2C:
adds r4, #1
_08087D2E:
@@ -76,7 +76,7 @@ _08087D46:
bl sub_08088160
cmp r0, #0
beq _08087D68
ldr r0, _08087D64 @ =gUnk_02002B0E
ldr r0, _08087D64 @ =gSave+0xce
adds r1, r4, #0
bl ReadBit
cmp r0, #0
@@ -84,7 +84,7 @@ _08087D46:
movs r5, #0
b _08087D6A
.align 2, 0
_08087D64: .4byte gUnk_02002B0E
_08087D64: .4byte gSave+0xce
_08087D68:
adds r4, #1
_08087D6A:
@@ -172,7 +172,7 @@ _0808837C:
bl sub_08088160
cmp r0, #0
beq _0808839C
ldr r0, _08088398 @ =gUnk_02002B0E
ldr r0, _08088398 @ =gSave+0xce
adds r1, r4, #0
bl ReadBit
cmp r0, #0
@@ -180,7 +180,7 @@ _0808837C:
movs r5, #1
b _0808839E
.align 2, 0
_08088398: .4byte gUnk_02002B0E
_08088398: .4byte gSave+0xce
_0808839C:
adds r4, #1
_0808839E:
@@ -204,7 +204,7 @@ _080883B6:
bl sub_08088160
cmp r0, #0
beq _080883D8
ldr r0, _080883D4 @ =gUnk_02002B0E
ldr r0, _080883D4 @ =gSave+0xce
adds r1, r4, #0
bl ReadBit
cmp r0, #0
@@ -212,7 +212,7 @@ _080883B6:
movs r5, #0
b _080883DA
.align 2, 0
_080883D4: .4byte gUnk_02002B0E
_080883D4: .4byte gSave+0xce
_080883D8:
adds r4, #1
_080883DA:
asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc
+2 -2
View File
@@ -22,7 +22,7 @@
rsbs r0, r0, #0
adds r4, r0, #0
subs r4, #0x45
ldr r2, _080A4220 @ =gUnk_02002B6B
ldr r2, _080A4220 @ =gSave+0x12b
mov sb, r2
_080A4180:
adds r2, r4, #0
@@ -106,7 +106,7 @@ _080A4210: .4byte gOamCmd
_080A4214: .4byte gMenu
_080A4218: .4byte 0x00000B21
_080A421C: .4byte gSineTable
_080A4220: .4byte gUnk_02002B6B
_080A4220: .4byte gSave+0x12b
_080A4224: .4byte 0x0000FFFF
_080A4228: .4byte gSave
.syntax divided
asm/non_matching/playerUtils/ResolvePlayerAnimation.inc
-268
View File
@@ -1,268 +0,0 @@
.syntax unified
push {r4, lr}
ldr r3, _08079954 @ =gPlayerState
ldr r2, [r3, #0x30]
movs r0, #8
ands r0, r2
mov ip, r3
cmp r0, #0
beq _080799E4
ldrb r0, [r3, #5]
cmp r0, #0
beq _0807995C
ldr r4, _08079958 @ =0x0000092C
b _08079AD8
.align 2, 0
_08079954: .4byte gPlayerState
_08079958: .4byte 0x0000092C
_0807995C:
mov r0, ip
adds r0, #0x3d
mov r3, ip
ldrb r1, [r3, #0x1c]
ldrb r0, [r0]
orrs r0, r1
cmp r0, #0
beq _0807996E
b _08079B14
_0807996E:
movs r0, #0x80
lsls r0, r0, #0x12
ands r0, r2
cmp r0, #0
bne _08079A1E
mov r4, ip
ldrb r0, [r4, #3]
cmp r0, #0
beq _08079988
ldr r4, _08079984 @ =0x00000414
b _08079AD8
.align 2, 0
_08079984: .4byte 0x00000414
_08079988:
mov r0, ip
adds r0, #0x21
ldrb r0, [r0]
cmp r0, #0
bne _08079A5C
mov r0, ip
adds r0, #0x26
ldrb r0, [r0]
cmp r0, #0
bne _08079A6C
mov r0, ip
ldrb r1, [r0, #0x1b]
movs r0, #0x48
ands r0, r1
cmp r0, #0
beq _080799AA
b _08079B14
_080799AA:
cmp r1, #0
beq _080799B0
b _08079AA4
_080799B0:
mov r1, ip
ldrb r0, [r1, #4]
cmp r0, #0
beq _080799BA
b _08079B14
_080799BA:
movs r0, #0x20
ands r2, r0
cmp r2, #0
beq _080799D0
ldr r0, _080799D8 @ =gArea
ldrb r0, [r0, #0x17]
cmp r0, #4
bne _080799CC
b _08079AD4
_080799CC:
cmp r0, #5
bne _080799DC
_080799D0:
movs r4, #0x80
lsls r4, r4, #3
b _08079AD8
.align 2, 0
_080799D8: .4byte gArea
_080799DC:
ldr r4, _080799E0 @ =0x000002C2
b _08079AD8
.align 2, 0
_080799E0: .4byte 0x000002C2
_080799E4:
mov r4, ip
ldrb r0, [r4, #5]
cmp r0, #0
beq _080799F2
movs r4, #0xd4
lsls r4, r4, #2
b _08079AD8
_080799F2:
mov r0, ip
adds r0, #0x3d
mov r4, ip
ldrb r1, [r4, #0x1c]
ldrb r0, [r0]
orrs r0, r1
cmp r0, #0
beq _08079A04
b _08079B14
_08079A04:
movs r0, #0x80
lsls r0, r0, #0xc
ands r0, r2
cmp r0, #0
beq _08079A14
movs r4, #0x8b
lsls r4, r4, #4
b _08079AD8
_08079A14:
movs r0, #0x80
lsls r0, r0, #0x12
ands r0, r2
cmp r0, #0
beq _08079A24
_08079A1E:
movs r4, #0x81
lsls r4, r4, #4
b _08079AD8
_08079A24:
mov r1, ip
ldrb r0, [r1, #0x1e]
cmp r0, #0
beq _08079A32
movs r4, #0xa6
lsls r4, r4, #2
b _08079AD8
_08079A32:
movs r0, #0x80
lsls r0, r0, #5
ands r0, r2
cmp r0, #0
beq _08079A44
ldr r4, _08079A40 @ =0x0000070C
b _08079AD8
.align 2, 0
_08079A40: .4byte 0x0000070C
_08079A44:
mov r4, ip
ldrb r0, [r4, #3]
cmp r0, #0
beq _08079A52
movs r4, #0xb2
lsls r4, r4, #1
b _08079AD8
_08079A52:
mov r0, ip
adds r0, #0x21
ldrb r0, [r0]
cmp r0, #0
beq _08079A62
_08079A5C:
movs r4, #0xa0
lsls r4, r4, #2
b _08079AD8
_08079A62:
mov r0, ip
adds r0, #0x26
ldrb r0, [r0]
cmp r0, #0
beq _08079A72
_08079A6C:
movs r4, #0xa3
lsls r4, r4, #2
b _08079AD8
_08079A72:
mov r0, ip
ldrb r1, [r0, #0x1b]
movs r0, #0x48
ands r0, r1
cmp r0, #0
bne _08079B14
movs r0, #0x20
ands r2, r0
cmp r2, #0
beq _08079AA0
ldr r0, _08079A98 @ =gArea
ldrb r0, [r0, #0x17]
ldr r4, _08079A9C @ =0x000002C2
cmp r0, #4
bne _08079AD8
movs r4, #0xa6
lsls r4, r4, #3
b _08079AD8
.align 2, 0
_08079A98: .4byte gArea
_08079A9C: .4byte 0x000002C2
_08079AA0:
cmp r1, #0
beq _08079AAA
_08079AA4:
movs r4, #0xb4
lsls r4, r4, #1
b _08079AD8
_08079AAA:
ldrb r0, [r3, #4]
cmp r0, #0
bne _08079B14
ldr r0, [r3, #0x30]
movs r1, #0x80
lsls r1, r1, #0x10
ands r0, r1
cmp r0, #0
beq _08079AD4
ldr r0, _08079ACC @ =gUnk_03000B80
adds r0, #0x63
ldrb r0, [r0]
cmp r0, #0
bne _08079B14
ldr r4, _08079AD0 @ =0x00000604
b _08079AD8
.align 2, 0
_08079ACC: .4byte gUnk_03000B80
_08079AD0: .4byte 0x00000604
_08079AD4:
movs r4, #0x80
lsls r4, r4, #1
_08079AD8:
mov r1, ip
strh r4, [r1, #8]
ldrb r0, [r1, #5]
cmp r0, #0
bne _08079B10
movs r3, #0
movs r2, #0
ldr r1, _08079B18 @ =gUnk_03000B80
_08079AE8:
ldrb r0, [r1, #0xf]
cmp r0, r3
bls _08079AF0
adds r3, r0, #0
_08079AF0:
adds r1, #0x1c
adds r2, #1
cmp r2, #3
bls _08079AE8
mov r2, ip
ldrb r0, [r2, #0xe]
cmp r0, r3
blo _08079B14
lsls r0, r4, #0x18
lsrs r0, r0, #0x18
ldrb r3, [r2]
cmp r0, r3
bne _08079B10
ldr r0, _08079B1C @ =gPlayerEntity
bl UpdateAnimationSingleFrame
_08079B10:
ldr r0, _08079B20 @ =gPlayerState
strb r4, [r0]
_08079B14:
pop {r4, pc}
.align 2, 0
_08079B18: .4byte gUnk_03000B80
_08079B1C: .4byte gPlayerEntity
_08079B20: .4byte gPlayerState
.syntax divided
asm/non_matching/pushableStatue/sub_080896B0.inc
-91
View File
@@ -1,91 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
ldr r0, _08089750 @ =gPlayerState
ldrb r1, [r0, #5]
movs r0, #0x1f
ands r0, r1
cmp r0, #0x12
bne _08089768
ldr r6, _08089754 @ =gPlayerEntity
adds r0, r6, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _08089768
ldrb r3, [r6, #0x14]
movs r2, #6
ands r2, r3
lsls r2, r2, #1
ldr r0, _08089758 @ =gUnk_080B4468
adds r2, r2, r0
ldr r0, _0808975C @ =gUnk_080B4488
lsrs r3, r3, #1
lsls r3, r3, #1
adds r3, r3, r0
movs r0, #0x2e
ldrsh r1, [r6, r0]
movs r4, #0
ldrsh r0, [r2, r4]
adds r1, r1, r0
ldr r5, _08089760 @ =gRoomControls
ldrh r0, [r5, #6]
subs r1, r1, r0
asrs r1, r1, #4
movs r4, #0x3f
ands r1, r4
movs r7, #0x32
ldrsh r0, [r6, r7]
movs r7, #2
ldrsh r2, [r2, r7]
adds r0, r0, r2
ldrh r2, [r5, #8]
subs r0, r0, r2
asrs r0, r0, #4
ands r0, r4
lsls r0, r0, #6
orrs r1, r0
movs r0, #0
ldrsh r7, [r3, r0]
subs r1, r1, r7
lsls r4, r1, #0x10
lsrs r0, r4, #0x10
adds r5, r6, #0
adds r5, #0x38
ldrb r1, [r5]
bl sub_080B1AE0
adds r1, r0, #0
subs r0, #0x26
cmp r0, #1
bls _08089768
cmp r1, #0x29
beq _08089768
ldrb r0, [r5]
bl GetLayerByIndex
asrs r1, r4, #0x10
ldr r2, _08089764 @ =0x00002004
adds r0, r0, r2
adds r2, r0, r1
ldrb r2, [r2]
subs r1, r1, r7
adds r0, r0, r1
ldrb r0, [r0]
cmp r2, #0
bne _08089768
cmp r0, #0
bne _08089768
movs r0, #1
b _0808976A
.align 2, 0
_08089750: .4byte gPlayerState
_08089754: .4byte gPlayerEntity
_08089758: .4byte gUnk_080B4468
_0808975C: .4byte gUnk_080B4488
_08089760: .4byte gRoomControls
_08089764: .4byte 0x00002004
_08089768:
movs r0, #0
_0808976A:
pop {r4, r5, r6, r7, pc}
.syntax divided
asm/non_matching/townsperson/Townsperson_Head.inc
-39
View File
@@ -1,39 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
adds r0, #0x58
ldrb r1, [r0]
movs r0, #3
ands r0, r1
ldr r1, _08061CAC @ =gUnk_0810B78C
adds r0, r0, r1
ldrb r1, [r0]
ldr r5, _08061CB0 @ =gUnk_0810B680
ldrb r0, [r4, #0xa]
lsls r0, r0, #2
adds r0, r0, r5
ldrb r2, [r0]
adds r2, r1, r2
adds r0, r4, #0
movs r1, #0
bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e]
ldrb r0, [r4, #0xa]
lsls r0, r0, #2
adds r0, r0, r5
ldrb r0, [r0, #1]
adds r2, r2, r0
adds r0, r4, #0
movs r1, #1
bl SetExtraSpriteFrame
adds r0, r4, #0
movs r1, #1
movs r2, #0
bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0
bl sub_0807000C
pop {r4, r5, pc}
.align 2, 0
_08061CAC: .4byte gUnk_0810B78C
_08061CB0: .4byte gUnk_0810B680
.syntax divided