ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 09:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a typo

Browse Source 
i couldnt find a function for 15 minutes because of this :(
This commit is contained in:
MCboy 2018-07-19 20:51:40 +04:30 committed by GitHub
parent 06b3ce408f
commit 9bb23388a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/field_player_avatar.s
View File

@ -67,7 +67,7 @@ player_step: @ 808A9C0
adds r0, r5, 0 adds r0, r5, 0
bl npc_clear_strange_bits bl npc_clear_strange_bits
bl DoPlayerAvatarTransition bl DoPlayerAvatarTransition
bl TryDoMetatileBehaviorForcedMovment bl TryDoMetatileBehaviorForcedMovement
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0808AA26 bne _0808AA26
@ -211,9 +211,9 @@ _0808AB0A:
.pool .pool
thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection
thumb_func_start TryDoMetatileBehaviorForcedMovment thumb_func_start TryDoMetatileBehaviorForcedMovement
@ bool8 TryDoMetatileBehaviorForcedMovment() @ bool8 TryDoMetatileBehaviorForcedMovement()
TryDoMetatileBehaviorForcedMovment: @ 808AB14 TryDoMetatileBehaviorForcedMovement: @ 808AB14
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_08497444 ldr r4, =gUnknown_08497444
bl GetForcedMovementByMetatileBehavior bl GetForcedMovementByMetatileBehavior
@ -228,7 +228,7 @@ TryDoMetatileBehaviorForcedMovment: @ 808AB14
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end TryDoMetatileBehaviorForcedMovment thumb_func_end TryDoMetatileBehaviorForcedMovement
thumb_func_start GetForcedMovementByMetatileBehavior thumb_func_start GetForcedMovementByMetatileBehavior
@ u8 GetForcedMovementByMetatileBehavior() @ u8 GetForcedMovementByMetatileBehavior()
@ -3305,6 +3305,7 @@ sub_808C228: @ 808C228
thumb_func_end sub_808C228 thumb_func_end sub_808C228
thumb_func_start sub_808C280 thumb_func_start sub_808C280
@ void sub_808C280(struct EventObject *playerEventObj);
sub_808C280: @ 808C280 sub_808C280: @ 808C280
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9