summaryrefslogtreecommitdiff
path: root/asm/battle_5.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-01 18:54:01 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-01 18:54:01 +0200
commit1fcafaf35aaf92251e7802e1e3ea36e8d5a6067b (patch)
treeafcfa3b51d96b15bcddfcfc9665bb95b46b2a972 /asm/battle_5.s
parent729f4e10ed8a53155d992b8904926a10181acafa (diff)
more of battle2 done
Diffstat (limited to 'asm/battle_5.s')
-rw-r--r--asm/battle_5.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_5.s b/asm/battle_5.s
index 3163631a9..4d02a5942 100644
--- a/asm/battle_5.s
+++ b/asm/battle_5.s
@@ -104,8 +104,8 @@ _08056FFA:
.pool
thumb_func_end AllocateBattleResrouces
- thumb_func_start sub_8057028
-sub_8057028: @ 8057028
+ thumb_func_start FreeBattleResources
+FreeBattleResources: @ 8057028
push {r4-r6,lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -181,7 +181,7 @@ _080570D0:
pop {r0}
bx r0
.pool
- thumb_func_end sub_8057028
+ thumb_func_end FreeBattleResources
thumb_func_start AdjustFriendshipOnBattleFaint
AdjustFriendshipOnBattleFaint: @ 80570F4