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

Merge 07655286a6 into cd2b8d4b53

This commit is contained in:
Henny022p 2025-03-02 17:20:06 +01:00 committed by GitHub
parent cd2b8d4b53 07655286a6
commit 5f1ec71337
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/src/script.s
View File

@ -15,22 +15,26 @@
gUnk_08016984:: @ 08016984 gUnk_08016984:: @ 08016984
.incbin "code_08016984/gUnk_08016984.bin" .incbin "code_08016984/gUnk_08016984.bin"
GetNextScriptCommandHalfword:: non_word_aligned_thumb_func_start GetNextScriptCommandHalfword
GetNextScriptCommandHalfword:
ldrh r0, [r0] ldrh r0, [r0]
bx lr bx lr
GetNextScriptCommandHalfwordAfterCommandMetadata:: non_word_aligned_thumb_func_start GetNextScriptCommandHalfwordAfterCommandMetadata
GetNextScriptCommandHalfwordAfterCommandMetadata:
ldrh r0, [r0, #2] ldrh r0, [r0, #2]
bx lr bx lr
GetNextScriptCommandWord:: non_word_aligned_thumb_func_start GetNextScriptCommandWord
GetNextScriptCommandWord:
ldrh r1, [r0] ldrh r1, [r0]
ldrh r0, [r0, #2] ldrh r0, [r0, #2]
lsls r0, r0, #0x10 lsls r0, r0, #0x10
orrs r0, r1 orrs r0, r1
bx lr bx lr
GetNextScriptCommandWordAfterCommandMetadata:: non_word_aligned_thumb_func_start GetNextScriptCommandWordAfterCommandMetadata
GetNextScriptCommandWordAfterCommandMetadata:
ldrh r1, [r0, #2] ldrh r1, [r0, #2]
ldrh r0, [r0, #4] ldrh r0, [r0, #4]
lsls r0, r0, #0x10 lsls r0, r0, #0x10
@ -46,7 +50,8 @@ gShakeOffsets::
.byte 0, -1, 0, -2, 0, -1, 0, 0, 0, 1, 0, 2, 0, 0, 0, 1 .byte 0, -1, 0, -2, 0, -1, 0, 0, 0, 1, 0, 2, 0, 0, 0, 1
.byte 2, 0, 1, 0, 0, 0, -1, 0, -1, 0, -1, 0, 0, 0, 1, 0 .byte 2, 0, 1, 0, 0, 0, -1, 0, -1, 0, -1, 0, 0, 0, 1, 0
UpdateSpriteForCollisionLayer:: @ 0x08016A04 non_word_aligned_thumb_func_start UpdateSpriteForCollisionLayer
UpdateSpriteForCollisionLayer: @ 0x08016A04
movs r1, #0x38 movs r1, #0x38
ldrb r1, [r0, r1] ldrb r1, [r0, r1]
lsls r1, r1, #1 lsls r1, r1, #1
@ -68,7 +73,8 @@ UpdateSpriteForCollisionLayer:: @ 0x08016A04
_08016A28: _08016A28:
.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40 .byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40
ResolveCollisionLayer:: non_word_aligned_thumb_func_start ResolveCollisionLayer
ResolveCollisionLayer:
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
movs r5, #0x38 movs r5, #0x38
@ -100,7 +106,8 @@ _08016A64:
bl UpdateSpriteForCollisionLayer bl UpdateSpriteForCollisionLayer
pop {r4, r5, pc} pop {r4, r5, pc}
CheckOnLayerTransition:: non_word_aligned_thumb_func_start CheckOnLayerTransition
CheckOnLayerTransition:
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
bl GetActTileAtEntity // tile under me bl GetActTileAtEntity // tile under me
@ -141,7 +148,8 @@ gTransitionTiles:
transition_tile 0x26, 3, 3 transition_tile 0x26, 3, 3
.short 0x0000 .short 0x0000
UpdateCollisionLayer:: non_word_aligned_thumb_func_start UpdateCollisionLayer
UpdateCollisionLayer:
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
bl CheckOnLayerTransition bl CheckOnLayerTransition