diff options
Diffstat (limited to 'asm/battle_message.s')
| -rw-r--r-- | asm/battle_message.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/battle_message.s b/asm/battle_message.s index c224df9f9..dec210b25 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -42,7 +42,7 @@ BufferStringBattle: @ 814E0C4 ldr r1, [r4] ldrb r1, [r1, 0x9] strb r1, [r0] - ldr r1, =gUnknown_0202420F + ldr r1, =gStringBank ldr r2, [r4] ldrb r0, [r2, 0xA] strb r0, [r1] @@ -1602,7 +1602,7 @@ _0814EF98: ldrb r0, [r0] cmp r0, 0 beq _0814EFE0 - ldr r2, =gUnknown_0202420F + ldr r2, =gStringBank ldrb r1, [r2] movs r0, 0x1 ands r0, r1 @@ -1611,7 +1611,7 @@ _0814EF98: b _0814F05C .pool _0814EFE0: - ldr r2, =gUnknown_0202420F + ldr r2, =gStringBank ldrb r1, [r2] movs r0, 0x1 ands r0, r1 @@ -1640,7 +1640,7 @@ _0814F014: subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, =gUnknown_0202420F + ldr r1, =gStringBank ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 @@ -2237,11 +2237,11 @@ _0814F584: b _0814F5C0 .pool _0814F594: - ldr r0, =gUnknown_02038BCE + ldr r0, =gPartnerTrainerId _0814F596: ldrh r0, [r0] _0814F598: - bl sub_8162BD8 + bl GetFrontierOpponentClass _0814F59C: lsls r0, 24 lsrs r0, 24 @@ -2254,12 +2254,12 @@ _0814F5A2: b _0814F5C0 .pool _0814F5B4: - ldr r0, =gUnknown_02038BCE + ldr r0, =gPartnerTrainerId _0814F5B6: ldrh r1, [r0] _0814F5B8: mov r0, sp - bl sub_8162E20 + bl GetFrontierTrainerName _0814F5BE: mov r4, sp _0814F5C0: @@ -2513,7 +2513,7 @@ _0814F7A4: b _0814F8DE .pool _0814F7BC: - ldr r1, =gUnknown_085CBE00 + ldr r1, =gStatNamesTable adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 @@ -2606,7 +2606,7 @@ _0814F858: subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, =gUnknown_0202420F + ldr r1, =gStringBank ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 |