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_storage_system.s | |
| parent | 72b57b342eaf6e4a3ea77fae8b40e4ab11c64ae2 (diff) | |
start working on daycare
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rwxr-xr-x | asm/pokemon_storage_system.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index a8365ba18..0d331e9a0 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -3539,7 +3539,7 @@ _080C8E38: b _080C8EA0 .pool _080C8E4C: - bl party_compaction + bl CompactPartySlots bl sub_80CB950 ldr r0, =gUnknown_02039D08 ldr r1, [r0] @@ -3699,7 +3699,7 @@ _080C8FA4: ldrb r0, [r0] cmp r0, 0 beq _080C8FD0 - bl party_compaction + bl CompactPartySlots bl sub_80CB950 b _080C905C .pool @@ -4453,7 +4453,7 @@ sub_80C9670: @ 80C9670 b _080C96AE .pool _080C9688: - bl party_compaction + bl CompactPartySlots bl sub_80CB950 ldr r1, [r4] ldrb r0, [r1] @@ -6567,7 +6567,7 @@ _080CA94C: movs r1, 0 strb r1, [r0] bl sub_80CBB9C - bl party_compaction + bl CompactPartySlots movs r0, 0x2 str r0, [sp] movs r1, 0 @@ -14193,8 +14193,8 @@ _080CE900: .pool thumb_func_end sub_80CE8E4 - thumb_func_start party_compaction -party_compaction: @ 80CE90C + thumb_func_start CompactPartySlots +CompactPartySlots: @ 80CE90C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -14271,7 +14271,7 @@ _080CE992: pop {r1} bx r1 .pool - thumb_func_end party_compaction + thumb_func_end CompactPartySlots thumb_func_start sub_80CE9A8 sub_80CE9A8: @ 80CE9A8 @@ -21042,7 +21042,7 @@ sub_80D2054: @ 80D2054 lsls r1, 4 adds r0, r1 adds r1, r5, 0 - bl sub_8069004 + bl BoxMonToMon _080D2088: pop {r4,r5} pop {r0} |