diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /asm/pokemon_storage_system.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rwxr-xr-x | asm/pokemon_storage_system.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index af99e27e8..6cca9c144 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -586,7 +586,7 @@ _080C73F6: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EBCAD + ldr r2, =gText_PartyFull str r4, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -609,7 +609,7 @@ _080C7428: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EBC89 + ldr r2, =gText_JustOnePkmn movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -1020,7 +1020,7 @@ _080C779E: lsls r0, r5, 24 lsrs r0, 24 bl sav3_get_box_name - ldr r1, =gUnknown_085EBCC1 + ldr r1, =gText_Box bl StringCopy adds r4, r5, 0x1 adds r1, r4, 0 |