dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into quest_log

Browse Source
This commit is contained in:
PikalaxALT
2018-11-21 09:00:41 -05:00
parent 6bcabeab1e 2ed26ab8fc
commit 77d7434df2
44 changed files with 5266 additions and 6718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_player_avatar.s
+9 -9
View File
@@ -213,7 +213,7 @@ sub_805B528: @ 805B528
cmp r0, 0
beq _0805B598
ldrb r0, [r5, 0x1C]
bl sub_805A344
bl MetatileBehavior_IsSpinTile
lsls r0, 24
cmp r0, 0
beq _0805B598
@@ -230,13 +230,13 @@ sub_805B528: @ 805B528
cmp r0, 0
beq _0805B586
ldrb r0, [r1, 0x1E]
bl sub_805A330
bl MetatileBehavior_IsStopSpinning
lsls r0, 24
cmp r0, 0
bne _0805B598
ldr r0, [r4]
ldrb r0, [r0, 0x1E]
bl sub_805A344
bl MetatileBehavior_IsSpinTile
lsls r0, 24
cmp r0, 0
beq _0805B57A
@@ -1015,7 +1015,7 @@ _0805BB00:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_805A460
bl MetatileBehavior_IsRockStairs
lsls r0, 24
lsrs r0, 24
b _0805BB14
@@ -1335,7 +1335,7 @@ sub_805BCEC: @ 805BCEC
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059C8C
bl MetatileBehavior_IsCaveDoor
lsls r0, 24
cmp r0, 0
bne _0805BDA0
@@ -2322,12 +2322,12 @@ sub_805C438: @ 805C438
cmp r5, 0x3
bne _0805C484
adds r0, r4, 0
bl sub_8059C20
bl MetatileBehavior_IsUnknownWarp6D
lsls r0, 24
cmp r0, 0
bne _0805C4DE
adds r0, r4, 0
bl sub_8059C48
bl MetatileBehavior_IsUnknownWarp6F
lsls r0, 24
cmp r0, 0
bne _0805C4DE
@@ -2335,12 +2335,12 @@ _0805C484:
cmp r5, 0x4
bne _0805C4A0
adds r0, r4, 0
bl sub_8059C0C
bl MetatileBehavior_IsUnknownWarp6C
lsls r0, 24
cmp r0, 0
bne _0805C4DE
adds r0, r4, 0
bl sub_8059C34
bl MetatileBehavior_IsUnknownWarp6E
lsls r0, 24
cmp r0, 0
bne _0805C4DE