Skip to content

fix function symbols in script.s #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Henny022p wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −8
Open

fix function symbols in script.s #699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions asm/src/script.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,26 @@
gUnk_08016984:: @ 08016984
.incbin "code_08016984/gUnk_08016984.bin"

GetNextScriptCommandHalfword::
non_word_aligned_thumb_func_start GetNextScriptCommandHalfword
GetNextScriptCommandHalfword:
ldrh r0, [r0]
bx lr

GetNextScriptCommandHalfwordAfterCommandMetadata::
non_word_aligned_thumb_func_start GetNextScriptCommandHalfwordAfterCommandMetadata
GetNextScriptCommandHalfwordAfterCommandMetadata:
ldrh r0, [r0, #2]
bx lr

GetNextScriptCommandWord::
non_word_aligned_thumb_func_start GetNextScriptCommandWord
GetNextScriptCommandWord:
ldrh r1, [r0]
ldrh r0, [r0, #2]
lsls r0, r0, #0x10
orrs r0, r1
bx lr

GetNextScriptCommandWordAfterCommandMetadata::
non_word_aligned_thumb_func_start GetNextScriptCommandWordAfterCommandMetadata
GetNextScriptCommandWordAfterCommandMetadata:
ldrh r1, [r0, #2]
ldrh r0, [r0, #4]
lsls r0, r0, #0x10
Expand All @@ -46,7 +50,8 @@ gShakeOffsets::
.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

UpdateSpriteForCollisionLayer:: @ 0x08016A04
non_word_aligned_thumb_func_start UpdateSpriteForCollisionLayer
UpdateSpriteForCollisionLayer: @ 0x08016A04
movs r1, #0x38
ldrb r1, [r0, r1]
lsls r1, r1, #1
Expand All @@ -68,7 +73,8 @@ UpdateSpriteForCollisionLayer:: @ 0x08016A04
_08016A28:
.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40

ResolveCollisionLayer::
non_word_aligned_thumb_func_start ResolveCollisionLayer
ResolveCollisionLayer:
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #0x38
Expand Down Expand Up @@ -100,7 +106,8 @@ _08016A64:
bl UpdateSpriteForCollisionLayer
pop {r4, r5, pc}

CheckOnLayerTransition::
non_word_aligned_thumb_func_start CheckOnLayerTransition
CheckOnLayerTransition:
push {r4, r5, lr}
adds r4, r0, #0
bl GetActTileAtEntity // tile under me
Expand Down Expand Up @@ -141,7 +148,8 @@ gTransitionTiles:
transition_tile 0x26, 3, 3
.short 0x0000

UpdateCollisionLayer::
non_word_aligned_thumb_func_start UpdateCollisionLayer
UpdateCollisionLayer:
push {r4, lr}
adds r4, r0, #0
bl CheckOnLayerTransition
Expand Down