diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-15 00:47:34 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-15 00:47:34 -0600 |
| commit | ce0e5cbfe4439a9767134a670868f65cc9920e65 (patch) | |
| tree | 07d1e496a653dc2c6584022cb977bbdf273858aa /asm/link.s | |
| parent | 6e6e11205d312a296391ec7d16d809e52c5b4027 (diff) | |
| parent | 3fb2a488f99d4d8499a2b0247f73f45837b07156 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps
Diffstat (limited to 'asm/link.s')
| -rw-r--r-- | asm/link.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/link.s b/asm/link.s index 7c324cd88..c1ab6c434 100644 --- a/asm/link.s +++ b/asm/link.s @@ -52022,7 +52022,7 @@ _080241A6: movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_082C8959 + ldr r2, =gText_SavingDontTurnOffPower movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -64112,7 +64112,7 @@ _0802A3AE: movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_082C8959 + ldr r2, =gText_SavingDontTurnOffPower str r4, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -69004,7 +69004,7 @@ _0802CA32: ldrh r0, [r7] ldr r1, [r7, 0x4] ldr r2, [r7, 0x8] - bl species_and_otid_get_pal + bl GetFrontSpritePalFromSpeciesAndPersonality str r0, [sp, 0x20] add r0, sp, 0x20 ldr r1, [r0, 0x4] @@ -70355,7 +70355,7 @@ _0802D516: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_082C8959 + ldr r2, =gText_SavingDontTurnOffPower movs r1, 0x1 str r1, [sp] movs r1, 0xFF |