diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-14 20:23:25 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-14 20:23:25 +0100 |
| commit | a972de7bca29f890cc130d2029c29233de29c86e (patch) | |
| tree | e1be8e87969f10e8757e446a85c4656fd5b561b7 /asm/pokemon_1.s | |
| parent | 72b57b342eaf6e4a3ea77fae8b40e4ab11c64ae2 (diff) | |
start working on daycare
Diffstat (limited to 'asm/pokemon_1.s')
| -rw-r--r-- | asm/pokemon_1.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s index ed97cd672..15b4af009 100644 --- a/asm/pokemon_1.s +++ b/asm/pokemon_1.s @@ -1310,8 +1310,8 @@ _08068FF4: bx r0 thumb_func_end CalculateMonStats - thumb_func_start sub_8069004 -sub_8069004: @ 8069004 + thumb_func_start BoxMonToMon +BoxMonToMon: @ 8069004 push {r4,lr} sub sp, 0x4 adds r2, r0, 0 @@ -1346,7 +1346,7 @@ sub_8069004: @ 8069004 pop {r4} pop {r0} bx r0 - thumb_func_end sub_8069004 + thumb_func_end BoxMonToMon thumb_func_start GetLevelFromMonExp GetLevelFromMonExp: @ 8069054 |