diff options
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 356 |
1 files changed, 178 insertions, 178 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 079d23b2b..85330c8fa 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -14,7 +14,7 @@ task01_battle_start: @ 8081960 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08081980 + ldr r1, _08081980 @ =gUnknown_03004B28 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -41,7 +41,7 @@ _0808199A: lsrs r0, 24 cmp r0, 0x1 bne _080819BA - ldr r0, _080819C0 + ldr r0, _080819C0 @ =sub_800E7C4 bl SetMainCallback2 bl prev_quest_postbuffer_cursor_backup_reset bl overworld_poison_timer_set @@ -64,12 +64,12 @@ task_add_01_battle_start: @ 80819C4 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _080819F8 + ldr r0, _080819F8 @ =task01_battle_start movs r1, 0x1 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080819FC + ldr r2, _080819FC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -106,10 +106,10 @@ sub_8081A18: @ 8081A18 bl ScriptContext2_Enable bl player_bitmagic bl sub_80597F4 - ldr r1, _08081A50 - ldr r0, _08081A54 + ldr r1, _08081A50 @ =gMain + ldr r0, _08081A54 @ =sub_8081C8C str r0, [r1, 0x8] - ldr r1, _08081A58 + ldr r1, _08081A58 @ =gUnknown_020239F8 movs r0, 0 strh r0, [r1] bl sub_8082034 @@ -135,10 +135,10 @@ sub_8081A5C: @ 8081A5C bl ScriptContext2_Enable bl player_bitmagic bl sub_80597F4 - ldr r1, _08081A98 - ldr r0, _08081A9C + ldr r1, _08081A98 @ =gMain + ldr r0, _08081A9C @ =sub_8081C8C str r0, [r1, 0x8] - ldr r1, _08081AA0 + ldr r1, _08081AA0 @ =gUnknown_020239F8 movs r2, 0x80 lsls r2, 3 adds r0, r2, 0 @@ -166,10 +166,10 @@ sub_8081AA4: @ 8081AA4 bl ScriptContext2_Enable bl player_bitmagic bl sub_80597F4 - ldr r1, _08081AD0 - ldr r0, _08081AD4 + ldr r1, _08081AD0 @ =gMain + ldr r0, _08081AD4 @ =sub_80C824C str r0, [r1, 0x8] - ldr r1, _08081AD8 + ldr r1, _08081AD8 @ =gUnknown_020239F8 movs r0, 0x80 strh r0, [r1] bl sub_8082034 @@ -204,16 +204,16 @@ task_add_01_battle_start_with_music_and_stats: @ 8081ADC thumb_func_start sub_8081AFC sub_8081AFC: @ 8081AFC push {lr} - ldr r0, _08081B2C + ldr r0, _08081B2C @ =gEnemyParty movs r1, 0xC4 lsls r1, 1 movs r2, 0x5 bl CreateMaleMon bl ScriptContext2_Enable - ldr r1, _08081B30 - ldr r0, _08081B34 + ldr r1, _08081B30 @ =gMain + ldr r0, _08081B34 @ =c2_exit_to_overworld_1_continue_scripts_restart_music str r0, [r1, 0x8] - ldr r1, _08081B38 + ldr r1, _08081B38 @ =gUnknown_020239F8 movs r2, 0x80 lsls r2, 2 adds r0, r2, 0 @@ -234,10 +234,10 @@ _08081B38: .4byte gUnknown_020239F8 sub_8081B3C: @ 8081B3C push {lr} bl ScriptContext2_Enable - ldr r1, _08081B6C - ldr r0, _08081B70 + ldr r1, _08081B6C @ =gMain + ldr r0, _08081B70 @ =sub_8081CEC str r0, [r1, 0x8] - ldr r1, _08081B74 + ldr r1, _08081B74 @ =gUnknown_020239F8 movs r0, 0 strh r0, [r1] bl sub_8082034 @@ -261,10 +261,10 @@ _08081B74: .4byte gUnknown_020239F8 sub_8081B78: @ 8081B78 push {lr} bl ScriptContext2_Enable - ldr r1, _08081BAC - ldr r0, _08081BB0 + ldr r1, _08081BAC @ =gMain + ldr r0, _08081BB0 @ =sub_8081CEC str r0, [r1, 0x8] - ldr r1, _08081BB4 + ldr r1, _08081BB4 @ =gUnknown_020239F8 movs r2, 0x80 lsls r2, 6 adds r0, r2, 0 @@ -290,15 +290,15 @@ _08081BB4: .4byte gUnknown_020239F8 sub_8081BB8: @ 8081BB8 push {lr} bl ScriptContext2_Enable - ldr r1, _08081BE8 - ldr r0, _08081BEC + ldr r1, _08081BE8 @ =gMain + ldr r0, _08081BEC @ =sub_8081CEC str r0, [r1, 0x8] - ldr r1, _08081BF0 + ldr r1, _08081BF0 @ =gUnknown_020239F8 movs r2, 0x80 lsls r2, 6 adds r0, r2, 0 strh r0, [r1] - ldr r1, _08081BF4 + ldr r1, _08081BF4 @ =0x000001cf movs r0, 0 bl task_add_01_battle_start movs r0, 0x7 @@ -318,19 +318,19 @@ _08081BF4: .4byte 0x000001cf sub_8081BF8: @ 8081BF8 push {lr} bl ScriptContext2_Enable - ldr r1, _08081C20 - ldr r0, _08081C24 + ldr r1, _08081C20 @ =gMain + ldr r0, _08081C24 @ =sub_8081CEC str r0, [r1, 0x8] - ldr r1, _08081C28 + ldr r1, _08081C28 @ =gUnknown_020239F8 movs r2, 0xC0 lsls r2, 6 adds r0, r2, 0 strh r0, [r1] - ldr r0, _08081C2C + ldr r0, _08081C2C @ =gGameVersion ldrb r0, [r0] cmp r0, 0x2 bne _08081C34 - ldr r1, _08081C30 + ldr r1, _08081C30 @ =0x000001cf movs r0, 0xB bl task_add_01_battle_start b _08081C3C @@ -341,7 +341,7 @@ _08081C28: .4byte gUnknown_020239F8 _08081C2C: .4byte gGameVersion _08081C30: .4byte 0x000001cf _08081C34: - ldr r1, _08081C4C + ldr r1, _08081C4C @ =0x000001cf movs r0, 0x6 bl task_add_01_battle_start _08081C3C: @@ -359,10 +359,10 @@ _08081C4C: .4byte 0x000001cf sub_8081C50: @ 8081C50 push {lr} bl ScriptContext2_Enable - ldr r1, _08081C80 - ldr r0, _08081C84 + ldr r1, _08081C80 @ =gMain + ldr r0, _08081C84 @ =sub_8081CEC str r0, [r1, 0x8] - ldr r1, _08081C88 + ldr r1, _08081C88 @ =gUnknown_020239F8 movs r2, 0xC0 lsls r2, 7 adds r0, r2, 0 @@ -392,18 +392,18 @@ sub_8081C8C: @ 8081C8C strh r0, [r1] movs r1, 0xA0 lsls r1, 19 - ldr r2, _08081CC0 + ldr r2, _08081CC0 @ =0x01000100 mov r0, sp bl CpuSet movs r0, 0 movs r1, 0x80 bl ResetOamRange - ldr r0, _08081CC4 + ldr r0, _08081CC4 @ =gUnknown_02024D26 ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 bne _08081CCC - ldr r0, _08081CC8 + ldr r0, _08081CC8 @ =c2_whiteout bl SetMainCallback2 b _08081CD8 .align 2, 0 @@ -411,10 +411,10 @@ _08081CC0: .4byte 0x01000100 _08081CC4: .4byte gUnknown_02024D26 _08081CC8: .4byte c2_whiteout _08081CCC: - ldr r0, _08081CE0 + ldr r0, _08081CE0 @ =c2_exit_to_overworld_2_switch bl SetMainCallback2 - ldr r1, _08081CE4 - ldr r0, _08081CE8 + ldr r1, _08081CE4 @ =gUnknown_0300485C + ldr r0, _08081CE8 @ =sub_8080E44 str r0, [r1] _08081CD8: add sp, 0x4 @@ -435,18 +435,18 @@ sub_8081CEC: @ 8081CEC strh r0, [r1] movs r1, 0xA0 lsls r1, 19 - ldr r2, _08081D20 + ldr r2, _08081D20 @ =0x01000100 mov r0, sp bl CpuSet movs r0, 0 movs r1, 0x80 bl ResetOamRange - ldr r0, _08081D24 + ldr r0, _08081D24 @ =gUnknown_02024D26 ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 bne _08081D2C - ldr r0, _08081D28 + ldr r0, _08081D28 @ =c2_whiteout bl SetMainCallback2 b _08081D32 .align 2, 0 @@ -454,7 +454,7 @@ _08081D20: .4byte 0x01000100 _08081D24: .4byte gUnknown_02024D26 _08081D28: .4byte c2_whiteout _08081D2C: - ldr r0, _08081D38 + ldr r0, _08081D38 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 _08081D32: add sp, 0x4 @@ -504,13 +504,13 @@ _08081D82: lsls r0, 24 cmp r0, 0 bne _08081E84 - ldr r0, _08081DA4 + ldr r0, _08081DA4 @ =gMapHeader ldrb r0, [r0, 0x17] subs r0, 0x1 cmp r0, 0x8 bhi _08081E08 lsls r0, 2 - ldr r1, _08081DA8 + ldr r1, _08081DA8 @ =_08081DAC adds r0, r1 ldr r0, [r0] mov pc, r0 @@ -603,7 +603,7 @@ _08081E5E: movs r0, 0x4 b _08081E86 _08081E62: - ldr r0, _08081E80 + ldr r0, _08081E80 @ =gSaveBlock1 ldrh r1, [r0, 0x4] movs r0, 0xE0 lsls r0, 5 @@ -658,7 +658,7 @@ _08081EC0: lsls r0, 24 cmp r0, 0 bne _08081EE8 - ldr r0, _08081EE0 + ldr r0, _08081EE0 @ =gMapHeader ldrb r0, [r0, 0x17] cmp r0, 0x4 beq _08081EE4 @@ -691,7 +691,7 @@ _08081EFE: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _08081F50 + ldr r0, _08081F50 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -739,7 +739,7 @@ reads_trainer_data_byte0: @ 8081F54 lsrs r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r5, _08081F88 + ldr r5, _08081F88 @ =gTrainers lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -864,7 +864,7 @@ sub_8082034: @ 8082034 bl sub_8081E90 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08082064 + ldr r0, _08082064 @ =gEnemyParty movs r1, 0x38 bl GetMonData adds r4, r0, 0 @@ -876,7 +876,7 @@ sub_8082034: @ 8082034 lsrs r0, 24 cmp r4, r0 bcc _0808206C - ldr r0, _08082068 + ldr r0, _08082068 @ =gBattleTransitionTable_Wild lsls r1, r5, 1 adds r0, 0x1 b _08082070 @@ -884,7 +884,7 @@ sub_8082034: @ 8082034 _08082064: .4byte gEnemyParty _08082068: .4byte gBattleTransitionTable_Wild _0808206C: - ldr r0, _0808207C + ldr r0, _0808207C @ =gBattleTransitionTable_Wild lsls r1, r5, 1 _08082070: adds r1, r0 @@ -899,13 +899,13 @@ _0808207C: .4byte gBattleTransitionTable_Wild thumb_func_start sub_8082080 sub_8082080: @ 8082080 push {r4-r6,lr} - ldr r4, _080820AC + ldr r4, _080820AC @ =gTrainerBattleOpponent ldrh r1, [r4] movs r0, 0x80 lsls r0, 3 cmp r1, r0 beq _080820E4 - ldr r1, _080820B0 + ldr r1, _080820B0 @ =gTrainers ldrh r2, [r4] lsls r0, r2, 2 adds r0, r2 @@ -915,7 +915,7 @@ sub_8082080: @ 8082080 cmp r1, 0x18 bne _080820E0 adds r1, r2, 0 - ldr r0, _080820B4 + ldr r0, _080820B4 @ =0x00000105 cmp r1, r0 bne _080820B8 movs r0, 0xC @@ -932,7 +932,7 @@ _080820B8: movs r0, 0xD b _0808212C _080820C4: - ldr r0, _080820D0 + ldr r0, _080820D0 @ =0x00000107 cmp r1, r0 bne _080820D4 movs r0, 0xE @@ -974,14 +974,14 @@ _080820F2: lsrs r0, 24 cmp r4, r0 bcc _08082124 - ldr r0, _08082120 + ldr r0, _08082120 @ =gBattleTransitionTable_Trainer lsls r1, r6, 1 adds r0, 0x1 b _08082128 .align 2, 0 _08082120: .4byte gBattleTransitionTable_Trainer _08082124: - ldr r0, _08082134 + ldr r0, _08082134 @ =gBattleTransitionTable_Trainer lsls r1, r6, 1 _08082128: adds r1, r0 @@ -997,7 +997,7 @@ _08082134: .4byte gBattleTransitionTable_Trainer thumb_func_start sub_8082138 sub_8082138: @ 8082138 push {r4,lr} - ldr r0, _0808215C + ldr r0, _0808215C @ =gEnemyParty movs r1, 0x38 bl GetMonData adds r4, r0, 0 @@ -1024,10 +1024,10 @@ _08082162: thumb_func_start sub_8082168 sub_8082168: @ 8082168 push {lr} - ldr r0, _0808217C + ldr r0, _0808217C @ =CB2_ChooseStarter bl SetMainCallback2 - ldr r1, _08082180 - ldr r0, _08082184 + ldr r1, _08082180 @ =gMain + ldr r0, _08082184 @ =sub_8082188 str r0, [r1, 0x8] pop {r0} bx r0 @@ -1041,9 +1041,9 @@ _08082184: .4byte sub_8082188 sub_8082188: @ 8082188 push {lr} sub sp, 0x8 - ldr r0, _080821CC + ldr r0, _080821CC @ =0x00004023 bl GetVarPointer - ldr r2, _080821D0 + ldr r2, _080821D0 @ =gScriptResult ldrh r1, [r2] strh r1, [r0] ldrh r0, [r2] @@ -1059,7 +1059,7 @@ sub_8082188: @ 8082188 bl sub_80C5374 bl ResetTasks bl sub_80408BC - ldr r0, _080821D4 + ldr r0, _080821D4 @ =sub_80821D8 bl SetMainCallback2 movs r0, 0 bl sub_811AAD8 @@ -1082,13 +1082,13 @@ sub_80821D8: @ 80821D8 lsrs r0, 24 cmp r0, 0x1 bne _08082214 - ldr r1, _08082218 + ldr r1, _08082218 @ =gUnknown_020239F8 movs r0, 0x10 strh r0, [r1] - ldr r1, _0808221C - ldr r0, _08082220 + ldr r1, _0808221C @ =gMain + ldr r0, _08082220 @ =sub_8082228 str r0, [r1, 0x8] - ldr r0, _08082224 + ldr r0, _08082224 @ =sub_800E7C4 bl SetMainCallback2 bl prev_quest_postbuffer_cursor_backup_reset bl overworld_poison_timer_set @@ -1110,7 +1110,7 @@ _08082224: .4byte sub_800E7C4 sub_8082228: @ 8082228 push {lr} bl sav1_reset_battle_music_maybe - ldr r0, _08082238 + ldr r0, _08082238 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 pop {r0} bx r0 @@ -1152,7 +1152,7 @@ TrainerBattleLoadArg8: @ 8082260 thumb_func_start trainerflag_opponent trainerflag_opponent: @ 8082264 - ldr r1, _08082278 + ldr r1, _08082278 @ =gTrainerBattleOpponent movs r2, 0xA0 lsls r2, 3 adds r0, r2, 0 @@ -1172,7 +1172,7 @@ battle_exit_is_player_defeat: @ 808227C cmp r0, 0x6 bhi _080822B4 lsls r0, 2 - ldr r1, _08082290 + ldr r1, _08082290 @ =_08082294 adds r0, r1 ldr r0, [r0] mov pc, r0 @@ -1199,25 +1199,25 @@ _080822B6: thumb_func_start sub_80822BC sub_80822BC: @ 80822BC - ldr r0, _080822E8 + ldr r0, _080822E8 @ =gTrainerBattleMode movs r1, 0 strh r1, [r0] - ldr r0, _080822EC + ldr r0, _080822EC @ =gTrainerBattleOpponent strh r1, [r0] - ldr r0, _080822F0 + ldr r0, _080822F0 @ =gTrainerMapObjectLocalId strh r1, [r0] - ldr r0, _080822F4 + ldr r0, _080822F4 @ =gTrainerIntroSpeech movs r1, 0 str r1, [r0] - ldr r0, _080822F8 + ldr r0, _080822F8 @ =gTrainerDefeatSpeech str r1, [r0] - ldr r0, _080822FC + ldr r0, _080822FC @ =gTrainerVictorySpeech str r1, [r0] - ldr r0, _08082300 + ldr r0, _08082300 @ =gTrainerCannotBattleSpeech str r1, [r0] - ldr r0, _08082304 + ldr r0, _08082304 @ =gTrainerBattleScriptReturnAddress str r1, [r0] - ldr r0, _08082308 + ldr r0, _08082308 @ =gTrainerBattleEndScript str r1, [r0] bx lr .align 2, 0 @@ -1242,7 +1242,7 @@ _08082312: cmp r0, 0x6 bhi _08082384 lsls r0, 2 - ldr r1, _08082324 + ldr r1, _08082324 @ =_08082328 adds r0, r1 ldr r0, [r0] mov pc, r0 @@ -1306,19 +1306,19 @@ _08082388: thumb_func_start battle_80801F0 battle_80801F0: @ 8082394 push {lr} - ldr r0, _080823B8 + ldr r0, _080823B8 @ =gTrainerMapObjectLocalId ldrh r1, [r0] cmp r1, 0 beq _080823B4 - ldr r0, _080823BC + ldr r0, _080823BC @ =gUnknown_0202E8DE strh r1, [r0] lsls r0, r1, 24 lsrs r0, 24 - ldr r2, _080823C0 + ldr r2, _080823C0 @ =gSaveBlock1 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl GetFieldObjectIdByLocalIdAndMap - ldr r1, _080823C4 + ldr r1, _080823C4 @ =gSelectedMapObject strb r0, [r1] _080823B4: pop {r0} @@ -1335,7 +1335,7 @@ TrainerBattleConfigure: @ 80823C8 push {r4,r5,lr} adds r5, r0, 0 bl sub_80822BC - ldr r4, _080823F0 + ldr r4, _080823F0 @ =gTrainerBattleMode adds r0, r5, 0 bl TrainerBattleLoadArg8 lsls r0, 24 @@ -1346,7 +1346,7 @@ TrainerBattleConfigure: @ 80823C8 cmp r0, 0x7 bhi _080824A4 lsls r0, 2 - ldr r1, _080823F4 + ldr r1, _080823F4 @ =_080823F8 adds r0, r1 ldr r0, [r0] mov pc, r0 @@ -1364,72 +1364,72 @@ _080823F8: .4byte _08082454 .4byte _0808243C _08082418: - ldr r0, _08082424 + ldr r0, _08082424 @ =gTrainerBattleSpecs_3 adds r1, r5, 0 bl TrainerBattleLoadArgs - ldr r0, _08082428 + ldr r0, _08082428 @ =gUnknown_0819F878 b _080824B2 .align 2, 0 _08082424: .4byte gTrainerBattleSpecs_3 _08082428: .4byte gUnknown_0819F878 _0808242C: - ldr r0, _08082430 + ldr r0, _08082430 @ =gTrainerBattleSpecs_2 b _0808243E .align 2, 0 _08082430: .4byte gTrainerBattleSpecs_2 _08082434: - ldr r0, _08082438 + ldr r0, _08082438 @ =gTrainerBattleSpecs_1 b _080824A6 .align 2, 0 _08082438: .4byte gTrainerBattleSpecs_1 _0808243C: - ldr r0, _0808244C + ldr r0, _0808244C @ =gTrainerBattleSpecs_4 _0808243E: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r0, _08082450 + ldr r0, _08082450 @ =gUnknown_0819F840 b _080824B2 .align 2, 0 _0808244C: .4byte gTrainerBattleSpecs_4 _08082450: .4byte gUnknown_0819F840 _08082454: - ldr r0, _08082470 + ldr r0, _08082470 @ =gTrainerBattleSpecs_2 adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r4, _08082474 + ldr r4, _08082474 @ =gTrainerBattleOpponent ldrh r0, [r4] bl sub_8082C4C strh r0, [r4] - ldr r0, _08082478 + ldr r0, _08082478 @ =gUnknown_0819F8AE b _080824B2 .align 2, 0 _08082470: .4byte gTrainerBattleSpecs_2 _08082474: .4byte gTrainerBattleOpponent _08082478: .4byte gUnknown_0819F8AE _0808247C: - ldr r0, _08082498 + ldr r0, _08082498 @ =gTrainerBattleSpecs_0 adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r4, _0808249C + ldr r4, _0808249C @ =gTrainerBattleOpponent ldrh r0, [r4] bl sub_8082C4C strh r0, [r4] - ldr r0, _080824A0 + ldr r0, _080824A0 @ =gUnknown_0819F887 b _080824B2 .align 2, 0 _08082498: .4byte gTrainerBattleSpecs_0 _0808249C: .4byte gTrainerBattleOpponent _080824A0: .4byte gUnknown_0819F887 _080824A4: - ldr r0, _080824B8 + ldr r0, _080824B8 @ =gTrainerBattleSpecs_0 _080824A6: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r0, _080824BC + ldr r0, _080824BC @ =gUnknown_0819F818 _080824B2: pop {r4,r5} pop {r1} @@ -1444,10 +1444,10 @@ TrainerWantsBattle: @ 80824C0 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080824F4 + ldr r2, _080824F4 @ =gSelectedMapObject strb r0, [r2] - ldr r4, _080824F8 - ldr r3, _080824FC + ldr r4, _080824F8 @ =gUnknown_0202E8DE + ldr r3, _080824FC @ =gMapObjects lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -1457,7 +1457,7 @@ TrainerWantsBattle: @ 80824C0 adds r1, 0x1 adds r0, r1, 0 bl TrainerBattleConfigure - ldr r0, _08082500 + ldr r0, _08082500 @ =gUnknown_0819F80B bl ScriptContext1_SetupScript bl ScriptContext2_Enable pop {r4} @@ -1490,12 +1490,12 @@ GetTrainerFlagFromScriptPointer: @ 8082504 thumb_func_start sub_8082524 sub_8082524: @ 8082524 push {r4,lr} - ldr r0, _08082550 + ldr r0, _08082550 @ =gSelectedMapObject ldrb r0, [r0] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08082554 + ldr r0, _08082554 @ =gMapObjects adds r4, r0 ldrb r0, [r4, 0x18] lsls r0, 28 @@ -1516,7 +1516,7 @@ _08082554: .4byte gMapObjects thumb_func_start sub_8082558 sub_8082558: @ 8082558 - ldr r0, _08082560 + ldr r0, _08082560 @ =gTrainerBattleMode ldrb r0, [r0] bx lr .align 2, 0 @@ -1602,11 +1602,11 @@ trainer_flag_clear: @ 80825D0 thumb_func_start sub_80825E4 sub_80825E4: @ 80825E4 push {lr} - ldr r1, _08082600 + ldr r1, _08082600 @ =gUnknown_020239F8 movs r0, 0x8 strh r0, [r1] - ldr r1, _08082604 - ldr r0, _08082608 + ldr r1, _08082604 @ =gMain + ldr r0, _08082608 @ =sub_808260C str r0, [r1, 0x8] bl task_add_01_battle_start_with_music_and_stats bl ScriptContext1_Stop @@ -1621,32 +1621,32 @@ _08082608: .4byte sub_808260C thumb_func_start sub_808260C sub_808260C: @ 808260C push {lr} - ldr r0, _08082624 + ldr r0, _08082624 @ =gTrainerBattleOpponent ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 cmp r1, r0 bne _0808262C - ldr r0, _08082628 + ldr r0, _08082628 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 b _08082652 .align 2, 0 _08082624: .4byte gTrainerBattleOpponent _08082628: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _0808262C: - ldr r0, _08082640 + ldr r0, _08082640 @ =gUnknown_02024D26 ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 bne _08082648 - ldr r0, _08082644 + ldr r0, _08082644 @ =c2_whiteout bl SetMainCallback2 b _08082652 .align 2, 0 _08082640: .4byte gUnknown_02024D26 _08082644: .4byte c2_whiteout _08082648: - ldr r0, _08082658 + ldr r0, _08082658 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 bl sub_808257C _08082652: @@ -1659,32 +1659,32 @@ _08082658: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_start do_choose_name_or_words_screen do_choose_name_or_words_screen: @ 808265C push {lr} - ldr r0, _08082674 + ldr r0, _08082674 @ =gTrainerBattleOpponent ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 cmp r1, r0 bne _0808267C - ldr r0, _08082678 + ldr r0, _08082678 @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 b _080826A6 .align 2, 0 _08082674: .4byte gTrainerBattleOpponent _08082678: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _0808267C: - ldr r0, _08082690 + ldr r0, _08082690 @ =gUnknown_02024D26 ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 bne _08082698 - ldr r0, _08082694 + ldr r0, _08082694 @ =c2_whiteout bl SetMainCallback2 b _080826A6 .align 2, 0 _08082690: .4byte gUnknown_02024D26 _08082694: .4byte c2_whiteout _08082698: - ldr r0, _080826AC + ldr r0, _080826AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 bl sub_808257C bl sub_8082CB8 @@ -1698,11 +1698,11 @@ _080826AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_start sub_80826B0 sub_80826B0: @ 80826B0 push {lr} - ldr r1, _080826CC + ldr r1, _080826CC @ =gUnknown_020239F8 movs r0, 0x8 strh r0, [r1] - ldr r1, _080826D0 - ldr r0, _080826D4 + ldr r1, _080826D0 @ =gMain + ldr r0, _080826D4 @ =do_choose_name_or_words_screen str r0, [r1, 0x8] bl task_add_01_battle_start_with_music_and_stats bl ScriptContext1_Stop @@ -1726,11 +1726,11 @@ sub_80826D8: @ 80826D8 thumb_func_start sub_80826E8 sub_80826E8: @ 80826E8 push {lr} - ldr r0, _080826F8 + ldr r0, _080826F8 @ =gTrainerBattleScriptReturnAddress ldr r0, [r0] cmp r0, 0 bne _080826F4 - ldr r0, _080826FC + ldr r0, _080826FC @ =gUnknown_081C6C02 _080826F4: pop {r1} bx r1 @@ -1742,11 +1742,11 @@ _080826FC: .4byte gUnknown_081C6C02 thumb_func_start sub_8082700 sub_8082700: @ 8082700 push {lr} - ldr r0, _08082710 + ldr r0, _08082710 @ =gTrainerBattleEndScript ldr r0, [r0] cmp r0, 0 bne _0808270C - ldr r0, _08082714 + ldr r0, _08082714 @ =gUnknown_081C6C02 _0808270C: pop {r1} bx r1 @@ -1767,13 +1767,13 @@ sub_8082718: @ 8082718 thumb_func_start sub_8082728 sub_8082728: @ 8082728 push {lr} - ldr r0, _08082750 + ldr r0, _08082750 @ =gTrainerBattleMode ldrh r0, [r0] cmp r0, 0x1 beq _08082802 cmp r0, 0x8 beq _08082802 - ldr r0, _08082754 + ldr r0, _08082754 @ =gTrainerBattleOpponent ldrh r0, [r0] bl sub_803FC58 lsls r0, 24 @@ -1781,7 +1781,7 @@ sub_8082728: @ 8082728 cmp r0, 0xD bhi _080827FC lsls r0, 2 - ldr r1, _08082758 + ldr r1, _08082758 @ =_0808275C adds r0, r1 ldr r0, [r0] mov pc, r0 @@ -1810,12 +1810,12 @@ _08082794: lsls r0, 1 b _080827FE _0808279A: - ldr r0, _080827A0 + ldr r0, _080827A0 @ =0x00000197 b _080827FE .align 2, 0 _080827A0: .4byte 0x00000197 _080827A4: - ldr r0, _080827A8 + ldr r0, _080827A8 @ =0x0000017b b _080827FE .align 2, 0 _080827A8: .4byte 0x0000017b @@ -1824,27 +1824,27 @@ _080827AC: lsls r0, 1 b _080827FE _080827B2: - ldr r0, _080827B8 + ldr r0, _080827B8 @ =0x000001a1 b _080827FE .align 2, 0 _080827B8: .4byte 0x000001a1 _080827BC: - ldr r0, _080827C0 + ldr r0, _080827C0 @ =0x000001a3 b _080827FE .align 2, 0 _080827C0: .4byte 0x000001a3 _080827C4: - ldr r0, _080827C8 + ldr r0, _080827C8 @ =0x000001b9 b _080827FE .align 2, 0 _080827C8: .4byte 0x000001b9 _080827CC: - ldr r0, _080827D0 + ldr r0, _080827D0 @ =0x00000181 b _080827FE .align 2, 0 _080827D0: .4byte 0x00000181 _080827D4: - ldr r0, _080827D8 + ldr r0, _080827D8 @ =0x000001c1 b _080827FE .align 2, 0 _080827D8: .4byte 0x000001c1 @@ -1853,22 +1853,22 @@ _080827DC: lsls r0, 1 b _080827FE _080827E2: - ldr r0, _080827E8 + ldr r0, _080827E8 @ =0x000001c3 b _080827FE .align 2, 0 _080827E8: .4byte 0x000001c3 _080827EC: - ldr r0, _080827F0 + ldr r0, _080827F0 @ =0x000001c5 b _080827FE .align 2, 0 _080827F0: .4byte 0x000001c5 _080827F4: - ldr r0, _080827F8 + ldr r0, _080827F8 @ =0x0000018d b _080827FE .align 2, 0 _080827F8: .4byte 0x0000018d _080827FC: - ldr r0, _08082808 + ldr r0, _08082808 @ =0x000001a7 _080827FE: bl PlayNewMapMusic _08082802: @@ -1883,7 +1883,7 @@ ReturnEmptyStringIfNull: @ 808280C push {lr} cmp r0, 0 bne _08082814 - ldr r0, _08082818 + ldr r0, _08082818 @ =gOtherText_CancelWithTerminator _08082814: pop {r1} bx r1 @@ -1894,7 +1894,7 @@ _08082818: .4byte gOtherText_CancelWithTerminator thumb_func_start sub_808281C sub_808281C: @ 808281C push {lr} - ldr r0, _0808282C + ldr r0, _0808282C @ =gTrainerIntroSpeech ldr r0, [r0] bl ReturnEmptyStringIfNull pop {r1} @@ -1906,7 +1906,7 @@ _0808282C: .4byte gTrainerIntroSpeech thumb_func_start sub_8082830 sub_8082830: @ 8082830 push {r4,lr} - ldr r0, _08082844 + ldr r0, _08082844 @ =gTrainerBattleOpponent ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -1917,10 +1917,10 @@ sub_8082830: @ 8082830 .align 2, 0 _08082844: .4byte gTrainerBattleOpponent _08082848: - ldr r0, _08082864 + ldr r0, _08082864 @ =gTrainerDefeatSpeech ldr r0, [r0] _0808284C: - ldr r4, _08082868 + ldr r4, _08082868 @ =gStringVar4 bl ReturnEmptyStringIfNull adds r1, r0, 0 adds r0, r4, 0 @@ -1937,7 +1937,7 @@ _08082868: .4byte gStringVar4 thumb_func_start unref_sub_808286C unref_sub_808286C: @ 808286C push {lr} - ldr r0, _0808287C + ldr r0, _0808287C @ =gTrainerVictorySpeech ldr r0, [r0] bl ReturnEmptyStringIfNull pop {r1} @@ -1949,7 +1949,7 @@ _0808287C: .4byte gTrainerVictorySpeech thumb_func_start sub_8082880 sub_8082880: @ 8082880 push {lr} - ldr r0, _08082890 + ldr r0, _08082890 @ =gTrainerCannotBattleSpeech ldr r0, [r0] bl ReturnEmptyStringIfNull pop {r1} @@ -2042,7 +2042,7 @@ sub_80828FC: @ 80828FC mov r10, r2 movs r4, 0 movs r5, 0 - ldr r0, _08082968 + ldr r0, _08082968 @ =gSaveBlock1 + 0x97A mov r9, r0 _0808291E: lsls r0, r5, 4 @@ -2125,7 +2125,7 @@ sub_80829A8: @ 80829A8 lsls r2, 16 lsrs r2, 16 movs r1, 0 - ldr r5, _080829D4 + ldr r5, _080829D4 @ =gSaveBlock1 + 0x97A adds r3, r0, 0 adds r3, 0xA _080829BA: @@ -2199,8 +2199,8 @@ sub_8082A18: @ 8082A18 beq _08082A4C cmp r1, 0x63 bgt _08082A4C - ldr r0, _08082A44 - ldr r2, _08082A48 + ldr r0, _08082A44 @ =gSaveBlock1 + ldr r2, _08082A48 @ =0x0000097a adds r0, r2 adds r0, r1, r0 ldrb r0, [r0] @@ -2231,8 +2231,8 @@ sub_8082A54: @ 8082A54 beq _08082A88 cmp r1, 0x63 bgt _08082A88 - ldr r0, _08082A80 - ldr r2, _08082A84 + ldr r0, _08082A80 @ =gSaveBlock1 + ldr r2, _08082A84 @ =0x0000097a adds r0, r2 adds r0, r1, r0 ldrb r0, [r0] @@ -2310,8 +2310,8 @@ sub_8082AE4: @ 8082AE4 negs r0, r0 cmp r1, r0 beq _08082B04 - ldr r0, _08082B08 - ldr r2, _08082B0C + ldr r0, _08082B08 @ =gSaveBlock1 + ldr r2, _08082B0C @ =0x0000097a adds r0, r2 adds r0, r1, r0 movs r1, 0 @@ -2358,7 +2358,7 @@ sub_8082B44: @ 8082B44 push {r4-r6,lr} movs r6, 0 movs r5, 0 - ldr r4, _08082B64 + ldr r4, _08082B64 @ =gUnknown_0839B1F0 _08082B4C: ldrh r0, [r4] bl FlagGet @@ -2391,8 +2391,8 @@ sub_8082B78: @ 8082B78 bl sub_8082B44 cmp r0, 0 beq _08082BA0 - ldr r0, _08082B94 - ldr r2, _08082B98 + ldr r0, _08082B94 @ =gSaveBlock1 + ldr r2, _08082B98 @ =0x00000978 adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0xFE @@ -2417,8 +2417,8 @@ sub_8082BA4: @ 8082BA4 bl sub_8082B44 cmp r0, 0 beq _08082BC8 - ldr r0, _08082BC0 - ldr r1, _08082BC4 + ldr r0, _08082BC0 @ =gSaveBlock1 + ldr r1, _08082BC4 @ =0x00000978 adds r0, r1 ldrh r0, [r0] cmp r0, 0xFE @@ -2445,14 +2445,14 @@ sub_8082BD0: @ 8082BD0 bl sub_8082BA4 cmp r0, 0 beq _08082BFA - ldr r0, _08082C00 + ldr r0, _08082C00 @ =gTrainerEyeTrainers adds r1, r5, 0 adds r2, r4, 0 bl sub_80828FC cmp r0, 0x1 bne _08082BFA - ldr r0, _08082C04 - ldr r1, _08082C08 + ldr r0, _08082C04 @ =gSaveBlock1 + ldr r1, _08082C08 @ =0x00000978 adds r0, r1 movs r1, 0 strh r1, [r0] @@ -2475,7 +2475,7 @@ sub_8082C0C: @ 8082C0C lsrs r3, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _08082C28 + ldr r0, _08082C28 @ =gTrainerEyeTrainers adds r1, r3, 0 bl sub_80829A8 pop {r1} @@ -2493,7 +2493,7 @@ unref_sub_8082C2C: @ 8082C2C lsrs r3, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _08082C48 + ldr r0, _08082C48 @ =gTrainerEyeTrainers adds r1, r3, 0 bl sub_80829E8 pop {r1} @@ -2508,7 +2508,7 @@ sub_8082C4C: @ 8082C4C adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _08082C64 + ldr r0, _08082C64 @ =gTrainerEyeTrainers bl sub_8082A90 lsls r0, 16 lsrs r0, 16 @@ -2521,8 +2521,8 @@ _08082C64: .4byte gTrainerEyeTrainers thumb_func_start sub_8082C68 sub_8082C68: @ 8082C68 push {r4,r5,lr} - ldr r5, _08082C8C - ldr r4, _08082C90 + ldr r5, _08082C8C @ =gTrainerEyeTrainers + ldr r4, _08082C90 @ =gTrainerBattleOpponent ldrh r1, [r4] adds r0, r5, 0 bl sub_8082A18 @@ -2549,8 +2549,8 @@ _08082C96: thumb_func_start sub_8082C9C sub_8082C9C: @ 8082C9C push {lr} - ldr r0, _08082CB0 - ldr r1, _08082CB4 + ldr r0, _08082CB0 @ =gTrainerEyeTrainers + ldr r1, _08082CB4 @ =gTrainerBattleOpponent ldrh r1, [r1] bl sub_8082A54 lsls r0, 24 @@ -2565,8 +2565,8 @@ _08082CB4: .4byte gTrainerBattleOpponent thumb_func_start sub_8082CB8 sub_8082CB8: @ 8082CB8 push {lr} - ldr r0, _08082CCC - ldr r1, _08082CD0 + ldr r0, _08082CCC @ =gTrainerEyeTrainers + ldr r1, _08082CD0 @ =gTrainerBattleOpponent ldrh r1, [r1] bl sub_8082AE4 bl sub_808257C |