diff options
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 2ef2fccc6..c86f198c7 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -1082,7 +1082,7 @@ _080B0F2E: thumb_func_start reads_trainer_data_byte1_byte0x18 reads_trainer_data_byte1_byte0x18: @ 80B0F34 push {r4-r6,lr} - ldr r4, =gUnknown_02038BCA + ldr r4, =gTrainerBattleOpponent_A ldrh r1, [r4] movs r0, 0x80 lsls r0, 3 @@ -1481,7 +1481,7 @@ TrainerBattleLoadArg8: @ 80B1274 thumb_func_start trainerflag_opponent trainerflag_opponent: @ 80B1278 - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A movs r2, 0xA0 lsls r2, 3 adds r0, r2, 0 @@ -1495,7 +1495,7 @@ trainerflag_opponent: @ 80B1278 thumb_func_start sub_80B1290 sub_80B1290: @ 80B1290 - ldr r1, =gUnknown_02038BCC + ldr r1, =gTrainerBattleOpponent_B movs r2, 0xA0 lsls r2, 3 adds r0, r2, 0 @@ -1540,10 +1540,10 @@ _080B12E2: thumb_func_start ResetTrainerOpponentIds ResetTrainerOpponentIds: @ 80B12E8 - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A movs r1, 0 strh r1, [r0] - ldr r0, =gUnknown_02038BCC + ldr r0, =gTrainerBattleOpponent_B strh r1, [r0] bx lr .pool @@ -1765,7 +1765,7 @@ _080B14EC: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r4, =gUnknown_02038BCA + ldr r4, =gTrainerBattleOpponent_A ldrh r0, [r4] bl sub_80B2234 strh r0, [r4] @@ -1777,7 +1777,7 @@ _080B1514: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r4, =gUnknown_02038BCA + ldr r4, =gTrainerBattleOpponent_A ldrh r0, [r4] bl sub_80B2234 strh r0, [r4] @@ -1796,7 +1796,7 @@ _080B153C: ldr r0, =gScriptLastTalked ldrb r0, [r0] bl sub_81A9AA8 - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A b _080B157E .pool _080B156C: @@ -1807,7 +1807,7 @@ _080B156C: ldrb r0, [r0] bl sub_81A9AA8 _080B157C: - ldr r1, =gUnknown_02038BCC + ldr r1, =gTrainerBattleOpponent_B _080B157E: strh r0, [r1] b _080B161C @@ -1836,7 +1836,7 @@ _080B15A8: ldr r0, =gScriptLastTalked ldrb r0, [r0] bl battle_init - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A b _080B157E .pool _080B15D8: @@ -2027,7 +2027,7 @@ _080B1752: thumb_func_start rom_npc_set_flag_for_script_id rom_npc_set_flag_for_script_id: @ 80B1760 push {lr} - ldr r0, =gUnknown_02038BCC + ldr r0, =gTrainerBattleOpponent_B ldrh r0, [r0] cmp r0, 0 beq _080B1776 @@ -2222,7 +2222,7 @@ _080B190C: thumb_func_start sub_80B1918 sub_80B1918: @ 80B1918 push {lr} - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -2273,7 +2273,7 @@ _080B198A: thumb_func_start sub_80B1994 sub_80B1994: @ 80B1994 push {lr} - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -2481,11 +2481,11 @@ SetUpTrainerEncounterMusic: @ 80B1B70 ldrb r0, [r0] cmp r0, 0 bne _080B1B88 - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A b _080B1B8A .pool _080B1B88: - ldr r0, =gUnknown_02038BCC + ldr r0, =gTrainerBattleOpponent_B _080B1B8A: ldrh r1, [r0] ldr r0, =gUnknown_02038BC8 @@ -2620,7 +2620,7 @@ _080B1C96: thumb_func_start sub_80B1CA4 sub_80B1CA4: @ 80B1CA4 push {r4,lr} - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -3202,7 +3202,7 @@ sub_80B20BC: @ 80B20BC lsls r0, 24 cmp r0, 0 beq _080B20E2 - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A ldrh r0, [r0] bl sub_80B208C adds r1, r0, 0 @@ -3423,7 +3423,7 @@ sub_80B2250: @ 80B2250 sub_80B226C: @ 80B226C push {r4,r5,lr} ldr r5, =gUnknown_085500A4 - ldr r4, =gUnknown_02038BCA + ldr r4, =gTrainerBattleOpponent_A ldrh r1, [r4] adds r0, r5, 0 bl sub_80B1F38 @@ -3449,7 +3449,7 @@ _080B229A: sub_80B22A0: @ 80B22A0 push {lr} ldr r0, =gUnknown_085500A4 - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A ldrh r1, [r1] bl sub_80B1F74 lsls r0, 24 @@ -3463,7 +3463,7 @@ sub_80B22A0: @ 80B22A0 sub_80B22BC: @ 80B22BC push {lr} ldr r0, =gUnknown_085500A4 - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A ldrh r1, [r1] bl sub_80B205C bl rom_npc_set_flag_for_script_id |