diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 02:56:44 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 02:56:44 -0800 |
| commit | ae3ef7fec619413ae6a997f0dca4cb08fbd8e8c1 (patch) | |
| tree | ec75f97a5391dfde62600a8c7bb5b8e2d3dc82f8 /asm/metatile_behavior.s | |
| parent | b5d877603b9d9ef0d1964aceb1430fe6a540f1c5 (diff) | |
import more pokeemerald names
Diffstat (limited to 'asm/metatile_behavior.s')
| -rw-r--r-- | asm/metatile_behavior.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s index dc4c567ac..d92dbbcaf 100644 --- a/asm/metatile_behavior.s +++ b/asm/metatile_behavior.s @@ -997,8 +997,8 @@ _08059FF0: bx r1 thumb_func_end sub_8059FE0 - thumb_func_start sub_8059FF4 -sub_8059FF4: @ 8059FF4 + thumb_func_start MetatileBehavior_IsThinIce +MetatileBehavior_IsThinIce: @ 8059FF4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1011,10 +1011,10 @@ _0805A002: _0805A004: pop {r1} bx r1 - thumb_func_end sub_8059FF4 + thumb_func_end MetatileBehavior_IsThinIce - thumb_func_start sub_805A008 -sub_805A008: @ 805A008 + thumb_func_start MetatileBehavior_IsCrackedIce +MetatileBehavior_IsCrackedIce: @ 805A008 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1027,7 +1027,7 @@ _0805A016: _0805A018: pop {r1} bx r1 - thumb_func_end sub_805A008 + thumb_func_end MetatileBehavior_IsCrackedIce thumb_func_start sub_805A01C sub_805A01C: @ 805A01C @@ -1068,8 +1068,8 @@ _0805A04C: bx r1 thumb_func_end sub_805A03C - thumb_func_start sub_805A050 -sub_805A050: @ 805A050 + thumb_func_start MetatileBehavior_IsSurfableAndNotWaterfall +MetatileBehavior_IsSurfableAndNotWaterfall: @ 805A050 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1091,7 +1091,7 @@ _0805A074: pop {r4} pop {r1} bx r1 - thumb_func_end sub_805A050 + thumb_func_end MetatileBehavior_IsSurfableAndNotWaterfall thumb_func_start sub_805A07C sub_805A07C: @ 805A07C |