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

Merge branch 'master' into cleanup_declarations

Browse Source
This commit is contained in:
Henny022p
2021-03-15 22:56:23 +01:00
parent aac7eb7436 e09678c6ab
commit a2cdfd6d8d
549 changed files with 18187 additions and 4914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bigGoron.s
+4 -4
View File
@@ -517,9 +517,9 @@ _0806D3F4:
strh r0, [r4, #0x2e]
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
_0806D408:
pop {r4, pc}
.align 2, 0
@@ -566,9 +566,9 @@ sub_0806D41C: @ 0x0806D41C
_0806D45E:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
_0806D46C:
ldr r0, _0806D4A8 @ =gScreenTransition
ldr r0, [r0]
asm/bird.s
+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
asm/brocco.s
+2 -2
View File
@@ -208,9 +208,9 @@ _080636A0: .4byte gPlayerEntity
_080636A4:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
b _080636D4
asm/businessScrubPrologue.s
+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
asm/castleMaid.s
+2 -2
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
asm/castorWildsStatue.s
+2 -2
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
asm/code_080043E8.s
+8 -2
View File
@@ -378,10 +378,16 @@ gUnk_0800476A:: @ 0800476A
.incbin "baserom.gba", 0x00476A, 0x000008C
gUnk_080047F6:: @ 080047F6
.incbin "baserom.gba", 0x0047F6, 0x0000200
.incbin "baserom.gba", 0x0047F6, 0x00001E0
gUnk_080049D6:: @ 080049D6
.incbin "baserom.gba", 0x0049D6, 0x0000020
gUnk_080049F6:: @ 080049F6
.incbin "baserom.gba", 0x0049F6, 0x000000A
.incbin "baserom.gba", 0x0049F6, 0x0000008
gUnk_080049FE:: @ gUnk_080049FE
.incbin "baserom.gba", 0x0049FE, 0x0000002
gUnk_08004A00:: @ 08004A00
.incbin "baserom.gba", 0x004A00, 0x000000C
asm/code_0800857C.s
-3342
View File
File diff suppressed because it is too large Load Diff
asm/code_08016984.s
+144
View File
@@ -0,0 +1,144 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
gUnk_08016984:: @ 08016984
.incbin "baserom.gba", 0x016984, 0x0000002
.text
non_word_aligned_thumb_func_start GetNextScriptCommandHalfword
GetNextScriptCommandHalfword: @ 0x08016986
ldrh r0, [r0]
bx lr
non_word_aligned_thumb_func_start GetNextScriptCommandHalfwordAfterCommandMetadata
GetNextScriptCommandHalfwordAfterCommandMetadata: @ 0x0801698A
ldrh r0, [r0, #2]
bx lr
non_word_aligned_thumb_func_start GetNextScriptCommandWord
GetNextScriptCommandWord: @ 0x0801698E
ldrh r1, [r0]
ldrh r0, [r0, #2]
lsls r0, r0, #0x10
orrs r0, r1
bx lr
thumb_func_start GetNextScriptCommandWordAfterCommandMetadata
GetNextScriptCommandWordAfterCommandMetadata: @ 0x08016998
ldrh r1, [r0, #2]
ldrh r0, [r0, #4]
lsls r0, r0, #0x10
orrs r0, r1
bx lr
.align 2, 0
gUnk_080169A4::
.byte 0x01, 0xFF, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x00
.byte 0xFF, 0x01, 0x00, 0x00, 0x02, 0xFF, 0x01, 0xFE, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x01, 0xFF, 0x02
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x02, 0xFE, 0xFE, 0x02, 0xFF, 0x03, 0xFD, 0xFF, 0xFE, 0x01
.byte 0x01, 0xFD, 0xFF, 0xFF, 0x03, 0xFE, 0x02, 0x00, 0x00, 0xFF, 0xFE, 0x03, 0xFD, 0x02, 0xFF, 0x00
.byte 0x00, 0xFD, 0x02, 0x00, 0x00, 0xFF, 0x00, 0xFE, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02
.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
.byte 0x00, 0x00, 0x01, 0x00
thumb_func_start UpdateSpriteForCollisionLayer
UpdateSpriteForCollisionLayer: @ 0x08016A04
movs r1, #0x38
ldrb r1, [r0, r1]
lsls r1, r1, #1
add r3, pc, #0x1C
adds r1, r1, r3
movs r3, #0xc0
ldrb r2, [r0, #0x19]
bics r2, r3
ldrb r3, [r1]
orrs r2, r3
strb r2, [r0, #0x19]
movs r3, #0xc0
ldrb r2, [r0, #0x1b]
bics r2, r3
ldrb r3, [r1, #1]
orrs r2, r3
strb r2, [r0, #0x1b]
bx lr
_08016A28:
.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40
thumb_func_start sub_08016A30
sub_08016A30: @ 0x08016A30
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #0x38
ldrb r0, [r4, r5]
cmp r0, #0
bne _08016A64
ldrh r0, [r4, #0x2e]
ldrh r1, [r4, #0x32]
movs r2, #2
bl GetTileTypeByPos
movs r3, #1
cmp r0, #0
beq _08016A62
bl sub_080002E4
movs r3, #2
add r1, pc, #0x40
_08016A54:
adds r1, #4
ldrh r2, [r1]
cmp r2, #0
beq _08016A62
cmp r0, r2
bne _08016A54
ldrb r3, [r1, #3]
_08016A62:
strb r3, [r4, r5]
_08016A64:
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
pop {r4, r5, pc}
thumb_func_start sub_08016A6C
sub_08016A6C: @ 0x08016A6C
push {r4, r5, lr}
adds r4, r0, #0
bl sub_080002B8
add r1, pc, #0x38
_08016A76:
adds r1, #4
ldrh r2, [r1]
cmp r2, #0
beq _08016A90
cmp r2, r0
bne _08016A76
movs r2, #0x38
ldrb r3, [r4, r2]
ldrb r5, [r1, #2]
cmp r3, r5
beq _08016A90
ldrb r5, [r1, #3]
strb r5, [r4, r2]
_08016A90:
pop {r4, r5, pc}
.align 2, 0
_08016A94:
.byte 0x2A, 0x00, 0x03, 0x03, 0x2D, 0x00, 0x03, 0x03, 0x2B, 0x00, 0x03, 0x03
.byte 0x2C, 0x00, 0x03, 0x03, 0x4C, 0x00, 0x03, 0x03, 0x4E, 0x00, 0x03, 0x03, 0x4D, 0x00, 0x03, 0x03
.byte 0x4F, 0x00, 0x03, 0x03, 0x0A, 0x00, 0x02, 0x01, 0x09, 0x00, 0x02, 0x01, 0x0C, 0x00, 0x01, 0x02
.byte 0x0B, 0x00, 0x01, 0x02, 0x52, 0x00, 0x03, 0x03, 0x27, 0x00, 0x03, 0x03, 0x26, 0x00, 0x03, 0x03
.byte 0x00, 0x00
non_word_aligned_thumb_func_start sub_08016AD2
sub_08016AD2: @ 0x08016AD2
push {r4, lr}
adds r4, r0, #0
bl sub_08016A6C
push {r0}
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
pop {r0, r4, pc}
asm/code_080526F8.s
+3 -3
View File
@@ -1013,7 +1013,7 @@ sub_08052EA0: @ 0x08052EA0
ldrb r0, [r0, #1]
strb r0, [r2, #1]
bl sub_08049D30
bl sub_0807DA70
bl InitScriptData
bl sub_08054524
bl sub_080186D4
bl sub_0806F364
@@ -3187,8 +3187,8 @@ GetSaleItemConfirmMessageID: @ 0x08053FD0
.align 2, 0
_08053FDC: .4byte gUnk_080FD964
thumb_func_start sub_08053FE0
sub_08053FE0: @ 0x08053FE0
thumb_func_start GetItemPrice
GetItemPrice: @ 0x08053FE0
lsls r0, r0, #3
ldr r1, _08053FEC @ =gUnk_080FD964
adds r0, r0, r1
asm/code_0805436C.s
+2 -2
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]
asm/code_080732D0.s
+10 -10
View File
@@ -3501,7 +3501,7 @@ sub_08074CF8: @ 0x08074CF8
adds r4, r5, #0
adds r4, #0x84
ldr r1, [r4]
bl ExecuteScriptCommandSet
bl ExecuteScript
ldr r1, [r4]
adds r0, r5, #0
bl sub_08074D34
@@ -3818,7 +3818,7 @@ sub_08074F2C: @ 0x08074F2C
adds r5, r4, #0
adds r5, #0x84
ldr r1, [r5]
bl ExecuteScriptCommandSet
bl ExecuteScript
ldr r1, [r5]
adds r0, r4, #0
bl sub_08074D34
@@ -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
@@ -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
@@ -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
asm/code_0807F0D8.s
+53 -53
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
@@ -984,7 +984,7 @@ _0807F79A:
bl GetSaleItemConfirmMessageID
adds r4, r0, #0
adds r0, r5, #0
bl sub_08053FE0
bl GetItemPrice
adds r5, r0, #0
adds r0, r4, #0
adds r1, r6, #0
@@ -1008,7 +1008,7 @@ sub_0807F7C4: @ 0x0807F7C4
ldr r0, _0807F7F4 @ =gRoomVars
ldrb r0, [r0, #6]
_0807F7D2:
bl sub_08053FE0
bl GetItemPrice
movs r2, #0
ldr r1, _0807F7F8 @ =gSave
adds r1, #0xc0
@@ -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
@@ -1039,7 +1039,7 @@ sub_0807F800: @ 0x0807F800
ldrb r4, [r0, #6]
_0807F80C:
adds r0, r4, #0
bl sub_08053FE0
bl GetItemPrice
rsbs r0, r0, #0
bl ModRupees
adds r0, r4, #0
@@ -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
asm/code_080A5574.s
+6 -6
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 MemClear
ldr r4, _080A7398 @ =gUnk_02033280
ldr r4, _080A7398 @ =gActiveScriptInfo
adds r0, r4, #0
movs r1, #0xc
bl MemClear
@@ -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
asm/drLeft.s
+2 -2
View File
@@ -26,9 +26,9 @@ DrLeft: @ 0x0806BF80
_0806BFA2:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
asm/farmers.s
+2 -2
View File
@@ -57,9 +57,9 @@ _0806BC2E:
_0806BC40:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
_0806BC54:
asm/festari.s
+1 -1
View File
@@ -71,7 +71,7 @@ _0805FF90:
_0805FF94:
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807DB98
bl HandlePostScriptActions
pop {r4, r5, r6, pc}
.align 2, 0
asm/figurineDevice.s
+4 -4
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
asm/fourElements.s
+4 -4
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,13 +108,13 @@ _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
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]
asm/gorman.s
+4 -4
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
asm/goronMerchant.s
+2 -2
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
asm/gregal.s
+4 -4
View File
@@ -74,9 +74,9 @@ _0806CB4E:
_0806CB66:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r5, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r5, #0
bl GetNextFrame
pop {r4, r5, pc}
@@ -219,9 +219,9 @@ _0806CC7C: .4byte gPlayerEntity
_0806CC80:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
b _0806CCB0
asm/guardWithSpear.s
+2 -2
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
asm/kid.s
+4 -4
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
asm/librarians.s
+2 -2
View File
@@ -31,9 +31,9 @@ Librarians: @ 0x0806B9F0
_0806BA18:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
pop {r4, pc}
asm/macros/scripts.inc
+734
View File
@@ -0,0 +1,734 @@
@ All the macro functions for scripts
@ helper macros
.macro RecursiveOpcodeN count:req, opcode:req, size:req, arg:req, args:vararg
.ifnb \args
RecursiveOpcodeN \count + 1 \opcode \size \args
.else
.2byte 0x400 * (((\count) * \size) + 1) + \opcode
.endif
.endm
.macro RecursiveOpcode opcode:req, size:req, args:vararg
RecursiveOpcodeN 1 \opcode \size \args
.endm
.macro RecursiveArgs size:req, arg:req, args:vararg
\size \arg
.ifnb \args
RecursiveArgs \size \args
.endif
.endm
@ script macros
.macro SCRIPT_START name
.globl \name
.section .text
\name:
.endm
.macro SCRIPT_END
.2byte 0xffff
.endm
.macro Nop
.2byte 0x0400
.endm
.macro BeginBlock
.2byte 0x0401
.endm
.macro EndBlock
.2byte 0x0402
.endm
.macro Jump label:req
.2byte 0x0803
1: .2byte \label - 1b
.endm
.macro JumpIf label:req
.2byte 0x0804
1: .2byte \label - 1b
.endm
.macro JumpIfNot label:req
.2byte 0x0805
1: .2byte \label - 1b
.endm
.macro JumpTableLabel temp:req, label:req, labels:vararg
.2byte \label - \temp
.ifnb \labels
JumpTableLabel \temp - 2 \labels
.endif
.endm
.macro JumpTable labels:vararg
RecursiveOpcode 0x6 1 \labels
1:
JumpTableLabel 1b \labels
.endm
.macro JumpAbsolute label:req
.2byte 0x0c07
.4byte \label
.endm
.macro JumpAbsoluteIf label:req
.2byte 0x0c08
.4byte \label
.endm
.macro JumpAbsoluteIfNot label:req
.2byte 0x0c09
.4byte \label
.endm
.macro JumpAbsoluteTable labels:vararg
RecursiveOpcode 0xa 2 \labels
RecursiveArgs .4byte \labels
.endm
.macro Call function:req
.2byte 0x0c0b
.4byte \function
.endm
@this shouldn't be use without an argument
.macro CallWithArg function:req, argument
.ifnb \argument
.2byte 0x140c
.4byte \function
.4byte \argument
.else
.2byte 0x0c0c
.4byte \function
.endif
.endm
.macro LoadRoomEntityList entityDataList:req
.2byte 0x0c0d
.4byte \entityDataList
.endm
.macro TestBit bitmask:req
.2byte 0x0c0e
.4byte \bitmask
.endm
.macro CheckInventory1 s:req
.2byte 0x080f
.2byte \s
.endm
.macro CheckInventory2 s:req
.2byte 0x0810
.2byte \s
.endm
.macro HasRoomItemForSale
.2byte 0x0411
.endm
.macro CheckLocalFlag s:req
.2byte 0x0812
.2byte \s
.endm
.macro CheckLocalFlagByOffset a:req, b:req
.2byte 0x0c13
.2byte \a
.2byte \b
.endm
.macro CheckGlobalFlag s:req
.2byte 0x0814
.2byte \s
.endm
.macro CheckRoomFlag s:req
.2byte 0x0815
.2byte \s
.endm
.macro CheckPlayerInRegion x:req, y:req, dimension:req
.2byte 0x1016
.2byte \x
.2byte \y
.2byte \dimension
.endm
.macro CheckPlayerInRegion2 dimension:req
.2byte 0x0817
.2byte \dimension
.endm
.macro CheckEntityInteractType
.2byte 0x0418
.endm
.macro _0807E30C
.2byte 0x0419
.endm
.macro HasRupees amount:req
.2byte 0x081a
.2byte \amount
.endm
.macro _0807E3BC s:req
.2byte 0x081b
.2byte \s
.endm
.macro _0807E3E8
.2byte 0x041c
.endm
.macro CheckKinstoneFused s:req
.2byte 0x081d
.2byte \s
.endm
.macro BuyItem item, b
.2byte 0x0c1e
.ifnb \item
.2byte \item
.2byte \b
.else
.4byte 0
.endif
.endm
.macro _0807E48C s:req
.2byte 0x081f
.2byte \s
.endm
.macro _0807E4CC w:req
.2byte 0x0c20
.4byte \w
.endm
.macro _0807E4EC w:req
.2byte 0x0c21
.4byte \w
.endm
.macro _0807E514 w:req
.2byte 0x0c22
.4byte \w
.endm
.macro CheckPlayerFlags w:req
.2byte 0x0c23
.4byte \w
.endm
.macro _0807E564
.2byte 0x0424
.endm
.macro EntityHasHeight
.2byte 0x0425
.endm
.macro ComparePlayerAction s:req
.2byte 0x0826
.2byte \s
.endm
.macro ComparePlayerAnimationState s:req
.2byte 0x0827
.2byte \s
.endm
.macro _0807E5F8 w:req
.2byte 0x0c28
.4byte \w
.endm
.macro _0807E610 w:req
.2byte 0x0c29
.4byte \w
.endm
.macro SetLocalFlag s:req
.2byte 0x082a
.2byte \s
.endm
.macro SetLocalFlagByOffset a:req, b:req
.2byte 0x0c2b
.2byte \a
.2byte \b
.endm
.macro ClearLocalFlag s:req
.2byte 0x082c
.2byte \s
.endm
.macro SetGlobalFlag s:req
.2byte 0x082d
.2byte \s
.endm
.macro ClearGlobalFlag s:req
.2byte 0x082e
.2byte \s
.endm
.macro SetRoomFlag s:req
.2byte 0x082f
.2byte \s
.endm
.macro ClearRoomFlag s:req
.2byte 0x0830
.2byte \s
.endm
.macro Wait frames:req
.2byte 0x0831
.2byte \frames
.endm
.macro WaitForSomething w:req
.2byte 0x0c32
.4byte \w
.endm
.macro WaitForSomething2 w:req
.2byte 0x0c33
.4byte \w
.endm
.macro WaitPlayerAction8
.2byte 0x0434
.endm
.macro WaitForPlayerAction0x17
.2byte 0x0435
.endm
.macro WaitFor_1
.2byte 0x0436
.endm
.macro WaitFor_2
.2byte 0x0437
.endm
.macro _0807E778 s:req
.2byte 0x0838
.2byte \s
.endm
.macro _0807E788 w:req
.2byte 0x0c39
.4byte \w
.endm
.macro _0807E79C
.2byte 0x043a
.endm
.macro Nop2 s:req
.2byte 0x083b
.2byte \s
.endm
.macro DoFade4
.2byte 0x043c
.endm
.macro DoFade5
.2byte 0x043d
.endm
.macro DoFade6
.2byte 0x043e
.endm
.macro DoFade7
.2byte 0x043f
.endm
.macro _0807E800 w:req
.2byte 0x0c40
.4byte \w
.endm
.macro _0807E80C w:req
.2byte 0x0c41
.4byte \w
.endm
.macro _0807E858 s:req
.2byte 0x0842
.2byte \s
.endm
.macro _0807E858_0
.2byte 0x0442
.endm
.macro _0807E864
.2byte 0x0443
.endm
.macro _0807E878
.2byte 0x0444
.endm
.macro _0807E888
.2byte 0x0445
.endm
.macro SetPlayerAction w:req
.2byte 0x0c46
.4byte \w
.endm
.macro StartPlayerScript script:req
.2byte 0x0c47
.4byte \script
.endm
.macro _0807E8D4 s:req
.2byte 0x0848
.2byte \s
.endm
.macro _0807E8E4_0
.2byte 0x0449
.endm
.macro _0807E8E4_1
.2byte 0x044a
.endm
.macro _0807E8E4_2
.2byte 0x044b
.endm
.macro _0807E8E4_3
.2byte 0x044c
.endm
.macro _0807E908 s:req
.2byte 0x084d
.2byte \s
.endm
.macro SetIntVariable value:req
.2byte 0x0c4e
.4byte \value
.endm
.macro _0807E924
.2byte 0x044f
.endm
.macro _0807E930 s:req
.2byte 0x0850
.2byte \s
.endm
.macro _0807E944
.2byte 0x0451
.endm
.macro _0807E974 s:req
.2byte 0x0852
.2byte \s
.endm
.macro _0807E9D4
.2byte 0x0453
.endm
.macro _0807E9DC
.2byte 0x0454
.endm
.macro _0807E9E4 s:req
.2byte 0x0855
.2byte \s
.endm
.macro _0807E9F0
.2byte 0x0456
.endm
.macro _0807EA4C
.2byte 0x0457
.endm
.macro _0807EA88 s:req
.2byte 0x0858
.2byte \s
.endm
.macro _0807EA94
.2byte 0x0459
.endm
.macro TextboxNoOverlapFollow s:req
.2byte 0x085a
.2byte \s
.endm
.macro TextboxNoOverlap s:req
.2byte 0x085b
.2byte \s
.endm
.macro TextboxNoOverlapFollowPos a:req, b:req
.2byte 0x0c5c
.2byte \a
.2byte \b
.endm
.macro TextboxNoOverlapFollowPos_1 s:req
.2byte 0x085c
.2byte \s
.endm
.macro TextboxNoOverlapFollowTable labels:vararg
RecursiveOpcode 0x5d 1 \labels
RecursiveArgs .2byte \labels
.endm
.macro TextboxNoOverlapVar
.2byte 0x045e
.endm
.macro _0807EB28 s:req
.2byte 0x085f
.2byte \s
.endm
.macro _0807EB38
.2byte 0x0460
.endm
.macro _0807EB44 s:req
.2byte 0x0861
.2byte \s
.endm
.macro _0807EB4C a:req, b:req
.2byte 0x0c62
.2byte \a
.2byte \b
.endm
.macro _0807EB74
.2byte 0x0463
.endm
.macro _0807EB8C
.2byte 0x0464
.endm
.macro SetEntityDirection direction:req
.2byte 0x0865
.2byte \direction
.endm
.macro SetEntityDirectionWithAnimationState direction:req
.2byte 0x0866
.2byte \direction
.endm
.macro SetEntitySpeed speed:req
.2byte 0x0867
.2byte \speed
.endm
.macro SetEntity0x20 value:req
.2byte 0x0c68
.4byte \value
.endm
.macro SetEntityPositionRelative xOffset:req, yOffset:req
.2byte 0x0c69
.2byte \xOffset
.2byte \yOffset
.endm
.macro SetEntityPosition x:req, y:req
.2byte 0x0c6a
.2byte \x
.2byte \y
.endm
.macro MoveEntityToPlayer
.2byte 0x046b
.endm
.macro Nop3
.2byte 0x046c
.endm
.macro _0807EC1C s:req
.2byte 0x086d
.2byte \s
.endm
.macro _0807EC64 s:req
.2byte 0x086e
.2byte \s
.endm
.macro _0807EC94 s:req
.2byte 0x086f
.2byte \s
.endm
.macro _0807ECC4 s:req
.2byte 0x0870
.2byte \s
.endm
.macro _0807ECF4 s:req
.2byte 0x0871
.2byte \s
.endm
.macro _0807ED24 a:req, b:req, c:req
.2byte 0x1072
.2byte \a
.2byte \b
.2byte \c
.endm
.macro _0807EDD4 a:req, b:req
.2byte 0x0c73
.2byte \a
.2byte \b
.endm
.macro _0807EE04 a:req, b:req
.2byte 0x0c74
.2byte \a
.2byte \b
.endm
.macro _0807EE30
.2byte 0x0475
.endm
.macro _0807EEB4
.2byte 0x0476
.endm
.macro _0807EEF4 a:req, b:req
.2byte 0x0c77
.2byte \a
.2byte \b
.endm
.macro _0807EF3C a:req, b:req
.2byte 0x0c78
.2byte \a
.2byte \b
.endm
.macro DoPostScriptAction action:req
.2byte 0x0879
.2byte \action
.endm
.macro DoPostScriptAction2 action:req
.2byte 0x087a
.2byte \action
.endm
.macro SoundReq s:req
.2byte 0x087b
.2byte \s
.endm
.macro SoundReq2 s:req
.2byte 0x087c
.2byte \s
.endm
.macro SoundReq3 w:req
.2byte 0x0c7d
.4byte \w
.endm
.macro SoundReq0x80100000
.2byte 0x047e
.endm
.macro ModRupees amount:req
.2byte 0x087f
.2byte \amount
.endm
.macro ModHealth amount:req
.2byte 0x0880
.2byte \amount
.endm
@ this command doesn't actually take an argument
.macro IncreaseMaxHealth
.2byte 0x0881
.2byte 8
.endm
.macro _0807F034 s:req
.2byte 0x0882
.2byte \s
.endm
.macro _0807F050 s:req
.2byte 0x0883
.2byte \s
.endm
.macro GetInventoryValue s:req
.2byte 0x0884
.2byte \s
.endm
.macro _0807F078 a:req, b:req
.2byte 0x0c85
.2byte \a
.2byte \b
.endm
.macro _0807F088 s:req
.2byte 0x0886
.2byte \s
.endm
.macro CameraTargetEntity
.2byte 0x0487
.endm
.macro CameraTargetPlayer
.2byte 0x0488
.endm
.macro _0807F0B4 s:req
.2byte 0x0889
.2byte \s
.endm
.macro _0807F0C8 a:req, b:req
.2byte 0x0c8a
.2byte \a
.2byte \b
.endm
asm/mama.s
+2 -2
View File
@@ -75,9 +75,9 @@ _0806C41C: .4byte gPlayerEntity
_0806C420:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
b _0806C450
asm/manager16.s
+1 -1
View File
@@ -175,7 +175,7 @@ _0805AC6A:
beq _0805ACA6
adds r0, r3, #0
mov r1, sb
bl sub_0807DAF0
bl InitScriptForEntity
_0805ACA6:
adds r4, #0x10
adds r5, #1
asm/mazaalMacro.s
+4 -4
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:
@@ -334,7 +334,7 @@ _08034ED6:
sub_08034ED8: @ 0x08034ED8
push {lr}
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
pop {pc}
.align 2, 0
@@ -389,7 +389,7 @@ sub_08034EE4: @ 0x08034EE4
_08034F46:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
pop {r4, r5, pc}
.align 2, 0
_08034F50: .4byte gUnk_080CEEC8
asm/minishEzlo.s
+6 -6
View File
@@ -33,9 +33,9 @@ MinishEzlo: @ 0x08062F70
_08062FA0:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
adds r4, #0x5b
@@ -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
asm/mountainMinish.s
+2 -2
View File
@@ -199,9 +199,9 @@ _08067F94: .4byte gPlayerEntity
_08067F98:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r5, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
ldrb r0, [r5, #0xb]
cmp r0, #3
bne _0806801A
asm/object3E.s
+4 -4
View File
@@ -328,9 +328,9 @@ _0808D31C:
ldrsh r5, [r4, r0]
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
ldr r0, _0808D354 @ =gRoomControls
ldrh r0, [r0, #0x16]
cmp r0, #0
@@ -375,9 +375,9 @@ sub_0808D360: @ 0x0808D360
_0808D382:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
pop {r4, pc}
.align 2, 0
asm/object5B.s
+1 -1
View File
@@ -116,7 +116,7 @@ sub_08092940: @ 0x08092940
adds r5, r4, #0
adds r5, #0x84
ldr r1, [r5]
bl ExecuteScriptCommandSet
bl ExecuteScript
ldr r1, [r5]
adds r0, r4, #0
bl sub_08092958
asm/object6.s
+5 -5
View File
@@ -426,7 +426,7 @@ sub_08082B9C: @ 0x08082B9C
adds r4, #0x84
ldr r1, [r4]
adds r0, r6, #0
bl ExecuteScriptCommandSet
bl ExecuteScript
ldr r1, [r4]
adds r0, r6, #0
bl sub_08082D20
@@ -451,7 +451,7 @@ sub_08082C38: @ 0x08082C38
adds r4, r5, #0
adds r4, #0x84
ldr r1, [r4]
bl ExecuteScriptCommandSet
bl ExecuteScript
ldr r1, [r4]
adds r0, r5, #0
bl sub_08082D20
@@ -705,7 +705,7 @@ sub_08082E14: @ 0x08082E14
adds r0, #0x84
ldr r1, [r0]
adds r0, r4, #0
bl ExecuteScriptCommandSet
bl ExecuteScript
movs r1, #0xc0
lsls r1, r1, #5
adds r0, r4, #0
@@ -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
asm/object6A.s
+53 -53
View File
@@ -37,9 +37,9 @@ sub_08094A5C: @ 0x08094A5C
_08094A78:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
pop {r4, pc}
@@ -78,9 +78,9 @@ sub_08094A90: @ 0x08094A90
_08094ACE:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
@@ -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
@@ -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
@@ -933,9 +933,9 @@ sub_08095120: @ 0x08095120
_0809514C:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
@@ -984,9 +984,9 @@ sub_08095188: @ 0x08095188
_080951B4:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
pop {r4, pc}
thumb_func_start sub_080951C4
@@ -1010,9 +1010,9 @@ sub_080951C4: @ 0x080951C4
_080951E8:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
movs r1, #0x36
@@ -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
@@ -1261,9 +1261,9 @@ sub_080953A4: @ 0x080953A4
_080953E0:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
ldrb r0, [r4, #0xa]
@@ -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
@@ -1588,9 +1588,9 @@ _08095664:
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
pop {r4, r5, pc}
@@ -1795,9 +1795,9 @@ sub_080957DC: @ 0x080957DC
_080957F8:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
@@ -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
@@ -1884,9 +1884,9 @@ _08095880:
_080958B2:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r5, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
ldrb r4, [r5, #0xa]
movs r0, #0x5c
strb r0, [r5, #0xa]
@@ -1912,9 +1912,9 @@ sub_080958D8: @ 0x080958D8
_080958EC:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
@@ -1950,9 +1950,9 @@ sub_08095918: @ 0x08095918
_0809593C:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
pop {r4, pc}
@@ -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,9 +2003,9 @@ 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 @ =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
@@ -2038,9 +2038,9 @@ sub_080959CC: @ 0x080959CC
_080959F2:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
@@ -2146,9 +2146,9 @@ _08095ABC:
_08095ACC:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
b _08095B44
_08095ADC:
ldrb r0, [r4, #0xc]
@@ -2455,9 +2455,9 @@ sub_08095CE0: @ 0x08095CE0
_08095D06:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
@@ -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
@@ -2571,10 +2571,10 @@ _08095DD0:
_08095DE6:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
b _08095E74
.align 2, 0
_08095DF0: .4byte gUnk_02033280
_08095DF0: .4byte gActiveScriptInfo
_08095DF4:
ldrb r0, [r4, #0xc]
cmp r0, #0
@@ -2904,9 +2904,9 @@ sub_08096058: @ 0x08096058
_0809606C:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
pop {r4, pc}
@@ -2929,9 +2929,9 @@ sub_08096084: @ 0x08096084
_080960A0:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
ldr r0, [r4, #0x50]
@@ -3204,9 +3204,9 @@ sub_0809629C: @ 0x0809629C
_080962B2:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r5, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
movs r1, #0x80
lsls r1, r1, #5
adds r0, r5, #0
asm/object89.s
+3 -3
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,13 +94,13 @@ _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
push {lr}
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
pop {pc}
.align 2, 0
asm/object97.s
+8 -8
View File
@@ -901,9 +901,9 @@ sub_0809E088: @ 0x0809E088
push {r4, lr}
adds r4, r0, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
@@ -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
asm/objectB3.s
+2 -2
View File
@@ -103,7 +103,7 @@ sub_080A0ADC: @ 0x080A0ADC
bl sub_0807DD64
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
pop {r4, pc}
.align 2, 0
@@ -112,7 +112,7 @@ sub_080A0AF0: @ 0x080A0AF0
push {r4, lr}
adds r4, r0, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
asm/objectB9.s
+2 -2
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
asm/percy.s
+2 -2
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
asm/phonograph.s
+4 -4
View File
@@ -36,9 +36,9 @@ Phonograph: @ 0x0806E91C
_0806E950:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r5, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
pop {r4, r5, pc}
.align 2, 0
_0806E960: .4byte 0x0000FFFF
@@ -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
asm/picolyteBottles.s
+4 -4
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
asm/pina.s
+2 -2
View File
@@ -208,9 +208,9 @@ _08063BDC: .4byte gPlayerEntity
_08063BE0:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
b _08063C10
asm/postman.s
+2 -2
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
asm/rem.s
+14 -14
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
asm/sittingPerson.s
+2 -2
View File
@@ -110,9 +110,9 @@ _08063800: .4byte gPlayerEntity
_08063804:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r5, r4, #0
adds r5, #0x59
ldrb r0, [r5]
asm/stockwell.s
+15 -15
View File
@@ -22,7 +22,7 @@ Stockwell: @ 0x08065054
adds r0, #0x84
ldr r1, [r0]
adds r0, r4, #0
bl ExecuteScriptCommandSet
bl ExecuteScript
adds r0, r4, #0
bl sub_0806ED78
pop {r4, pc}
@@ -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
bl sub_0807DB88
ldr r1, _080650FC @ =script_080143C0
bl InitScriptExecutionContext
b _080651A6
.align 2, 0
_080650F8: .4byte gRoomVars
_080650FC: .4byte gUnk_080143C0
_080650FC: .4byte script_080143C0
_08065100:
adds r2, r5, #0
adds r2, #0x5a
@@ -124,7 +124,7 @@ _0806513C:
bl GetSaleItemConfirmMessageID
adds r7, r0, #0
ldrb r0, [r6, #6]
bl sub_08053FE0
bl GetItemPrice
mov r8, r0
movs r0, #4
strb r0, [r5, #0xc]
@@ -132,8 +132,8 @@ _0806513C:
adds r0, r5, #0
adds r0, #0x84
ldr r0, [r0]
ldr r1, _08065174 @ =gUnk_08014384
bl sub_0807DB88
ldr r1, _08065174 @ =script_08014384
bl InitScriptExecutionContext
_0806515E:
adds r0, r7, #0
adds r1, r5, #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]
@@ -529,7 +529,7 @@ _0806543C:
cmp r6, #0
beq _080654C8
adds r0, r5, #0
bl sub_08053FE0
bl GetItemPrice
adds r6, r0, #0
ldr r7, _08065494 @ =gSave
adds r0, r7, #0
@@ -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
asm/vaati.s
+1 -1
View File
@@ -313,7 +313,7 @@ _08066C86:
adds r0, #0x84
ldr r1, [r0]
mov r0, ip
bl sub_0807DB98
bl HandlePostScriptActions
pop {r4, r5, r6, pc}
thumb_func_start sub_08066C94
asm/whirlwind.s
+2 -2
View File
@@ -108,7 +108,7 @@ _08092D5C:
bl sub_0807DD64
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
_08092D74:
pop {r4, pc}
.align 2, 0
@@ -125,7 +125,7 @@ sub_08092D7C: @ 0x08092D7C
beq _08092D92
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
_08092D92:
ldrb r0, [r5, #0x18]
lsls r0, r0, #0x1e
asm/windTribespeople.s
+2 -2
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