really clean up battle ai
This commit is contained in:
+17
-17
@@ -141,7 +141,7 @@ _0803FBF8:
|
||||
str r0, [r1]
|
||||
movs r6, 0x1
|
||||
_0803FC06:
|
||||
ldr r1, =gUnknown_02024248
|
||||
ldr r1, =gLastUsedMovesByBanks
|
||||
ldrb r2, [r7]
|
||||
lsls r0, r2, 1
|
||||
adds r0, r1
|
||||
@@ -420,8 +420,8 @@ _0803FEB8:
|
||||
.pool
|
||||
thumb_func_end sub_803FB4C
|
||||
|
||||
thumb_func_start sub_803FECC
|
||||
sub_803FECC: @ 803FECC
|
||||
thumb_func_start CheckMoveLimitations
|
||||
CheckMoveLimitations: @ 803FECC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -541,7 +541,7 @@ _0803FFAC:
|
||||
ldr r1, =gUnknown_02024090
|
||||
adds r0, r1
|
||||
mov r12, r0
|
||||
ldr r1, =gUnknown_02024248
|
||||
ldr r1, =gLastUsedMovesByBanks
|
||||
ldr r0, [sp, 0xC]
|
||||
adds r1, r0, r1
|
||||
str r1, [sp, 0x18]
|
||||
@@ -665,7 +665,7 @@ _08040096:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_803FECC
|
||||
thumb_func_end CheckMoveLimitations
|
||||
|
||||
thumb_func_start sub_80400C8
|
||||
sub_80400C8: @ 80400C8
|
||||
@@ -674,7 +674,7 @@ sub_80400C8: @ 80400C8
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
movs r2, 0xFF
|
||||
bl sub_803FECC
|
||||
bl CheckMoveLimitations
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0xF
|
||||
@@ -997,7 +997,7 @@ _0804035A:
|
||||
strb r0, [r6]
|
||||
mov r3, r8
|
||||
strb r0, [r3]
|
||||
ldr r0, =gUnknown_0202428E
|
||||
ldr r0, =gSideAffecting
|
||||
adds r3, r1, r0
|
||||
ldrh r1, [r3]
|
||||
movs r0, 0x1
|
||||
@@ -1082,7 +1082,7 @@ _08040422:
|
||||
strb r0, [r7]
|
||||
ldr r3, =gActiveBank
|
||||
strb r0, [r3]
|
||||
ldr r0, =gUnknown_0202428E
|
||||
ldr r0, =gSideAffecting
|
||||
adds r3, r1, r0
|
||||
ldrh r1, [r3]
|
||||
movs r0, 0x2
|
||||
@@ -1177,7 +1177,7 @@ _080404EC:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0804054E
|
||||
ldr r2, =gUnknown_0202428E
|
||||
ldr r2, =gSideAffecting
|
||||
adds r2, r3, r2
|
||||
ldrh r0, [r2]
|
||||
ldr r3, =0x0000feff
|
||||
@@ -1260,7 +1260,7 @@ _080405C0:
|
||||
ldrb r0, [r2, 0x7]
|
||||
strb r0, [r5]
|
||||
strb r0, [r6]
|
||||
ldr r0, =gUnknown_0202428E
|
||||
ldr r0, =gSideAffecting
|
||||
adds r3, r1, r0
|
||||
ldrh r1, [r3]
|
||||
movs r0, 0x20
|
||||
@@ -2988,7 +2988,7 @@ _080414CC:
|
||||
_080414DA:
|
||||
ldrb r0, [r5]
|
||||
bl GetBankIdentity
|
||||
ldr r2, =gUnknown_0202428E
|
||||
ldr r2, =gSideAffecting
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x1
|
||||
@@ -6796,11 +6796,11 @@ _08043840:
|
||||
_08043854:
|
||||
ldr r0, [sp, 0x8]
|
||||
ldr r1, [sp, 0x10]
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
adds r4, r0, 0
|
||||
ldr r0, [sp, 0xC]
|
||||
ldr r1, [sp, 0x14]
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
@@ -6823,7 +6823,7 @@ _08043872:
|
||||
_0804388E:
|
||||
ldr r0, [sp, 0x8]
|
||||
ldr r1, [sp, 0x10]
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0xFF
|
||||
@@ -6832,7 +6832,7 @@ _0804388E:
|
||||
_080438A2:
|
||||
ldr r0, [sp, 0xC]
|
||||
ldr r1, [sp, 0x14]
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0xFF
|
||||
@@ -8664,7 +8664,7 @@ _08044958:
|
||||
str r0, [sp, 0xC]
|
||||
adds r0, r7, 0
|
||||
adds r1, r5, 0
|
||||
bl b_history__record_item_x12_of_player
|
||||
bl RecordItemEffectBattle
|
||||
bl _080451D6
|
||||
.pool
|
||||
_0804497C:
|
||||
@@ -10988,7 +10988,7 @@ _08045E20:
|
||||
ldrb r1, [r0]
|
||||
adds r0, r3, 0
|
||||
movs r2, 0xFF
|
||||
bl sub_803FECC
|
||||
bl CheckMoveLimitations
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0xF
|
||||
|
||||
+70
-70
@@ -1541,7 +1541,7 @@ _08046D74:
|
||||
atk05_damagecalc1: @ 8046D8C
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x10
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
ldr r5, =gBankTarget
|
||||
ldrb r0, [r5]
|
||||
bl GetBankIdentity
|
||||
@@ -1561,7 +1561,7 @@ atk05_damagecalc1: @ 8046D8C
|
||||
adds r1, r2
|
||||
ldr r7, =gCurrentMove
|
||||
ldrh r2, [r7]
|
||||
ldr r4, =gUnknown_02024400
|
||||
ldr r4, =gDynamicBasePower
|
||||
ldrh r4, [r4]
|
||||
str r4, [sp]
|
||||
ldr r4, =gBattleStruct
|
||||
@@ -1632,8 +1632,8 @@ _08046E32:
|
||||
.pool
|
||||
thumb_func_end atk05_damagecalc1
|
||||
|
||||
thumb_func_start sub_8046E7C
|
||||
sub_8046E7C: @ 8046E7C
|
||||
thumb_func_start AI_CalcDmg
|
||||
AI_CalcDmg: @ 8046E7C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -1643,7 +1643,7 @@ sub_8046E7C: @ 8046E7C
|
||||
lsrs r7, r0, 24
|
||||
lsls r5, 24
|
||||
lsrs r5, 24
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
adds r0, r5, 0
|
||||
bl GetBankIdentity
|
||||
movs r1, 0x1
|
||||
@@ -1661,7 +1661,7 @@ sub_8046E7C: @ 8046E7C
|
||||
ldr r2, =gCurrentMove
|
||||
mov r8, r2
|
||||
ldrh r2, [r2]
|
||||
ldr r6, =gUnknown_02024400
|
||||
ldr r6, =gDynamicBasePower
|
||||
ldrh r4, [r6]
|
||||
str r4, [sp]
|
||||
ldr r4, =gBattleStruct
|
||||
@@ -1726,7 +1726,7 @@ _08046F28:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8046E7C
|
||||
thumb_func_end AI_CalcDmg
|
||||
|
||||
thumb_func_start battle_attack_damage_modulate_by_effectivity
|
||||
battle_attack_damage_modulate_by_effectivity: @ 8046F60
|
||||
@@ -2525,8 +2525,8 @@ _080475DE:
|
||||
bx r0
|
||||
thumb_func_end b_attack_effectivity_adapt
|
||||
|
||||
thumb_func_start move_effectiveness_something
|
||||
move_effectiveness_something: @ 80475E4
|
||||
thumb_func_start TypeCalc
|
||||
TypeCalc: @ 80475E4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -2760,7 +2760,7 @@ _0804779E:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end move_effectiveness_something
|
||||
thumb_func_end TypeCalc
|
||||
|
||||
thumb_func_start ai_rate_move
|
||||
ai_rate_move: @ 80477BC
|
||||
@@ -2999,7 +2999,7 @@ _08047976:
|
||||
bcs _080479B4
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x27
|
||||
bl b_history__record_item_x12_of_player
|
||||
bl RecordItemEffectBattle
|
||||
ldr r2, =gSpecialStatuses
|
||||
ldrb r1, [r5]
|
||||
lsls r0, r1, 2
|
||||
@@ -3186,7 +3186,7 @@ _08047B26:
|
||||
bcs _08047B64
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x27
|
||||
bl b_history__record_item_x12_of_player
|
||||
bl RecordItemEffectBattle
|
||||
ldr r2, =gSpecialStatuses
|
||||
ldrb r1, [r5]
|
||||
lsls r0, r1, 2
|
||||
@@ -3545,7 +3545,7 @@ _08047E76:
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
ble _08047EA2
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrb r1, [r0, 0x5]
|
||||
movs r2, 0x1
|
||||
orrs r1, r2
|
||||
@@ -4637,7 +4637,7 @@ _08048828:
|
||||
mov r3, r9
|
||||
ldrb r0, [r3]
|
||||
bl GetBankIdentity
|
||||
ldr r2, =gUnknown_0202428E
|
||||
ldr r2, =gSideAffecting
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
lsls r1, 1
|
||||
@@ -6786,7 +6786,7 @@ _08049B94:
|
||||
str r4, [r6]
|
||||
ldrb r0, [r5]
|
||||
bl GetBankSide
|
||||
ldr r1, =gUnknown_0202428E
|
||||
ldr r1, =gSideAffecting
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
adds r0, r1
|
||||
@@ -6862,7 +6862,7 @@ _08049C42:
|
||||
lsls r1, 15
|
||||
orrs r0, r1
|
||||
str r0, [r5]
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0xFE
|
||||
bhi _08049C78
|
||||
@@ -6874,7 +6874,7 @@ _08049C78:
|
||||
b _08049CCE
|
||||
.pool
|
||||
_08049CA4:
|
||||
ldr r4, =gUnknown_03005D10
|
||||
ldr r4, =gBattleResults
|
||||
ldrb r0, [r4, 0x1]
|
||||
cmp r0, 0xFE
|
||||
bhi _08049CB0
|
||||
@@ -7398,7 +7398,7 @@ _0804A106:
|
||||
ldrb r0, [r3, 0x7]
|
||||
lsls r0, 24
|
||||
adds r5, r1, r0
|
||||
ldr r1, =gUnknown_0202428E
|
||||
ldr r1, =gSideAffecting
|
||||
lsls r0, r4, 1
|
||||
adds r0, r1
|
||||
ldrh r0, [r0]
|
||||
@@ -11426,7 +11426,7 @@ _0804C2A4:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0804C308
|
||||
ldr r0, =gUnknown_02024248
|
||||
ldr r0, =gLastUsedMovesByBanks
|
||||
lsls r1, r4, 1
|
||||
adds r1, r0
|
||||
ldr r0, =gUnknown_020241EC
|
||||
@@ -11443,7 +11443,7 @@ _0804C2A4:
|
||||
b _0804C322
|
||||
.pool
|
||||
_0804C308:
|
||||
ldr r1, =gUnknown_02024248
|
||||
ldr r1, =gLastUsedMovesByBanks
|
||||
lsls r0, r4, 1
|
||||
adds r0, r1
|
||||
ldr r1, =0x0000ffff
|
||||
@@ -13740,7 +13740,7 @@ _0804D6E0:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0804D760
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrb r0, [r1, 0x2]
|
||||
cmp r0, 0xFE
|
||||
bhi _0804D760
|
||||
@@ -14166,7 +14166,7 @@ atk52_switch_in_effects: @ 804DAAC
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r4]
|
||||
bl GetBankSide
|
||||
ldr r5, =gUnknown_0202428E
|
||||
ldr r5, =gSideAffecting
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
adds r0, r5
|
||||
@@ -14346,7 +14346,7 @@ _0804DC88:
|
||||
bne _0804DD8E
|
||||
ldrb r0, [r5]
|
||||
bl GetBankSide
|
||||
ldr r1, =gUnknown_0202428E
|
||||
ldr r1, =gSideAffecting
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
adds r0, r1
|
||||
@@ -15513,7 +15513,7 @@ _0804E6CA:
|
||||
thumb_func_start atk5D_getmoneyreward
|
||||
atk5D_getmoneyreward: @ 804E6D8
|
||||
push {r4,lr}
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
bl sub_804E598
|
||||
adds r4, r0, 0
|
||||
@@ -15524,7 +15524,7 @@ atk5D_getmoneyreward: @ 804E6D8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0804E6FC
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
bl sub_804E598
|
||||
adds r4, r0
|
||||
@@ -16243,7 +16243,7 @@ _0804ED2A:
|
||||
bcs _0804ED68
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x27
|
||||
bl b_history__record_item_x12_of_player
|
||||
bl RecordItemEffectBattle
|
||||
ldr r2, =gSpecialStatuses
|
||||
ldrb r1, [r5]
|
||||
lsls r0, r1, 2
|
||||
@@ -18692,7 +18692,7 @@ atk7E_setreflect: @ 805031C
|
||||
ldr r6, =gBankAttacker
|
||||
ldrb r0, [r6]
|
||||
bl GetBankIdentity
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
movs r5, 0x1
|
||||
adds r1, r5, 0
|
||||
ands r1, r0
|
||||
@@ -19303,7 +19303,7 @@ _08050828:
|
||||
beq _080508B0
|
||||
ldr r0, =gBattleMoveDamage
|
||||
mov r8, r0
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
ldr r5, =gBankTarget
|
||||
ldrb r0, [r5]
|
||||
bl GetBankIdentity
|
||||
@@ -20975,7 +20975,7 @@ atk92_setlightscreen: @ 8051664
|
||||
ldr r5, =gBankAttacker
|
||||
ldrb r0, [r5]
|
||||
bl GetBankIdentity
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
movs r6, 0x1
|
||||
adds r1, r6, 0
|
||||
ands r1, r0
|
||||
@@ -21112,7 +21112,7 @@ _08051782:
|
||||
bcs _080517C0
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x27
|
||||
bl b_history__record_item_x12_of_player
|
||||
bl RecordItemEffectBattle
|
||||
ldr r2, =gSpecialStatuses
|
||||
ldrb r1, [r5]
|
||||
lsls r0, r1, 2
|
||||
@@ -21768,11 +21768,11 @@ _08051D1C:
|
||||
_08051D94:
|
||||
mov r0, r10
|
||||
mov r1, r9
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
adds r4, r0, 0
|
||||
mov r0, r8
|
||||
adds r1, r7, 0
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r4, 24
|
||||
lsls r0, 24
|
||||
cmp r4, r0
|
||||
@@ -21790,14 +21790,14 @@ _08051D94:
|
||||
bne _08051DE4
|
||||
mov r0, r10
|
||||
mov r1, r9
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0xFF
|
||||
beq _08051DE4
|
||||
mov r0, r8
|
||||
adds r1, r7, 0
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0xFF
|
||||
@@ -22011,7 +22011,7 @@ _08051F98:
|
||||
strb r1, [r0, 0x5]
|
||||
ldrb r0, [r4]
|
||||
bl GetBankIdentity
|
||||
ldr r2, =gUnknown_0202428E
|
||||
ldr r2, =gSideAffecting
|
||||
adds r1, r5, 0
|
||||
ands r1, r0
|
||||
lsls r1, 1
|
||||
@@ -22395,7 +22395,7 @@ atk9D_copyattack: @ 8052300
|
||||
ldr r1, =0x0000ffff
|
||||
adds r7, r1, 0
|
||||
strh r7, [r0]
|
||||
ldr r5, =gUnknown_02024248
|
||||
ldr r5, =gLastUsedMovesByBanks
|
||||
ldr r6, =gBankTarget
|
||||
ldrb r0, [r6]
|
||||
lsls r0, 1
|
||||
@@ -22491,7 +22491,7 @@ _080523CE:
|
||||
mov r0, r12
|
||||
adds r0, 0xC
|
||||
adds r1, r0
|
||||
ldr r2, =gUnknown_02024248
|
||||
ldr r2, =gLastUsedMovesByBanks
|
||||
ldr r3, =gBankTarget
|
||||
ldrb r0, [r3]
|
||||
lsls r0, 1
|
||||
@@ -22955,7 +22955,7 @@ atkA3_disablelastusedattack: @ 80527F8
|
||||
adds r7, r2, 0
|
||||
adds r7, 0xC
|
||||
adds r0, r7
|
||||
ldr r5, =gUnknown_02024248
|
||||
ldr r5, =gLastUsedMovesByBanks
|
||||
lsls r1, 1
|
||||
adds r1, r5
|
||||
ldrh r0, [r0]
|
||||
@@ -23112,7 +23112,7 @@ atkA4_setencore: @ 805293C
|
||||
adds r6, r3, 0
|
||||
adds r6, 0xC
|
||||
adds r0, r6
|
||||
ldr r2, =gUnknown_02024248
|
||||
ldr r2, =gLastUsedMovesByBanks
|
||||
lsls r1, 1
|
||||
adds r1, r2
|
||||
ldrh r0, [r0]
|
||||
@@ -24006,7 +24006,7 @@ _08053084:
|
||||
ldrb r0, [r0]
|
||||
adds r1, r6, 0
|
||||
movs r2, 0xFD
|
||||
bl sub_803FECC
|
||||
bl CheckMoveLimitations
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
cmp r6, 0xF
|
||||
@@ -24189,7 +24189,7 @@ _08053224:
|
||||
cmp r1, r0
|
||||
bgt _08053224
|
||||
_08053232:
|
||||
ldr r2, =gUnknown_02024400
|
||||
ldr r2, =gDynamicBasePower
|
||||
ldr r1, =gUnknown_0831C408
|
||||
adds r0, r3, 0x1
|
||||
adds r0, r1
|
||||
@@ -24212,7 +24212,7 @@ atkAD_spite_ppreduce: @ 8053260
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x4
|
||||
ldr r4, =gUnknown_02024248
|
||||
ldr r4, =gLastUsedMovesByBanks
|
||||
ldr r1, =gBankTarget
|
||||
ldrb r3, [r1]
|
||||
lsls r0, r3, 1
|
||||
@@ -24299,7 +24299,7 @@ _08053304:
|
||||
strb r5, [r1]
|
||||
movs r0, 0x2
|
||||
strb r0, [r1, 0x1]
|
||||
ldr r2, =gUnknown_02024248
|
||||
ldr r2, =gLastUsedMovesByBanks
|
||||
mov r3, r8
|
||||
ldrb r0, [r3]
|
||||
lsls r0, 1
|
||||
@@ -24847,7 +24847,7 @@ atkB0_set_spikes: @ 80537A0
|
||||
b _0805381E
|
||||
.pool
|
||||
_08053804:
|
||||
ldr r1, =gUnknown_0202428E
|
||||
ldr r1, =gSideAffecting
|
||||
adds r1, r2, r1
|
||||
ldrh r2, [r1]
|
||||
movs r0, 0x10
|
||||
@@ -25084,7 +25084,7 @@ _080539BA:
|
||||
ands r0, r2
|
||||
str r0, [r1]
|
||||
_080539EE:
|
||||
ldr r3, =gUnknown_02024400
|
||||
ldr r3, =gDynamicBasePower
|
||||
ldr r2, =gBattleMoves
|
||||
mov r0, r8
|
||||
ldrh r1, [r0]
|
||||
@@ -25243,7 +25243,7 @@ _08053B34:
|
||||
adds r0, 0x1
|
||||
strb r0, [r1, 0x10]
|
||||
_08053B4C:
|
||||
ldr r3, =gUnknown_02024400
|
||||
ldr r3, =gDynamicBasePower
|
||||
ldr r2, =gBattleMoves
|
||||
ldr r0, =gCurrentMove
|
||||
ldrh r1, [r0]
|
||||
@@ -25297,7 +25297,7 @@ atkB6_happinesstodamagecalculation: @ 8053BAC
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x79
|
||||
bne _08053BEC
|
||||
ldr r4, =gUnknown_02024400
|
||||
ldr r4, =gDynamicBasePower
|
||||
ldr r2, =gBattleMons
|
||||
ldr r0, =gBankAttacker
|
||||
ldrb r1, [r0]
|
||||
@@ -25309,7 +25309,7 @@ atkB6_happinesstodamagecalculation: @ 8053BAC
|
||||
b _08053C02
|
||||
.pool
|
||||
_08053BEC:
|
||||
ldr r4, =gUnknown_02024400
|
||||
ldr r4, =gDynamicBasePower
|
||||
ldr r2, =gBattleMons
|
||||
ldr r0, =gBankAttacker
|
||||
ldrb r1, [r0]
|
||||
@@ -25345,7 +25345,7 @@ atkB7_presentdamagecalculation: @ 8053C30
|
||||
ands r4, r0
|
||||
cmp r4, 0x65
|
||||
bgt _08053C4C
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x28
|
||||
strh r0, [r1]
|
||||
b _08053C8E
|
||||
@@ -25353,7 +25353,7 @@ atkB7_presentdamagecalculation: @ 8053C30
|
||||
_08053C4C:
|
||||
cmp r4, 0xB1
|
||||
bgt _08053C5C
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x50
|
||||
strh r0, [r1]
|
||||
b _08053C8E
|
||||
@@ -25361,7 +25361,7 @@ _08053C4C:
|
||||
_08053C5C:
|
||||
cmp r4, 0xCB
|
||||
bgt _08053C6C
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x78
|
||||
strh r0, [r1]
|
||||
b _08053C8E
|
||||
@@ -25429,7 +25429,7 @@ atkB8_set_safeguard: @ 8053CFC
|
||||
ldr r7, =gBankAttacker
|
||||
ldrb r0, [r7]
|
||||
bl GetBankIdentity
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
movs r6, 0x1
|
||||
adds r1, r6, 0
|
||||
ands r1, r0
|
||||
@@ -25509,7 +25509,7 @@ atkB9_magnitudedamagecalculation: @ 8053DA4
|
||||
lsrs r3, r0, 16
|
||||
cmp r3, 0x4
|
||||
bgt _08053DD0
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0xA
|
||||
strh r0, [r1]
|
||||
movs r3, 0x4
|
||||
@@ -25518,7 +25518,7 @@ atkB9_magnitudedamagecalculation: @ 8053DA4
|
||||
_08053DD0:
|
||||
cmp r3, 0xE
|
||||
bgt _08053DE4
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x1E
|
||||
strh r0, [r1]
|
||||
movs r3, 0x5
|
||||
@@ -25527,7 +25527,7 @@ _08053DD0:
|
||||
_08053DE4:
|
||||
cmp r3, 0x22
|
||||
bgt _08053DF8
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x32
|
||||
strh r0, [r1]
|
||||
movs r3, 0x6
|
||||
@@ -25536,7 +25536,7 @@ _08053DE4:
|
||||
_08053DF8:
|
||||
cmp r3, 0x40
|
||||
bgt _08053E0C
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x46
|
||||
strh r0, [r1]
|
||||
movs r3, 0x7
|
||||
@@ -25545,7 +25545,7 @@ _08053DF8:
|
||||
_08053E0C:
|
||||
cmp r3, 0x54
|
||||
bgt _08053E20
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x5A
|
||||
strh r0, [r1]
|
||||
movs r3, 0x8
|
||||
@@ -25554,14 +25554,14 @@ _08053E0C:
|
||||
_08053E20:
|
||||
cmp r3, 0x5E
|
||||
bgt _08053E34
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x6E
|
||||
strh r0, [r1]
|
||||
movs r3, 0x9
|
||||
b _08053E3C
|
||||
.pool
|
||||
_08053E34:
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x96
|
||||
strh r0, [r1]
|
||||
movs r3, 0xA
|
||||
@@ -26021,7 +26021,7 @@ _08054210:
|
||||
_08054250:
|
||||
adds r0, r2, 0
|
||||
bl GetBankSide
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
lsls r0, 24
|
||||
lsrs r0, 23
|
||||
adds r0, r4
|
||||
@@ -26309,7 +26309,7 @@ atkC1_hidden_power: @ 8054400
|
||||
ands r1, r3
|
||||
lsls r1, 5
|
||||
orrs r4, r1
|
||||
ldr r5, =gUnknown_02024400
|
||||
ldr r5, =gDynamicBasePower
|
||||
lsls r0, r2, 2
|
||||
adds r0, r2
|
||||
lsls r0, 3
|
||||
@@ -26439,7 +26439,7 @@ atkC3_setfutureattack: @ 8054598
|
||||
_080545DC:
|
||||
adds r0, r1, 0
|
||||
bl GetBankIdentity
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x1
|
||||
@@ -28093,7 +28093,7 @@ _0805541A:
|
||||
thumb_func_start atkD9_scaledamagebyhealthratio
|
||||
atkD9_scaledamagebyhealthratio: @ 8055428
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02024400
|
||||
ldr r4, =gDynamicBasePower
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0
|
||||
bne _08055464
|
||||
@@ -28426,7 +28426,7 @@ _080556CE:
|
||||
ldr r0, =0x0000ffff
|
||||
cmp r1, r0
|
||||
beq _080556FC
|
||||
ldr r0, =gUnknown_02024400
|
||||
ldr r0, =gDynamicBasePower
|
||||
adds r1, r5, 0x1
|
||||
lsls r1, 1
|
||||
adds r1, r6
|
||||
@@ -28435,7 +28435,7 @@ _080556CE:
|
||||
b _08055702
|
||||
.pool
|
||||
_080556FC:
|
||||
ldr r1, =gUnknown_02024400
|
||||
ldr r1, =gDynamicBasePower
|
||||
movs r0, 0x78
|
||||
strh r0, [r1]
|
||||
_08055702:
|
||||
@@ -29781,7 +29781,7 @@ atkEE_removelightscreenreflect: @ 8056284
|
||||
cmp r1, 0
|
||||
beq _080562E4
|
||||
_080562AC:
|
||||
ldr r2, =gUnknown_0202428E
|
||||
ldr r2, =gSideAffecting
|
||||
adds r2, r3, r2
|
||||
ldrh r1, [r2]
|
||||
ldr r0, =0x0000fffe
|
||||
@@ -29994,7 +29994,7 @@ _080564A4:
|
||||
b _080564D2
|
||||
.pool
|
||||
_080564B0:
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrb r0, [r0, 0x13]
|
||||
adds r0, 0xA
|
||||
lsls r0, 24
|
||||
@@ -30056,7 +30056,7 @@ _08056522:
|
||||
beq _08056564
|
||||
cmp r0, 0x1
|
||||
bne _08056550
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrb r1, [r0, 0x5]
|
||||
movs r2, 0x2
|
||||
orrs r1, r2
|
||||
@@ -30064,7 +30064,7 @@ _08056522:
|
||||
b _08056564
|
||||
.pool
|
||||
_08056550:
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrh r1, [r1]
|
||||
adds r0, r1
|
||||
adds r1, r0, 0
|
||||
@@ -30313,7 +30313,7 @@ _08056792:
|
||||
movs r1, 0xB
|
||||
movs r2, 0
|
||||
bl GetMonData
|
||||
ldr r5, =gUnknown_03005D10
|
||||
ldr r5, =gBattleResults
|
||||
strh r0, [r5, 0x28]
|
||||
mov r1, r9
|
||||
ldrb r0, [r1]
|
||||
|
||||
+7
-7
@@ -85,7 +85,7 @@ sub_805D19C: @ 805D19C
|
||||
mov r10, r2
|
||||
movs r1, 0
|
||||
movs r2, 0xFF
|
||||
bl sub_803FECC
|
||||
bl CheckMoveLimitations
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
@@ -194,7 +194,7 @@ _0805D27C:
|
||||
lsls r0, r6, 24
|
||||
lsrs r0, 24
|
||||
bl BattleAI_SetupAIData
|
||||
bl sub_8130BA4
|
||||
bl BattleAI_ChooseMoveOrAction
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r9, r0
|
||||
@@ -2347,7 +2347,7 @@ _0805E4DE:
|
||||
b _0805E77A
|
||||
.pool
|
||||
_0805E51C:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805E558
|
||||
@@ -2578,7 +2578,7 @@ _0805E70A:
|
||||
adds r1, r2
|
||||
ldr r2, =0x04000008
|
||||
bl CpuSet
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0805E74A
|
||||
@@ -2639,7 +2639,7 @@ sub_805E7DC: @ 805E7DC
|
||||
lsls r1, 24
|
||||
cmp r1, 0
|
||||
bne _0805E898
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805E7F8
|
||||
@@ -2651,7 +2651,7 @@ _0805E7F8:
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
_0805E802:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805E814
|
||||
@@ -2714,7 +2714,7 @@ _0805E860:
|
||||
b _0805E8E6
|
||||
.pool
|
||||
_0805E898:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0805E8E6
|
||||
|
||||
+4
-4
@@ -2039,7 +2039,7 @@ _08063D02:
|
||||
ldrb r1, [r0]
|
||||
adds r0, r4, 0
|
||||
ldr r2, [sp, 0x4]
|
||||
bl move_effectiveness_something
|
||||
bl TypeCalc
|
||||
movs r1, 0x2
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
@@ -2074,7 +2074,7 @@ _08063D58:
|
||||
beq _08063D60
|
||||
b _08063BE4
|
||||
_08063D60:
|
||||
ldr r0, =gUnknown_02024400
|
||||
ldr r0, =gDynamicBasePower
|
||||
movs r1, 0
|
||||
strh r1, [r0]
|
||||
ldr r0, =gBattleStruct
|
||||
@@ -2167,11 +2167,11 @@ _08063DEE:
|
||||
beq _08063E2A
|
||||
ldrb r0, [r6]
|
||||
ldr r1, [sp, 0x4]
|
||||
bl sub_8046E7C
|
||||
bl AI_CalcDmg
|
||||
ldrb r1, [r6]
|
||||
adds r0, r4, 0
|
||||
ldr r2, [sp, 0x4]
|
||||
bl move_effectiveness_something
|
||||
bl TypeCalc
|
||||
_08063E2A:
|
||||
mov r2, r8
|
||||
ldr r0, [r2]
|
||||
|
||||
+31
-31
@@ -123,7 +123,7 @@ move_something: @ 80A3A48
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
mov r9, r2
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A3AE8
|
||||
@@ -846,7 +846,7 @@ _080A406E:
|
||||
movs r2, 0x80
|
||||
lsls r2, 1
|
||||
bl m4aMPlayVolumeControl
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A409C
|
||||
@@ -1021,7 +1021,7 @@ _080A41FA:
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _080A4226
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4230
|
||||
@@ -1073,7 +1073,7 @@ _080A4266:
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _080A4294
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A42A4
|
||||
@@ -1130,7 +1130,7 @@ b_side_obj__get_some_boolean: @ 80A4310
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r5, r4, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4330
|
||||
@@ -1146,7 +1146,7 @@ _080A4330:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4384
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A4374
|
||||
@@ -1203,7 +1203,7 @@ sub_80A438C: @ 80A438C
|
||||
beq _080A43AA
|
||||
b _080A455E
|
||||
_080A43AA:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -1278,7 +1278,7 @@ _080A43F8:
|
||||
negs r0, r0
|
||||
adds r0, 0x20
|
||||
strh r0, [r5]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A447A
|
||||
@@ -1347,7 +1347,7 @@ _080A44B0:
|
||||
ldr r2, =0x04000008
|
||||
adds r0, r4, 0
|
||||
bl CpuSet
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4524
|
||||
@@ -1374,7 +1374,7 @@ _080A452E:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl sub_8118FBC
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A4558
|
||||
@@ -1645,7 +1645,7 @@ sub_80A477C: @ 80A477C
|
||||
bl sub_80A6B30
|
||||
cmp r4, 0
|
||||
beq _080A479C
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0
|
||||
@@ -1891,7 +1891,7 @@ sub_80A4980: @ 80A4980
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _080A49BC
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A49C4
|
||||
@@ -1985,7 +1985,7 @@ _080A4A4A:
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _080A4A76
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4A80
|
||||
@@ -2018,7 +2018,7 @@ _080A4A8A:
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _080A4ABC
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4AC0
|
||||
@@ -2171,7 +2171,7 @@ sub_80A4BB0: @ 80A4BB0
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bls _080A4BEE
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4BF8
|
||||
@@ -2441,8 +2441,8 @@ ma13_goto: @ 80A4DCC
|
||||
.pool
|
||||
thumb_func_end ma13_goto
|
||||
|
||||
thumb_func_start sub_80A4DF0
|
||||
sub_80A4DF0: @ 80A4DF0
|
||||
thumb_func_start IsContest
|
||||
IsContest: @ 80A4DF0
|
||||
push {lr}
|
||||
ldr r0, =gMain
|
||||
ldr r1, =0x00000439
|
||||
@@ -2460,7 +2460,7 @@ _080A4E10:
|
||||
_080A4E12:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80A4DF0
|
||||
thumb_func_end IsContest
|
||||
|
||||
thumb_func_start ma14_load_background
|
||||
ma14_load_background: @ 80A4E18
|
||||
@@ -2513,7 +2513,7 @@ sub_80A4E5C: @ 80A4E5C
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r5, r4, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A4EA8
|
||||
@@ -2670,7 +2670,7 @@ sub_80A4FC8: @ 80A4FC8
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5050
|
||||
@@ -2747,7 +2747,7 @@ _080A507E:
|
||||
thumb_func_start dp01t_11_3_message_for_player_only
|
||||
dp01t_11_3_message_for_player_only: @ 80A5090
|
||||
push {lr}
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A50A2
|
||||
@@ -2860,7 +2860,7 @@ sub_80A5178: @ 80A5178
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A51C0
|
||||
@@ -2888,7 +2888,7 @@ sub_80A5178: @ 80A5178
|
||||
b _080A5252
|
||||
.pool
|
||||
_080A51C0:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A51E8
|
||||
@@ -2982,7 +2982,7 @@ sub_80A5278: @ 80A5278
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A52C0
|
||||
@@ -3016,7 +3016,7 @@ _080A52C0:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A52D8
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A52DE
|
||||
@@ -3822,7 +3822,7 @@ sub_80A5944: @ 80A5944
|
||||
ldr r0, [r4]
|
||||
adds r0, 0x1
|
||||
str r0, [r4]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5978
|
||||
@@ -3870,7 +3870,7 @@ _080A59A2:
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A59D2
|
||||
@@ -3901,7 +3901,7 @@ sub_80A59DC: @ 80A59DC
|
||||
ldr r1, [r0]
|
||||
adds r1, 0x1
|
||||
str r1, [r0]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A5A04
|
||||
@@ -3949,7 +3949,7 @@ _080A5A4A:
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A5A78
|
||||
@@ -4043,7 +4043,7 @@ sub_80A5AFC: @ 80A5AFC
|
||||
ldrb r7, [r0, 0x1]
|
||||
adds r0, 0x2
|
||||
str r0, [r1]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A5BA6
|
||||
@@ -4125,7 +4125,7 @@ sub_80A5BAC: @ 80A5BAC
|
||||
ldrb r7, [r0, 0x1]
|
||||
adds r0, 0x2
|
||||
str r0, [r1]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A5C38
|
||||
|
||||
+84
-84
@@ -717,7 +717,7 @@ sub_80FEE1C: @ 80FEE1C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080FEE36
|
||||
@@ -2485,7 +2485,7 @@ _080FFC38:
|
||||
adds r0, r6, 0
|
||||
adds r0, 0xA
|
||||
strh r0, [r5, 0x3C]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080FFC50
|
||||
@@ -2679,7 +2679,7 @@ sub_80FFDBC: @ 80FFDBC
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0
|
||||
bne _080FFE50
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080FFDE4
|
||||
@@ -2869,7 +2869,7 @@ _080FFF10:
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x30]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080FFF5E
|
||||
@@ -4155,7 +4155,7 @@ _08100918:
|
||||
bl sub_80A74F4
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810097A
|
||||
@@ -4857,7 +4857,7 @@ _08100EE8:
|
||||
sub_8100EF0: @ 8100EF0
|
||||
push {r4-r6,lr}
|
||||
adds r5, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08100F06
|
||||
@@ -4889,7 +4889,7 @@ _08100F06:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08100F44
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08100F6C
|
||||
@@ -7334,7 +7334,7 @@ sub_8102268: @ 8102268
|
||||
ldrh r5, [r5, 0x2]
|
||||
adds r0, r5
|
||||
strh r0, [r6, 0x22]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081022AC
|
||||
@@ -7621,7 +7621,7 @@ _081024C2:
|
||||
sub_81024E0: @ 81024E0
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081024F6
|
||||
@@ -8088,7 +8088,7 @@ _08102862:
|
||||
ldrh r1, [r5, 0x20]
|
||||
strh r1, [r5, 0x3A]
|
||||
strh r0, [r5, 0x3C]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081028D4
|
||||
@@ -8648,7 +8648,7 @@ _08102D10:
|
||||
strh r1, [r5, 0x32]
|
||||
ldrh r0, [r4, 0x4]
|
||||
strh r0, [r5, 0x34]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08102D34
|
||||
@@ -10106,7 +10106,7 @@ sub_81038C8: @ 81038C8
|
||||
push {r7}
|
||||
sub sp, 0x4
|
||||
adds r5, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081038EC
|
||||
@@ -10178,7 +10178,7 @@ _0810390E:
|
||||
lsls r1, 24
|
||||
adds r0, r1
|
||||
lsrs r4, r0, 16
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08103980
|
||||
@@ -10642,7 +10642,7 @@ sub_8103CF0: @ 8103CF0
|
||||
mov r4, sp
|
||||
adds r4, 0x2
|
||||
strh r1, [r4]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
mov r10, r4
|
||||
cmp r0, 0
|
||||
@@ -13381,7 +13381,7 @@ _0810536C:
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
mov r9, r0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081053E4
|
||||
@@ -13450,7 +13450,7 @@ _081053FA:
|
||||
adds r0, r1
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810544C
|
||||
@@ -14777,7 +14777,7 @@ sub_8105EB0: @ 8105EB0
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
movs r6, 0xF0
|
||||
cmp r0, 0
|
||||
@@ -15296,7 +15296,7 @@ sub_81062E8: @ 81062E8
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810632A
|
||||
@@ -15482,7 +15482,7 @@ _08106496:
|
||||
b _081064F0
|
||||
.pool
|
||||
_081064BC:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081064D0
|
||||
@@ -15531,7 +15531,7 @@ sub_81064F8: @ 81064F8
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810653A
|
||||
@@ -15553,7 +15553,7 @@ _0810653A:
|
||||
bl SetGpuReg
|
||||
mov r0, sp
|
||||
bl sub_80A6B30
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08106578
|
||||
@@ -15740,7 +15740,7 @@ _081066DA:
|
||||
adds r0, 0x1
|
||||
strh r0, [r1, 0x20]
|
||||
_081066FC:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08106710
|
||||
@@ -17792,7 +17792,7 @@ sub_8107730: @ 8107730
|
||||
bl sub_80A82E4
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810778A
|
||||
@@ -18061,7 +18061,7 @@ sub_8107954: @ 8107954
|
||||
bl lcd_bg_operations
|
||||
mov r0, sp
|
||||
bl sub_80A6B30
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081079E0
|
||||
@@ -18152,7 +18152,7 @@ _08107A32:
|
||||
lsls r0, 5
|
||||
strh r0, [r7, 0xA]
|
||||
strh r0, [r7, 0xC]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0
|
||||
@@ -18447,7 +18447,7 @@ sub_8107CC4: @ 8107CC4
|
||||
b _08107D4A
|
||||
.pool
|
||||
_08107D08:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08107D1C
|
||||
@@ -19981,7 +19981,7 @@ sub_81088E4: @ 81088E4
|
||||
movs r1, 0x1
|
||||
_08108928:
|
||||
strh r1, [r5, 0x16]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810893C
|
||||
@@ -22475,7 +22475,7 @@ _08109CC8:
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
strh r0, [r4, 0x30]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08109D64
|
||||
@@ -23572,7 +23572,7 @@ _0810A5B6:
|
||||
sub_810A5BC: @ 810A5BC
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810A5D8
|
||||
@@ -23640,7 +23640,7 @@ _0810A64C:
|
||||
ldr r0, =gAnimationBankAttacker
|
||||
_0810A64E:
|
||||
ldrb r6, [r0]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810A666
|
||||
@@ -26939,7 +26939,7 @@ sub_810C0A0: @ 810C0A0
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810C0E2
|
||||
@@ -27141,7 +27141,7 @@ _0810C27A:
|
||||
adds r0, 0x1
|
||||
strh r0, [r1, 0x20]
|
||||
_0810C29C:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810C2B0
|
||||
@@ -27221,7 +27221,7 @@ sub_810C324: @ 810C324
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810C366
|
||||
@@ -27413,7 +27413,7 @@ _0810C4EA:
|
||||
adds r0, 0x1
|
||||
strh r0, [r1, 0x20]
|
||||
_0810C50C:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810C520
|
||||
@@ -27596,7 +27596,7 @@ _0810C684:
|
||||
ldrh r1, [r5, 0x3C]
|
||||
orrs r0, r1
|
||||
strh r0, [r5, 0x3C]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810C6B8
|
||||
@@ -27695,7 +27695,7 @@ _0810C736:
|
||||
ldrh r0, [r4, 0x3C]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x3C]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810C78C
|
||||
@@ -27762,7 +27762,7 @@ _0810C7BC:
|
||||
ldrh r1, [r4, 0x26]
|
||||
adds r0, r1
|
||||
strh r0, [r4, 0x26]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810C83A
|
||||
@@ -27839,7 +27839,7 @@ _0810C85A:
|
||||
strh r0, [r4, 0x34]
|
||||
adds r0, 0x4
|
||||
strh r0, [r4, 0x36]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810C8B4
|
||||
@@ -28612,7 +28612,7 @@ _0810CE90:
|
||||
sub_810CEB4: @ 810CEB4
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810CED0
|
||||
@@ -29842,7 +29842,7 @@ _0810D8BE:
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r5, 0x5]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810D8F8
|
||||
@@ -30009,7 +30009,7 @@ _0810DA2C:
|
||||
movs r1, 0
|
||||
bl sub_80A6980
|
||||
_0810DA34:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810DA48
|
||||
@@ -30768,7 +30768,7 @@ sub_810E044: @ 810E044
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x6]
|
||||
_0810E070:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810E088
|
||||
@@ -31166,7 +31166,7 @@ _0810E354:
|
||||
lsrs r1, 16
|
||||
cmp r1, 0x7F
|
||||
bhi _0810E44A
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E3F0
|
||||
@@ -31458,7 +31458,7 @@ _0810E5B4:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0810E672
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E642
|
||||
@@ -31590,7 +31590,7 @@ _0810E6A8:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0810E766
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E736
|
||||
@@ -31722,7 +31722,7 @@ _0810E79C:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0810E85A
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E82A
|
||||
@@ -31863,7 +31863,7 @@ _0810E8A4:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0810E962
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810E932
|
||||
@@ -33034,7 +33034,7 @@ sub_810F1EC: @ 810F1EC
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r5, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
@@ -33365,7 +33365,7 @@ sub_810F46C: @ 810F46C
|
||||
negs r1, r1
|
||||
cmp r0, r1
|
||||
bne _0810F512
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810F502
|
||||
@@ -33436,7 +33436,7 @@ _0810F512:
|
||||
sub_810F524: @ 810F524
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810F57C
|
||||
@@ -33497,7 +33497,7 @@ sub_810F58C: @ 810F58C
|
||||
bne _0810F5A6
|
||||
movs r6, 0x1
|
||||
_0810F5A6:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0810F5EE
|
||||
@@ -34294,7 +34294,7 @@ sub_810FBF0: @ 810FBF0
|
||||
lsls r1, 3
|
||||
ldr r0, =gTasks
|
||||
adds r5, r1, r0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0810FC94
|
||||
@@ -35075,7 +35075,7 @@ _08110260:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5, 0x22]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0811028E
|
||||
@@ -35192,7 +35192,7 @@ _08110360:
|
||||
sub_8110368: @ 8110368
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08110394
|
||||
@@ -35283,7 +35283,7 @@ _081103C4:
|
||||
sub_8110438: @ 8110438
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0811045C
|
||||
@@ -35358,7 +35358,7 @@ _08110478:
|
||||
sub_81104E4: @ 81104E4
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08110500
|
||||
@@ -35644,7 +35644,7 @@ sub_8110720: @ 8110720
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r7, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08110740
|
||||
@@ -35672,7 +35672,7 @@ _08110740:
|
||||
negs r0, r0
|
||||
strh r0, [r1, 0x6]
|
||||
_08110762:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081107B2
|
||||
@@ -36212,7 +36212,7 @@ sub_8110BCC: @ 8110BCC
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08110C10
|
||||
@@ -36433,7 +36433,7 @@ _08110DF0:
|
||||
b _08110E3A
|
||||
.pool
|
||||
_08110DFC:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08110E10
|
||||
@@ -39179,7 +39179,7 @@ sub_81123C4: @ 81123C4
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
str r0, [sp, 0x8]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08112434
|
||||
@@ -39600,7 +39600,7 @@ sub_8112758: @ 8112758
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081127A0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081127B8
|
||||
@@ -42121,7 +42121,7 @@ _08113C1E:
|
||||
ldr r0, =0x04000016
|
||||
str r0, [sp]
|
||||
movs r7, 0x2
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08113CB0
|
||||
@@ -42142,7 +42142,7 @@ _08113C80:
|
||||
ldr r0, =0x0400001a
|
||||
str r0, [sp]
|
||||
movs r7, 0x4
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08113CB0
|
||||
@@ -42393,7 +42393,7 @@ _08113EA8:
|
||||
.4byte _08113FF0
|
||||
.4byte _08114058
|
||||
_08113EBC:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -43185,7 +43185,7 @@ sub_81144F8: @ 81144F8
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0811455C
|
||||
@@ -43198,7 +43198,7 @@ _0811455C:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081145D6
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081145D6
|
||||
@@ -43251,7 +43251,7 @@ _0811458C:
|
||||
bl lcd_bg_operations
|
||||
movs r6, 0x1
|
||||
_081145D6:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08114614
|
||||
@@ -43496,7 +43496,7 @@ _08114824:
|
||||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08114856
|
||||
@@ -46961,7 +46961,7 @@ sub_8116420: @ 8116420
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08116444
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08116444
|
||||
@@ -47844,7 +47844,7 @@ sub_8116B14: @ 8116B14
|
||||
ldrh r1, [r4]
|
||||
movs r0, 0xA
|
||||
bl SetGpuReg
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08116BA2
|
||||
@@ -47863,7 +47863,7 @@ _08116BA2:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08116C26
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08116C26
|
||||
@@ -47921,7 +47921,7 @@ _08116BD2:
|
||||
bl SetGpuReg
|
||||
movs r7, 0x1
|
||||
_08116C26:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08116C64
|
||||
@@ -48084,7 +48084,7 @@ sub_8116D64: @ 8116D64
|
||||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08116DF6
|
||||
@@ -48237,7 +48237,7 @@ _08116F26:
|
||||
movs r1, 0x2
|
||||
eors r0, r1
|
||||
strb r0, [r2, 0x1]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08116F56
|
||||
@@ -48286,7 +48286,7 @@ _08116F5C:
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08116FBA
|
||||
@@ -48354,7 +48354,7 @@ _08116FEC:
|
||||
ldr r0, [r4]
|
||||
strb r5, [r0, 0x2]
|
||||
_08117036:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08117078
|
||||
@@ -48758,7 +48758,7 @@ _081173B6:
|
||||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081173E6
|
||||
@@ -49347,7 +49347,7 @@ sub_8117854: @ 8117854
|
||||
movs r0, 0x2
|
||||
adds r6, r7, 0
|
||||
eors r6, r0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081178B6
|
||||
@@ -49404,7 +49404,7 @@ _081178BA:
|
||||
movs r1, 0x20
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08117930
|
||||
@@ -49419,7 +49419,7 @@ _08117930:
|
||||
ldrh r1, [r4]
|
||||
movs r0, 0xA
|
||||
bl SetGpuReg
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08117964
|
||||
@@ -49687,7 +49687,7 @@ _08117B34:
|
||||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08117BB2
|
||||
@@ -50037,7 +50037,7 @@ sub_8117E60: @ 8117E60
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@@ -50150,7 +50150,7 @@ sub_8117F60: @ 8117F60
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08117F78
|
||||
|
||||
@@ -328,7 +328,7 @@ _08170708:
|
||||
movs r0, 0x4A
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0817076C
|
||||
|
||||
@@ -348,7 +348,7 @@ sub_80A9EF4: @ 80A9EF4
|
||||
ldr r1, =0xffdc0000
|
||||
adds r0, r1
|
||||
lsrs r4, r0, 16
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A9F32
|
||||
|
||||
@@ -4057,11 +4057,11 @@ _08066770:
|
||||
ldrb r0, [r5]
|
||||
cmp r0, 0x1
|
||||
bne _08066794
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
b _08066796
|
||||
.pool
|
||||
_08066794:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
_08066796:
|
||||
ldrh r0, [r0]
|
||||
bl sub_8162AA0
|
||||
@@ -4143,7 +4143,7 @@ _08066838:
|
||||
b _0806693A
|
||||
_08066840:
|
||||
movs r7, 0xB0
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -4389,11 +4389,11 @@ sub_8066A58: @ 8066A58
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
bne _08066A74
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
b _08066A76
|
||||
.pool
|
||||
_08066A74:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
_08066A76:
|
||||
ldrh r0, [r0]
|
||||
bl sub_8162AA0
|
||||
|
||||
@@ -4205,7 +4205,7 @@ sub_8061690: @ 8061690
|
||||
b _0806175A
|
||||
.pool
|
||||
_080616B0:
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r3]
|
||||
ldr r0, =0x000003fe
|
||||
cmp r1, r0
|
||||
@@ -4233,7 +4233,7 @@ _080616C8:
|
||||
b _0806175A
|
||||
.pool
|
||||
_080616F0:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
bl sub_81D5588
|
||||
b _0806175A
|
||||
@@ -4260,7 +4260,7 @@ _08061708:
|
||||
b _0806175A
|
||||
.pool
|
||||
_08061734:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
bl sub_8162AA0
|
||||
b _0806175A
|
||||
@@ -4291,7 +4291,7 @@ _08061760:
|
||||
cmp r0, 0x1
|
||||
beq _08061788
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
b _0806178C
|
||||
.pool
|
||||
@@ -4452,7 +4452,7 @@ sub_80618D8: @ 80618D8
|
||||
b _080619A2
|
||||
.pool
|
||||
_080618F8:
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r3]
|
||||
ldr r0, =0x000003fe
|
||||
cmp r1, r0
|
||||
@@ -4480,7 +4480,7 @@ _08061910:
|
||||
b _080619A2
|
||||
.pool
|
||||
_08061938:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
bl sub_81D5588
|
||||
b _080619A2
|
||||
@@ -4507,7 +4507,7 @@ _08061950:
|
||||
b _080619A2
|
||||
.pool
|
||||
_0806197C:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
bl sub_8162AA0
|
||||
b _080619A2
|
||||
@@ -4538,7 +4538,7 @@ _080619A8:
|
||||
cmp r0, 0x1
|
||||
beq _080619D0
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
b _080619D4
|
||||
.pool
|
||||
@@ -5261,7 +5261,7 @@ _08061FE4:
|
||||
beq _080620C4
|
||||
movs r0, 0xF
|
||||
bl BattleAI_SetupAIData
|
||||
bl sub_8130BA4
|
||||
bl BattleAI_ChooseMoveOrAction
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0x5
|
||||
|
||||
@@ -5014,7 +5014,7 @@ sub_81BDAC8: @ 81BDAC8
|
||||
adds r4, r0
|
||||
movs r0, 0xF
|
||||
bl BattleAI_SetupAIData
|
||||
bl sub_8130BA4
|
||||
bl BattleAI_ChooseMoveOrAction
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
ldr r2, =gBattleMoves
|
||||
|
||||
@@ -4038,11 +4038,11 @@ _081888B4:
|
||||
ldrb r0, [r4]
|
||||
cmp r0, 0x1
|
||||
bne _081888D8
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
b _081888DA
|
||||
.pool
|
||||
_081888D8:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
_081888DA:
|
||||
ldrh r0, [r0]
|
||||
bl sub_8162AA0
|
||||
@@ -4057,7 +4057,7 @@ _081888EC:
|
||||
b _08188924
|
||||
_081888F6:
|
||||
movs r7, 0xB0
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
|
||||
+21
-21
@@ -145,7 +145,7 @@ _0814E200:
|
||||
b _0814E6D8
|
||||
.pool
|
||||
_0814E214:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -302,7 +302,7 @@ _0814E368:
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _0814E380
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -353,7 +353,7 @@ _0814E3E0:
|
||||
b _0814E6D8
|
||||
.pool
|
||||
_0814E3EC:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x80
|
||||
lsls r0, 4
|
||||
@@ -444,7 +444,7 @@ _0814E4AC:
|
||||
b _0814E6D8
|
||||
.pool
|
||||
_0814E4BC:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -609,7 +609,7 @@ _0814E630:
|
||||
b _0814E6D8
|
||||
.pool
|
||||
_0814E638:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -1720,7 +1720,7 @@ _0814F0D8:
|
||||
b _0814F59C
|
||||
.pool
|
||||
_0814F0F0:
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r2, [r3]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -1808,7 +1808,7 @@ _0814F178:
|
||||
b _0814F5BE
|
||||
.pool
|
||||
_0814F1AC:
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r2, [r3]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -1944,7 +1944,7 @@ _0814F2C0:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0814F2E0
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x2
|
||||
b _0814F55A
|
||||
@@ -1955,7 +1955,7 @@ _0814F2E0:
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _0814F2F8
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x4
|
||||
b _0814F584
|
||||
@@ -1971,7 +1971,7 @@ _0814F300:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0814F31C
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
b _0814F556
|
||||
.pool
|
||||
_0814F31C:
|
||||
@@ -1982,7 +1982,7 @@ _0814F31C:
|
||||
bne _0814F328
|
||||
b _0814F5C0
|
||||
_0814F328:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
b _0814F580
|
||||
.pool
|
||||
_0814F330:
|
||||
@@ -2120,7 +2120,7 @@ _0814F468:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0814F484
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
b _0814F596
|
||||
.pool
|
||||
_0814F484:
|
||||
@@ -2129,14 +2129,14 @@ _0814F484:
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _0814F49C
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
bl sub_81D5530
|
||||
b _0814F59C
|
||||
.pool
|
||||
_0814F49C:
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -2153,7 +2153,7 @@ _0814F4B8:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0814F4D4
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
b _0814F5B6
|
||||
.pool
|
||||
_0814F4D4:
|
||||
@@ -2162,14 +2162,14 @@ _0814F4D4:
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _0814F4F0
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
mov r0, sp
|
||||
bl sub_81D5554
|
||||
b _0814F5BE
|
||||
.pool
|
||||
_0814F4F0:
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -2185,7 +2185,7 @@ _0814F508:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0814F528
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x2
|
||||
b _0814F55A
|
||||
@@ -2196,7 +2196,7 @@ _0814F528:
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _0814F540
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x4
|
||||
b _0814F584
|
||||
@@ -2212,7 +2212,7 @@ _0814F548:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0814F574
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
_0814F556:
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x1
|
||||
@@ -2227,7 +2227,7 @@ _0814F574:
|
||||
ands r1, r0
|
||||
cmp r1, 0
|
||||
beq _0814F5C0
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
_0814F580:
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x3
|
||||
|
||||
+20
-20
@@ -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
|
||||
|
||||
+2
-2
@@ -1867,7 +1867,7 @@ _080B3378:
|
||||
ldrh r0, [r0]
|
||||
bl sub_80B3260
|
||||
bl overworld_free_bg_tilemaps
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
movs r2, 0x80
|
||||
lsls r2, 4
|
||||
adds r0, r2, 0
|
||||
@@ -2040,7 +2040,7 @@ _080B3504:
|
||||
ldrh r0, [r0]
|
||||
bl sub_80B3260
|
||||
bl overworld_free_bg_tilemaps
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
movs r3, 0x80
|
||||
lsls r3, 4
|
||||
adds r0, r3, 0
|
||||
|
||||
+1
-1
@@ -2481,7 +2481,7 @@ _08070D7E:
|
||||
bl pokemon_getattr_encrypted
|
||||
adds r1, r0, 0
|
||||
ldrh r0, [r5]
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, [sp, 0x28]
|
||||
|
||||
+1
-1
@@ -2572,7 +2572,7 @@ _08174B8C:
|
||||
lsls r0, r1, 23
|
||||
lsrs r0, 23
|
||||
ldr r1, [r7, 0x4]
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
|
||||
+1
-1
@@ -33412,7 +33412,7 @@ _0801AB1E:
|
||||
movs r0, 0x32
|
||||
bl IncrementGameStat
|
||||
bl calc_player_party_count
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
movs r2, 0xC0
|
||||
lsls r2, 4
|
||||
adds r1, r2, 0
|
||||
|
||||
+3
-3
@@ -621,7 +621,7 @@ _08067F38:
|
||||
bne _08067F38
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r8, r0
|
||||
@@ -647,7 +647,7 @@ _08067F9E:
|
||||
bne _08067F9E
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r8, r0
|
||||
@@ -702,7 +702,7 @@ _0806800A:
|
||||
orrs r4, r0
|
||||
adds r0, r6, 0
|
||||
adds r1, r4, 0
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806800A
|
||||
|
||||
+4
-4
@@ -140,7 +140,7 @@ ShouldGetStatBadgeBoost: @ 8069ED8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _08069F10
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x80
|
||||
lsls r0, 3
|
||||
@@ -288,8 +288,8 @@ _0806A01A:
|
||||
bx r1
|
||||
thumb_func_end pokemon_roll_gender
|
||||
|
||||
thumb_func_start pokemon_species_get_gender_info
|
||||
pokemon_species_get_gender_info: @ 806A020
|
||||
thumb_func_start GetGenderFromSpeciesAndPersonality
|
||||
GetGenderFromSpeciesAndPersonality: @ 806A020
|
||||
push {lr}
|
||||
adds r3, r1, 0
|
||||
lsls r0, 16
|
||||
@@ -326,7 +326,7 @@ _0806A060:
|
||||
_0806A062:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end pokemon_species_get_gender_info
|
||||
thumb_func_end GetGenderFromSpeciesAndPersonality
|
||||
|
||||
thumb_func_start sub_806A068
|
||||
sub_806A068: @ 806A068
|
||||
|
||||
+6
-6
@@ -1004,7 +1004,7 @@ _0806C574:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806C5B2
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrb r0, [r1, 0x4]
|
||||
cmp r0, 0xFE
|
||||
bhi _0806C5B2
|
||||
@@ -1140,7 +1140,7 @@ _0806C65E:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806C6EC
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrb r0, [r1, 0x3]
|
||||
cmp r0, 0xFE
|
||||
bhi _0806C6AE
|
||||
@@ -3614,7 +3614,7 @@ _0806D9F0:
|
||||
cmp r0, 0
|
||||
beq _0806DAC2
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -4993,7 +4993,7 @@ _0806E470:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _0806E494
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
bl sub_8162BD8
|
||||
lsls r0, 24
|
||||
@@ -5010,7 +5010,7 @@ _0806E494:
|
||||
b _0806E4B2
|
||||
_0806E4A2:
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -5121,7 +5121,7 @@ _0806E5F2:
|
||||
b _0806E646
|
||||
.pool
|
||||
_0806E604:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
|
||||
+27
-27
@@ -873,12 +873,12 @@ _081854DC:
|
||||
adds r0, r7, r3
|
||||
str r2, [r0]
|
||||
_081854E2:
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r4]
|
||||
ldr r5, =0x000004f4
|
||||
adds r0, r7, r5
|
||||
strh r1, [r0]
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r0]
|
||||
ldr r2, =0x000004f6
|
||||
adds r0, r7, r2
|
||||
@@ -944,7 +944,7 @@ _081854E2:
|
||||
str r0, [r1]
|
||||
ldr r4, =0xfffffed4
|
||||
adds r1, r4, 0
|
||||
ldr r5, =gUnknown_02038BCA
|
||||
ldr r5, =gTrainerBattleOpponent_A
|
||||
ldrh r5, [r5]
|
||||
adds r0, r1, r5
|
||||
lsls r0, 16
|
||||
@@ -957,7 +957,7 @@ _08185580:
|
||||
ldr r0, =0x00000504
|
||||
adds r3, r7, r0
|
||||
mov r10, r9
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
mov r12, r1
|
||||
adds r2, r4, 0
|
||||
mov r8, r2
|
||||
@@ -981,7 +981,7 @@ _08185592:
|
||||
ble _08185592
|
||||
mov r0, r9
|
||||
ldr r2, [r0]
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r1]
|
||||
ldr r3, =0xfffffed4
|
||||
adds r0, r3
|
||||
@@ -1002,7 +1002,7 @@ _08185592:
|
||||
ldr r2, =0x0000050e
|
||||
adds r4, r7, r2
|
||||
mov r10, r9
|
||||
ldr r5, =gUnknown_02038BCA
|
||||
ldr r5, =gTrainerBattleOpponent_A
|
||||
mov r8, r5
|
||||
adds r5, r3, 0
|
||||
_081855E6:
|
||||
@@ -1032,7 +1032,7 @@ _08185664:
|
||||
ldr r1, =0x0000050e
|
||||
adds r4, r7, r1
|
||||
mov r10, r9
|
||||
ldr r2, =gUnknown_02038BCA
|
||||
ldr r2, =gTrainerBattleOpponent_A
|
||||
mov r8, r2
|
||||
adds r5, r3, 0
|
||||
_08185672:
|
||||
@@ -1057,7 +1057,7 @@ _08185672:
|
||||
_08185696:
|
||||
mov r1, r9
|
||||
ldr r2, [r1]
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r3]
|
||||
ldr r4, =0xfffffed4
|
||||
adds r0, r4
|
||||
@@ -1070,7 +1070,7 @@ _08185696:
|
||||
b _08185856
|
||||
.pool
|
||||
_081856C4:
|
||||
ldr r3, =gUnknown_02038BCC
|
||||
ldr r3, =gTrainerBattleOpponent_B
|
||||
ldrh r3, [r3]
|
||||
adds r0, r1, r3
|
||||
lsls r0, 16
|
||||
@@ -1083,7 +1083,7 @@ _081856D4:
|
||||
ldr r4, =0x00000504
|
||||
adds r3, r7, r4
|
||||
mov r10, r9
|
||||
ldr r5, =gUnknown_02038BCC
|
||||
ldr r5, =gTrainerBattleOpponent_B
|
||||
mov r12, r5
|
||||
ldr r0, =0xfffffed4
|
||||
mov r8, r0
|
||||
@@ -1107,7 +1107,7 @@ _081856E6:
|
||||
ble _081856E6
|
||||
mov r0, r9
|
||||
ldr r2, [r0]
|
||||
ldr r1, =gUnknown_02038BCC
|
||||
ldr r1, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r1]
|
||||
ldr r3, =0xfffffed4
|
||||
adds r0, r3
|
||||
@@ -1128,7 +1128,7 @@ _081856E6:
|
||||
ldr r2, =0x0000050e
|
||||
adds r4, r7, r2
|
||||
mov r10, r9
|
||||
ldr r5, =gUnknown_02038BCC
|
||||
ldr r5, =gTrainerBattleOpponent_B
|
||||
mov r8, r5
|
||||
adds r5, r3, 0
|
||||
_0818573A:
|
||||
@@ -1158,7 +1158,7 @@ _08185784:
|
||||
ldr r1, =0x0000050e
|
||||
adds r4, r7, r1
|
||||
mov r10, r9
|
||||
ldr r2, =gUnknown_02038BCC
|
||||
ldr r2, =gTrainerBattleOpponent_B
|
||||
mov r8, r2
|
||||
adds r5, r3, 0
|
||||
_08185792:
|
||||
@@ -1183,7 +1183,7 @@ _08185792:
|
||||
_081857B6:
|
||||
mov r1, r9
|
||||
ldr r2, [r1]
|
||||
ldr r3, =gUnknown_02038BCC
|
||||
ldr r3, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r3]
|
||||
ldr r4, =0xfffffed4
|
||||
adds r0, r4
|
||||
@@ -1259,7 +1259,7 @@ _08185856:
|
||||
adds r0, r7, r2
|
||||
strb r1, [r0]
|
||||
_0818585C:
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r3]
|
||||
ldr r1, =0x0000018f
|
||||
cmp r0, r1
|
||||
@@ -1284,7 +1284,7 @@ _0818585C:
|
||||
ldr r0, =0x0000050e
|
||||
adds r4, r7, r0
|
||||
mov r10, r9
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
mov r8, r1
|
||||
adds r5, r3, 0
|
||||
_08185894:
|
||||
@@ -1310,14 +1310,14 @@ _08185894:
|
||||
ble _08185894
|
||||
mov r3, r9
|
||||
ldr r2, [r3]
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r4]
|
||||
ldr r5, =0xfffffe70
|
||||
adds r1, r5
|
||||
b _081859AC
|
||||
.pool
|
||||
_08185900:
|
||||
ldr r3, =gUnknown_02038BCC
|
||||
ldr r3, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r3]
|
||||
cmp r0, r1
|
||||
bls _0818597C
|
||||
@@ -1341,7 +1341,7 @@ _08185900:
|
||||
ldr r0, =0x0000050e
|
||||
adds r4, r7, r0
|
||||
mov r10, r9
|
||||
ldr r1, =gUnknown_02038BCC
|
||||
ldr r1, =gTrainerBattleOpponent_B
|
||||
mov r8, r1
|
||||
adds r5, r3, 0
|
||||
_08185936:
|
||||
@@ -1367,7 +1367,7 @@ _08185936:
|
||||
ble _08185936
|
||||
mov r3, r9
|
||||
ldr r2, [r3]
|
||||
ldr r4, =gUnknown_02038BCC
|
||||
ldr r4, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r4]
|
||||
ldr r5, =0xfffffe70
|
||||
adds r1, r5
|
||||
@@ -1542,9 +1542,9 @@ sub_8185AB0: @ 8185AB0
|
||||
ldr r0, =gBattleTypeFlags
|
||||
movs r1, 0
|
||||
str r1, [r0]
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
strh r1, [r0]
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
strh r1, [r0]
|
||||
ldr r0, =gUnknown_02038BCE
|
||||
strh r1, [r0]
|
||||
@@ -1715,12 +1715,12 @@ _08185C2A:
|
||||
lsls r1, 17
|
||||
orrs r0, r1
|
||||
str r0, [r2]
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
ldr r2, =0x000004f4
|
||||
adds r0, r7, r2
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r1]
|
||||
ldr r1, =gUnknown_02038BCC
|
||||
ldr r1, =gTrainerBattleOpponent_B
|
||||
adds r3, 0xE
|
||||
adds r0, r7, r3
|
||||
ldrh r0, [r0]
|
||||
@@ -2638,13 +2638,13 @@ _081863FC:
|
||||
.pool
|
||||
thumb_func_end sub_818603C
|
||||
|
||||
thumb_func_start sub_8186438
|
||||
sub_8186438: @ 8186438
|
||||
thumb_func_start GetAiScriptsInRecordedBattle
|
||||
GetAiScriptsInRecordedBattle: @ 8186438
|
||||
ldr r0, =gUnknown_0203C7BC
|
||||
ldr r0, [r0]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_8186438
|
||||
thumb_func_end GetAiScriptsInRecordedBattle
|
||||
|
||||
thumb_func_start sub_8186444
|
||||
sub_8186444: @ 8186444
|
||||
|
||||
+33
-33
@@ -1493,7 +1493,7 @@ _0803584C:
|
||||
cmp r1, 0
|
||||
beq _080358C4
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -2603,7 +2603,7 @@ _080362F8:
|
||||
cmp r1, 0
|
||||
beq _08036350
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -2740,7 +2740,7 @@ _0803645C:
|
||||
cmp r1, 0
|
||||
beq _0803648C
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -2850,7 +2850,7 @@ _08036568:
|
||||
cmp r1, 0
|
||||
beq _08036598
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -2961,7 +2961,7 @@ _08036674:
|
||||
cmp r1, 0
|
||||
beq _080366AC
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -3287,7 +3287,7 @@ _080369AE:
|
||||
cmp r0, 0
|
||||
bne _080369E8
|
||||
ldr r4, =gEnemyParty
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
adds r0, r4, 0
|
||||
movs r2, 0x1
|
||||
@@ -3301,7 +3301,7 @@ _080369AE:
|
||||
movs r1, 0x96
|
||||
lsls r1, 1
|
||||
adds r0, r4, r1
|
||||
ldr r1, =gUnknown_02038BCC
|
||||
ldr r1, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r1]
|
||||
movs r2, 0
|
||||
bl LoadTrainerParty
|
||||
@@ -4132,7 +4132,7 @@ _08037098:
|
||||
strb r0, [r1]
|
||||
bl sub_8036A5C
|
||||
bl sub_8036B44
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xC0
|
||||
lsls r0, 4
|
||||
@@ -4591,12 +4591,12 @@ _08037530:
|
||||
strh r0, [r1]
|
||||
adds r0, r6, 0
|
||||
adds r0, 0x40
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r4]
|
||||
bl sub_8162E20
|
||||
adds r0, r6, 0
|
||||
adds r0, 0x5C
|
||||
ldr r5, =gUnknown_02038BCC
|
||||
ldr r5, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r5]
|
||||
bl sub_8162E20
|
||||
ldrh r1, [r4]
|
||||
@@ -6194,7 +6194,7 @@ _080383BC:
|
||||
ands r0, r2
|
||||
cmp r0, 0
|
||||
beq _080383F8
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
movs r4, 0x80
|
||||
lsls r4, 4
|
||||
adds r1, r4, 0
|
||||
@@ -9409,7 +9409,7 @@ sub_8039F40: @ 8039F40
|
||||
mov r9, r1
|
||||
ldr r0, =gUnknown_02024250
|
||||
mov r8, r0
|
||||
ldr r1, =gUnknown_02024248
|
||||
ldr r1, =gLastUsedMovesByBanks
|
||||
mov r12, r1
|
||||
ldr r5, =gDisableStructs
|
||||
movs r4, 0
|
||||
@@ -9467,7 +9467,7 @@ _08039F78:
|
||||
ble _08039F70
|
||||
movs r5, 0
|
||||
ldr r3, =gSideTimers
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
movs r2, 0x1
|
||||
_08039FD8:
|
||||
strh r5, [r4]
|
||||
@@ -9692,7 +9692,7 @@ _0803A1BA:
|
||||
bl Random
|
||||
ldr r1, =gUnknown_02024330
|
||||
strh r0, [r1]
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
_0803A1E4:
|
||||
@@ -9703,7 +9703,7 @@ _0803A1E4:
|
||||
bls _0803A1E4
|
||||
ldr r0, =gEnemyParty
|
||||
bl sub_806EBA4
|
||||
ldr r3, =gUnknown_03005D10
|
||||
ldr r3, =gBattleResults
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
lsls r1, 6
|
||||
@@ -10107,7 +10107,7 @@ _0803A540:
|
||||
strb r0, [r1, 0x18]
|
||||
ldrb r0, [r7]
|
||||
lsls r0, 1
|
||||
ldr r1, =gUnknown_02024248
|
||||
ldr r1, =gLastUsedMovesByBanks
|
||||
adds r0, r1
|
||||
movs r2, 0
|
||||
strh r4, [r0]
|
||||
@@ -10297,10 +10297,10 @@ _0803A6B4:
|
||||
movs r1, 0xFF
|
||||
strb r1, [r0]
|
||||
ldrb r0, [r3]
|
||||
bl sub_81310F0
|
||||
bl ClearBankMoveHistory
|
||||
mov r7, r9
|
||||
ldrb r0, [r7]
|
||||
bl sub_8131130
|
||||
bl ClearBankAbilityHistory
|
||||
add sp, 0x20
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@@ -10617,7 +10617,7 @@ _0803A852:
|
||||
strb r1, [r0, 0x16]
|
||||
ldrb r0, [r3]
|
||||
lsls r0, 1
|
||||
ldr r3, =gUnknown_02024248
|
||||
ldr r3, =gLastUsedMovesByBanks
|
||||
adds r0, r3
|
||||
movs r3, 0
|
||||
strh r2, [r0]
|
||||
@@ -10830,9 +10830,9 @@ _0803AB6C:
|
||||
adds r1, 0x22
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r6]
|
||||
bl sub_81310F0
|
||||
bl ClearBankMoveHistory
|
||||
ldrb r0, [r6]
|
||||
bl sub_8131130
|
||||
bl ClearBankAbilityHistory
|
||||
add sp, 0x4
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@@ -11183,7 +11183,7 @@ _0803AE96:
|
||||
movs r1, 0xB
|
||||
movs r2, 0
|
||||
bl GetMonData
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
strh r0, [r1, 0x20]
|
||||
_0803AEC0:
|
||||
ldr r0, =gBattleTypeFlags
|
||||
@@ -12544,7 +12544,7 @@ _0803BA40:
|
||||
b _0803BB78
|
||||
.pool
|
||||
_0803BA98:
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrb r0, [r1, 0x13]
|
||||
ldr r2, =gBattleStruct
|
||||
mov r8, r2
|
||||
@@ -15816,7 +15816,7 @@ _0803D7AE:
|
||||
movs r3, 0
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r1]
|
||||
ldr r0, =gUnknown_02024400
|
||||
ldr r0, =gDynamicBasePower
|
||||
movs r2, 0
|
||||
strh r3, [r0]
|
||||
ldr r0, =gBattleStruct
|
||||
@@ -15951,7 +15951,7 @@ _0803D920:
|
||||
ldr r1, =gBattlescriptCurrInstr
|
||||
ldr r0, =gUnknown_082DAA87
|
||||
str r0, [r1]
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
ldr r0, =0x000003fe
|
||||
cmp r1, r0
|
||||
@@ -15973,7 +15973,7 @@ _0803D968:
|
||||
ldr r0, =gUnknown_082DA92D
|
||||
str r0, [r1]
|
||||
ldr r2, =gTrainers
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
lsls r0, r1, 2
|
||||
adds r0, r1
|
||||
@@ -16308,7 +16308,7 @@ _0803DD10:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0803DDA0
|
||||
ldr r4, =gUnknown_03005D10
|
||||
ldr r4, =gBattleResults
|
||||
ldrh r0, [r4, 0x6]
|
||||
cmp r0, 0
|
||||
bne _0803DD74
|
||||
@@ -16374,7 +16374,7 @@ _0803DDB6:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0803DDD2
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrb r1, [r0, 0x5]
|
||||
movs r0, 0x40
|
||||
ands r0, r1
|
||||
@@ -16960,14 +16960,14 @@ _0803E33C:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0803E37C
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldr r1, =gCurrentMove
|
||||
ldrh r1, [r1]
|
||||
strh r1, [r0, 0x22]
|
||||
b _0803E384
|
||||
.pool
|
||||
_0803E37C:
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldr r1, =gCurrentMove
|
||||
ldrh r1, [r1]
|
||||
strh r1, [r0, 0x24]
|
||||
@@ -17548,7 +17548,7 @@ bs2_8016374: @ 803E868
|
||||
ldr r1, =gFightStateTracker
|
||||
movs r0, 0xA
|
||||
strb r0, [r1]
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrb r0, [r1, 0x2]
|
||||
cmp r0, 0xFE
|
||||
bhi _0803E8CE
|
||||
@@ -18354,7 +18354,7 @@ sub_803F050: @ 803F050
|
||||
adds r0, r2
|
||||
ldrb r0, [r0]
|
||||
strh r0, [r1]
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrb r0, [r1, 0x1F]
|
||||
cmp r0, 0xFE
|
||||
bhi _0803F096
|
||||
@@ -18657,7 +18657,7 @@ bsC_8016D70: @ 803F300
|
||||
strh r4, [r0]
|
||||
ldr r0, [r6]
|
||||
strb r1, [r0, 0x13]
|
||||
ldr r0, =gUnknown_02024400
|
||||
ldr r0, =gDynamicBasePower
|
||||
strh r4, [r0]
|
||||
strb r1, [r5, 0x14]
|
||||
ldr r0, =gBattleCommunication
|
||||
|
||||
+29
-29
@@ -12,7 +12,7 @@ sub_80A5C6C: @ 80A5C6C
|
||||
lsrs r5, r0, 24
|
||||
lsls r1, 24
|
||||
lsrs r4, r1, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5C8A
|
||||
@@ -70,7 +70,7 @@ _080A5CD8:
|
||||
b _080A5DB0
|
||||
.pool
|
||||
_080A5D00:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5D28
|
||||
@@ -168,7 +168,7 @@ sub_80A5DB8: @ 80A5DB8
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5DDA
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A5DDA
|
||||
@@ -176,7 +176,7 @@ sub_80A5DB8: @ 80A5DB8
|
||||
_080A5DDA:
|
||||
cmp r5, 0xC9
|
||||
bne _080A5E90
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A5E04
|
||||
@@ -399,7 +399,7 @@ sub_80A5FA0: @ 80A5FA0
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _080A5FFE
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A5FFE
|
||||
@@ -449,7 +449,7 @@ sub_80A600C: @ 80A600C
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A6030
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A603E
|
||||
@@ -527,7 +527,7 @@ sub_80A60AC: @ 80A60AC
|
||||
lsrs r1, 24
|
||||
cmp r1, 0x1
|
||||
bhi _080A6126
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A60E8
|
||||
@@ -645,7 +645,7 @@ sub_80A6190: @ 80A6190
|
||||
bl sub_80A5C6C
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A6238
|
||||
@@ -1868,7 +1868,7 @@ sub_80A6A90: @ 80A6A90
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r5, r4, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A6ABC
|
||||
@@ -1942,7 +1942,7 @@ battle_type_is_double: @ 80A6B20
|
||||
sub_80A6B30: @ 80A6B30
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@@ -1988,7 +1988,7 @@ sub_80A6B90: @ 80A6B90
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@@ -2046,7 +2046,7 @@ sub_80A6BFC: @ 80A6BFC
|
||||
ldr r0, =gUnknown_02023060
|
||||
ldr r0, [r0]
|
||||
str r0, [r4, 0x4]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0
|
||||
@@ -2222,7 +2222,7 @@ sub_80A6D60: @ 80A6D60
|
||||
adds r5, r2, 0
|
||||
ldrb r0, [r4, 0x9]
|
||||
bl sub_80A6D10
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -2244,7 +2244,7 @@ _080A6D86:
|
||||
thumb_func_start sub_80A6D94
|
||||
sub_80A6D94: @ 80A6D94
|
||||
push {lr}
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A6DA4
|
||||
@@ -2263,7 +2263,7 @@ sub_80A6DAC: @ 80A6DAC
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A6DBE
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A6DD4
|
||||
@@ -2883,7 +2883,7 @@ _080A71F0:
|
||||
thumb_func_start sub_80A7238
|
||||
sub_80A7238: @ 80A7238
|
||||
push {r4,lr}
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7268
|
||||
@@ -2929,7 +2929,7 @@ sub_80A7270: @ 80A7270
|
||||
ldrh r0, [r4, 0x2E]
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A72A6
|
||||
@@ -2968,7 +2968,7 @@ _080A72B4:
|
||||
movs r1, 0x80
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A7312
|
||||
@@ -3357,7 +3357,7 @@ sub_80A75AC: @ 80A75AC
|
||||
movs r4, 0
|
||||
cmp r0, 0
|
||||
beq _080A7602
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A75F6
|
||||
@@ -3432,7 +3432,7 @@ _080A7674:
|
||||
ldr r0, [sp]
|
||||
cmp r0, 0
|
||||
beq _080A769A
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A7694
|
||||
@@ -3449,7 +3449,7 @@ _080A769A:
|
||||
ldr r0, [sp, 0x4]
|
||||
cmp r0, 0
|
||||
beq _080A76B0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A76B0
|
||||
@@ -3483,7 +3483,7 @@ sub_80A76C4: @ 80A76C4
|
||||
lsrs r3, 24
|
||||
mov r8, r3
|
||||
movs r4, 0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A76F2
|
||||
@@ -4550,7 +4550,7 @@ _080A7F38:
|
||||
beq _080A7F42
|
||||
b _080A8034
|
||||
_080A7F42:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A7F78
|
||||
@@ -5014,7 +5014,7 @@ sub_80A82E4: @ 80A82E4
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8300
|
||||
@@ -5056,7 +5056,7 @@ sub_80A8328: @ 80A8328
|
||||
bl GetBankIdentity
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8344
|
||||
@@ -5088,7 +5088,7 @@ GetBankIdentity_permutated: @ 80A8364
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A838A
|
||||
@@ -5363,7 +5363,7 @@ _080A85B2:
|
||||
bl CreateSprite
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A85EE
|
||||
@@ -5412,7 +5412,7 @@ sub_80A861C: @ 80A861C
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
mov r9, r1
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A86C4
|
||||
@@ -5811,7 +5811,7 @@ _080A8946:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _080A8998
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080A8998
|
||||
|
||||
+3
-3
@@ -14768,7 +14768,7 @@ _080CED7E:
|
||||
ldrh r0, [r4]
|
||||
adds r1, r6
|
||||
ldr r1, [r1]
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r9, r0
|
||||
@@ -29290,7 +29290,7 @@ _080D6184:
|
||||
strh r0, [r5, 0x12]
|
||||
ldrh r0, [r6, 0x6]
|
||||
strh r0, [r5, 0x14]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
mov r8, r4
|
||||
cmp r0, 0
|
||||
@@ -29329,7 +29329,7 @@ _080D61DC:
|
||||
ldrsh r0, [r4, r3]
|
||||
cmp r0, 0
|
||||
beq _080D6208
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _080D6208
|
||||
|
||||
+3
-3
@@ -310,7 +310,7 @@ sub_8158D8C: @ 8158D8C
|
||||
bl sub_80A5178
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08158DD0
|
||||
@@ -435,7 +435,7 @@ sub_8158E9C: @ 8158E9C
|
||||
bl sub_80A5178
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08158EE0
|
||||
@@ -694,7 +694,7 @@ sub_81590B8: @ 81590B8
|
||||
bl sub_80A5178
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081590F8
|
||||
|
||||
+22
-22
@@ -237,7 +237,7 @@ sub_815A254: @ 815A254
|
||||
lsls r1, 23
|
||||
adds r0, r1
|
||||
lsrs r4, r0, 16
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815A2B2
|
||||
@@ -915,7 +915,7 @@ sub_815A7EC: @ 815A7EC
|
||||
ldrsh r1, [r5, r2]
|
||||
adds r0, r4, 0
|
||||
bl sub_80A6864
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815A840
|
||||
@@ -1409,7 +1409,7 @@ sub_815ABEC: @ 815ABEC
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815AC40
|
||||
@@ -1476,7 +1476,7 @@ sub_815AC8C: @ 815AC8C
|
||||
strh r1, [r0]
|
||||
ldr r0, =gUnknown_02022E2A
|
||||
strh r1, [r0]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815ACB8
|
||||
@@ -3010,7 +3010,7 @@ _0815B8A8:
|
||||
ldrb r1, [r5]
|
||||
mov r0, sp
|
||||
bl sub_80A6BFC
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
mov r9, r4
|
||||
cmp r0, 0
|
||||
@@ -3047,7 +3047,7 @@ _0815B8EA:
|
||||
ldrh r3, [r0, 0xA]
|
||||
movs r0, 0x1
|
||||
bl LoadBgTiles
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815BA1C
|
||||
@@ -3228,7 +3228,7 @@ _0815BAAC:
|
||||
movs r2, 0
|
||||
bl lcd_bg_operations
|
||||
_0815BAB6:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815BAF6
|
||||
@@ -3366,7 +3366,7 @@ _0815BBC8:
|
||||
movs r1, 0x4
|
||||
movs r2, 0x1
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815BC02
|
||||
@@ -3381,7 +3381,7 @@ _0815BC02:
|
||||
mov r0, sp
|
||||
movs r2, 0
|
||||
bl sub_80A6D60
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815BC34
|
||||
@@ -3564,7 +3564,7 @@ _0815BDA6:
|
||||
mov r0, sp
|
||||
ldrb r0, [r0, 0x9]
|
||||
bl sub_80A6C68
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815BDC8
|
||||
@@ -3971,7 +3971,7 @@ _0815C0EC:
|
||||
movs r1, 0x4
|
||||
movs r2, 0x1
|
||||
bl lcd_bg_operations
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815C124
|
||||
@@ -3986,7 +3986,7 @@ _0815C124:
|
||||
mov r0, sp
|
||||
movs r2, 0
|
||||
bl sub_80A6D60
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815C15C
|
||||
@@ -4222,7 +4222,7 @@ _0815C34A:
|
||||
mov r0, sp
|
||||
ldrb r0, [r0, 0x9]
|
||||
bl sub_80A6C68
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815C36C
|
||||
@@ -5167,7 +5167,7 @@ _0815CAD2:
|
||||
bl obj_id_set_rotscale
|
||||
adds r0, r5, 0
|
||||
bl sub_80A7E6C
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815CAF8
|
||||
@@ -5675,7 +5675,7 @@ sub_815CED8: @ 815CED8
|
||||
str r0, [sp, 0x18]
|
||||
movs r0, 0
|
||||
bl GetAnimBankSpriteId
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815CF18
|
||||
@@ -7903,7 +7903,7 @@ sub_815E114: @ 815E114
|
||||
lsls r1, 3
|
||||
ldr r0, =gTasks
|
||||
adds r6, r1, r0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@@ -9330,7 +9330,7 @@ sub_815EC48: @ 815EC48
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x26]
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815ECD0
|
||||
@@ -10003,7 +10003,7 @@ sub_815F18C: @ 815F18C
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815F1B8
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815F1D0
|
||||
@@ -10130,7 +10130,7 @@ _0815F2AC:
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl refresh_graphics_maybe
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815F2EE
|
||||
@@ -10560,7 +10560,7 @@ sub_815F620: @ 815F620
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
cmp r7, 0
|
||||
@@ -11024,7 +11024,7 @@ _0815F9DE:
|
||||
b _0815FE68
|
||||
.pool
|
||||
_0815F9F4:
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0815FA28
|
||||
@@ -11590,7 +11590,7 @@ _0815FE92:
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _0815FFBC
|
||||
bl sub_80A4DF0
|
||||
bl IsContest
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0815FFBC
|
||||
|
||||
+23
-23
@@ -93,7 +93,7 @@ _0816200E:
|
||||
negs r3, r3
|
||||
movs r0, 0
|
||||
bl saved_warp2_set
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
strh r7, [r0]
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -264,7 +264,7 @@ _081621B4:
|
||||
thumb_func_start sub_81621C0
|
||||
sub_81621C0: @ 81621C0
|
||||
push {r4,r5,lr}
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0xFA
|
||||
lsls r0, 1
|
||||
@@ -500,7 +500,7 @@ _0816239C:
|
||||
b _081623DA
|
||||
.pool
|
||||
_081623C0:
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
@@ -559,14 +559,14 @@ _08162414:
|
||||
ldr r2, =0x00000cb2
|
||||
adds r0, r1, r2
|
||||
ldrh r3, [r0]
|
||||
ldr r2, =gUnknown_02038BCA
|
||||
ldr r2, =gTrainerBattleOpponent_A
|
||||
lsls r0, r3, 2
|
||||
ldr r4, =0x00000cb4
|
||||
adds r1, r4
|
||||
adds r0, r1, r0
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r2]
|
||||
ldr r4, =gUnknown_02038BCC
|
||||
ldr r4, =gTrainerBattleOpponent_B
|
||||
lsls r0, r3, 1
|
||||
adds r0, 0x1
|
||||
lsls r0, 1
|
||||
@@ -586,7 +586,7 @@ _08162488:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081624B4
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_8162614
|
||||
@@ -643,7 +643,7 @@ _081624FC:
|
||||
ldrh r0, [r0]
|
||||
cmp r4, r0
|
||||
bne _081624BA
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
strh r3, [r4]
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0
|
||||
@@ -1954,7 +1954,7 @@ sub_8163048: @ 8163048
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl ZeroEnemyPartyMons
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
@@ -1972,12 +1972,12 @@ sub_816306C: @ 816306C
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl ZeroEnemyPartyMons
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
bl sub_81630C4
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x3
|
||||
adds r2, r4, 0
|
||||
@@ -1995,7 +1995,7 @@ sub_81630A0: @ 81630A0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl ZeroEnemyPartyMons
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
@@ -2037,7 +2037,7 @@ sub_81630C4: @ 81630C4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x24]
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r2, [r0]
|
||||
ldr r0, =gUnknown_0203BC88
|
||||
ldr r1, [r0]
|
||||
@@ -2613,14 +2613,14 @@ sub_8163590: @ 8163590
|
||||
ands r0, r1
|
||||
cmp r0, 0x2
|
||||
beq _081635C0
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_81635D4
|
||||
b _081635CA
|
||||
.pool
|
||||
_081635C0:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_816379C
|
||||
@@ -3034,11 +3034,11 @@ sub_8163914: @ 8163914
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _08163930
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
b _08163932
|
||||
.pool
|
||||
_08163930:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
_08163932:
|
||||
ldrh r3, [r0]
|
||||
movs r0, 0xFA
|
||||
@@ -3362,7 +3362,7 @@ _08163C18:
|
||||
ldr r1, =gBattleTypeFlags
|
||||
ldr r0, =0x00000808
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
movs r0, 0
|
||||
strh r0, [r1]
|
||||
ldr r0, =sub_8163A8C
|
||||
@@ -3387,7 +3387,7 @@ _08163C70:
|
||||
orrs r0, r1
|
||||
str r0, [r4]
|
||||
_08163C8A:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
ldr r0, =0x000003fe
|
||||
cmp r1, r0
|
||||
@@ -5240,14 +5240,14 @@ _08164D14:
|
||||
ldr r1, =gUnknown_020223C4
|
||||
movs r2, 0x28
|
||||
bl memcpy
|
||||
ldr r2, =gUnknown_02038BCA
|
||||
ldr r2, =gTrainerBattleOpponent_A
|
||||
ldr r1, [r4]
|
||||
lsls r0, r6, 2
|
||||
adds r1, r5
|
||||
adds r0, r1, r0
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r2]
|
||||
ldr r4, =gUnknown_02038BCC
|
||||
ldr r4, =gTrainerBattleOpponent_B
|
||||
lsls r0, r6, 1
|
||||
adds r0, 0x1
|
||||
lsls r0, 1
|
||||
@@ -5337,7 +5337,7 @@ sub_8164E04: @ 8164E04
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _08164E9A
|
||||
ldr r5, =gUnknown_02038BCA
|
||||
ldr r5, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r5]
|
||||
mov r0, sp
|
||||
bl sub_8162E20
|
||||
@@ -7344,7 +7344,7 @@ _08165E58:
|
||||
ldrh r0, [r0]
|
||||
cmp r3, r0
|
||||
bne _08165E1C
|
||||
ldr r5, =gUnknown_02038BCA
|
||||
ldr r5, =gTrainerBattleOpponent_A
|
||||
strh r4, [r5]
|
||||
ldrh r0, [r5]
|
||||
movs r1, 0
|
||||
@@ -7388,7 +7388,7 @@ sub_8165EA4: @ 8165EA4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x20]
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r2, [r0]
|
||||
ldr r0, =gUnknown_0203BC88
|
||||
ldr r1, [r0]
|
||||
|
||||
+2
-2
@@ -4411,7 +4411,7 @@ _0817EFC2:
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0817F0B4
|
||||
ldr r4, =gUnknown_0202428E
|
||||
ldr r4, =gSideAffecting
|
||||
mov r1, r9
|
||||
ldrb r0, [r1]
|
||||
bl GetBankIdentity
|
||||
@@ -4493,7 +4493,7 @@ _0817F08C:
|
||||
ldrb r1, [r6]
|
||||
mov r3, r9
|
||||
ldrb r2, [r3]
|
||||
bl move_effectiveness_something
|
||||
bl TypeCalc
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
ldr r0, =gBattleMoveDamage
|
||||
|
||||
+39
-39
@@ -3283,7 +3283,7 @@ _0818EA3E:
|
||||
negs r3, r3
|
||||
movs r0, 0
|
||||
bl saved_warp2_set
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
strh r6, [r0]
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -5026,7 +5026,7 @@ sub_818F9E0: @ 818F9E0
|
||||
ldr r1, [r1]
|
||||
bl StringCopy
|
||||
ldr r0, =gStringVar2
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r1]
|
||||
bl sub_8195898
|
||||
pop {r0}
|
||||
@@ -5056,7 +5056,7 @@ sub_818FA20: @ 818FA20
|
||||
adds r1, r0
|
||||
str r1, [r5]
|
||||
bl calc_player_party_count
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
bl sub_8195358
|
||||
lsls r0, 16
|
||||
@@ -6135,7 +6135,7 @@ _08190292:
|
||||
sub_8190298: @ 8190298
|
||||
push {lr}
|
||||
bl sub_81902AC
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
strh r0, [r1]
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -6168,7 +6168,7 @@ sub_81902AC: @ 81902AC
|
||||
thumb_func_start sub_81902E4
|
||||
sub_81902E4: @ 81902E4
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_8162614
|
||||
@@ -12958,7 +12958,7 @@ sub_8193D7C: @ 8193D7C
|
||||
ldrh r0, [r7]
|
||||
cmp r0, 0x1
|
||||
bne _08193E10
|
||||
ldr r5, =gUnknown_02038BCA
|
||||
ldr r5, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r5]
|
||||
bl sub_8195358
|
||||
ldr r4, =gSaveBlock2Ptr
|
||||
@@ -12998,7 +12998,7 @@ sub_8193D7C: @ 8193D7C
|
||||
lsls r3, 4
|
||||
adds r1, r2, r3
|
||||
adds r1, r0
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrh r0, [r0, 0x22]
|
||||
strh r0, [r1]
|
||||
add r2, r8
|
||||
@@ -13050,7 +13050,7 @@ _08193E10:
|
||||
lsls r3, 4
|
||||
adds r1, r3
|
||||
adds r1, r0
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrh r0, [r0, 0x24]
|
||||
strh r0, [r1]
|
||||
ldr r0, =gBattleOutcome
|
||||
@@ -14893,7 +14893,7 @@ sub_8194EB4: @ 8194EB4
|
||||
thumb_func_start sub_8194EC0
|
||||
sub_8194EC0: @ 8194EC0
|
||||
push {r4,lr}
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
bl sub_8195358
|
||||
adds r4, r0, 0
|
||||
@@ -16287,7 +16287,7 @@ _081959F2:
|
||||
negs r3, r3
|
||||
movs r0, 0
|
||||
bl saved_warp2_set
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
strh r6, [r0]
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@@ -16510,7 +16510,7 @@ _08195C16:
|
||||
thumb_func_start sub_8195C20
|
||||
sub_8195C20: @ 8195C20
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
@@ -16534,7 +16534,7 @@ sub_8195C20: @ 8195C20
|
||||
thumb_func_start sub_8195C50
|
||||
sub_8195C50: @ 8195C50
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r3]
|
||||
ldr r0, =0x0000012b
|
||||
cmp r1, r0
|
||||
@@ -43617,7 +43617,7 @@ _081A3AD8:
|
||||
thumb_func_start sub_81A3B00
|
||||
sub_81A3B00: @ 81A3B00
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
ldr r0, =0x000003fe
|
||||
cmp r1, r0
|
||||
@@ -43789,7 +43789,7 @@ _081A3C84:
|
||||
adds r1, r0
|
||||
adds r7, r1, r2
|
||||
ldrb r5, [r7]
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
mov r9, r0
|
||||
ldrh r0, [r0]
|
||||
ldr r1, =0x000003fe
|
||||
@@ -44664,14 +44664,14 @@ sub_81A443C: @ 81A443C
|
||||
.pool
|
||||
_081A4450:
|
||||
ldr r0, =gStringVar1
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r1]
|
||||
bl sub_8162E20
|
||||
b _081A446E
|
||||
.pool
|
||||
_081A4464:
|
||||
ldr r0, =gStringVar2
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r1]
|
||||
bl sub_8162E20
|
||||
_081A446E:
|
||||
@@ -46098,7 +46098,7 @@ sub_81A4FF0: @ 81A4FF0
|
||||
sub_81A5030: @ 81A5030
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
ldr r2, =gUnknown_02038BCA
|
||||
ldr r2, =gTrainerBattleOpponent_A
|
||||
ldr r3, =0x000003fe
|
||||
adds r1, r3, 0
|
||||
strh r1, [r2]
|
||||
@@ -47142,7 +47142,7 @@ _081A5930:
|
||||
negs r3, r3
|
||||
movs r0, 0
|
||||
bl saved_warp2_set
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
movs r0, 0
|
||||
strh r0, [r1]
|
||||
pop {r4-r6}
|
||||
@@ -47436,7 +47436,7 @@ _081A5BD6:
|
||||
sub_81A5BE0: @ 81A5BE0
|
||||
push {lr}
|
||||
ldr r0, =gStringVar1
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r1]
|
||||
bl sub_8162E20
|
||||
pop {r0}
|
||||
@@ -47855,7 +47855,7 @@ _081A5F40:
|
||||
negs r3, r3
|
||||
movs r0, 0
|
||||
bl saved_warp2_set
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
movs r0, 0
|
||||
strh r0, [r1]
|
||||
pop {r4-r7}
|
||||
@@ -48185,7 +48185,7 @@ _081A6244:
|
||||
ldrh r0, [r0]
|
||||
cmp r7, r0
|
||||
bne _081A61FA
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
strh r3, [r0]
|
||||
ldr r2, [r6]
|
||||
adds r1, r2, r1
|
||||
@@ -48353,7 +48353,7 @@ _081A636E:
|
||||
thumb_func_start sub_81A63B8
|
||||
sub_81A63B8: @ 81A63B8
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_8162614
|
||||
@@ -49829,8 +49829,8 @@ _081A6FA8:
|
||||
.pool
|
||||
thumb_func_end sub_81A6F70
|
||||
|
||||
thumb_func_start sub_81A6FB4
|
||||
sub_81A6FB4: @ 81A6FB4
|
||||
thumb_func_start GetAiScriptsInBattleFactory
|
||||
GetAiScriptsInBattleFactory: @ 81A6FB4
|
||||
push {r4,r5,lr}
|
||||
ldr r5, =gSaveBlock2Ptr
|
||||
ldr r0, [r5]
|
||||
@@ -49856,7 +49856,7 @@ sub_81A6FB4: @ 81A6FB4
|
||||
bl __udivsi3
|
||||
lsls r0, 16
|
||||
lsrs r2, r0, 16
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
ldr r0, =0x000003fe
|
||||
cmp r1, r0
|
||||
@@ -49879,7 +49879,7 @@ _081A701E:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_81A6FB4
|
||||
thumb_func_end GetAiScriptsInBattleFactory
|
||||
|
||||
thumb_func_start sub_81A7024
|
||||
sub_81A7024: @ 81A7024
|
||||
@@ -52256,7 +52256,7 @@ _081A831A:
|
||||
subs r0, 0x1
|
||||
cmp r3, r0
|
||||
bne _081A82D2
|
||||
ldr r5, =gUnknown_02038BCA
|
||||
ldr r5, =gTrainerBattleOpponent_A
|
||||
strh r4, [r5]
|
||||
ldr r1, =gUnknown_0203BC88
|
||||
ldr r0, =gBattleFrontierTrainers
|
||||
@@ -52344,7 +52344,7 @@ _081A83EE:
|
||||
subs r0, 0x1
|
||||
cmp r3, r0
|
||||
bne _081A83A0
|
||||
ldr r5, =gUnknown_02038BCA
|
||||
ldr r5, =gTrainerBattleOpponent_A
|
||||
strh r4, [r5]
|
||||
ldrh r0, [r5]
|
||||
movs r1, 0
|
||||
@@ -52405,7 +52405,7 @@ _081A8466:
|
||||
ldrh r0, [r0]
|
||||
cmp r3, r0
|
||||
bne _081A8426
|
||||
ldr r5, =gUnknown_02038BCC
|
||||
ldr r5, =gTrainerBattleOpponent_B
|
||||
strh r4, [r5]
|
||||
ldrh r0, [r5]
|
||||
movs r1, 0x1
|
||||
@@ -52465,7 +52465,7 @@ sub_81A84EC: @ 81A84EC
|
||||
ldrh r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _081A8524
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r3]
|
||||
ldr r0, =0x0000012b
|
||||
cmp r1, r0
|
||||
@@ -52482,7 +52482,7 @@ sub_81A84EC: @ 81A84EC
|
||||
_081A8524:
|
||||
cmp r0, 0x1
|
||||
bne _081A8542
|
||||
ldr r3, =gUnknown_02038BCC
|
||||
ldr r3, =gTrainerBattleOpponent_B
|
||||
ldrh r1, [r3]
|
||||
ldr r0, =0x0000012b
|
||||
cmp r1, r0
|
||||
@@ -52896,7 +52896,7 @@ sub_81A8830: @ 81A8830
|
||||
adds r0, r1
|
||||
strh r4, [r0]
|
||||
_081A887C:
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
strh r4, [r0]
|
||||
ldr r1, =gBattleOutcome
|
||||
movs r0, 0
|
||||
@@ -53742,7 +53742,7 @@ _081A8EFC:
|
||||
bl sub_81AAA7C
|
||||
_081A8F14:
|
||||
bl sub_81C4EEC
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
movs r1, 0
|
||||
strh r1, [r0]
|
||||
ldr r0, =gBattleOutcome
|
||||
@@ -55146,7 +55146,7 @@ GetBattlePyramidTrainerFlag: @ 81A9AC4
|
||||
thumb_func_start sub_81A9B04
|
||||
sub_81A9B04: @ 81A9B04
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
bl sub_81A9B44
|
||||
ldr r0, =gBattleTypeFlags
|
||||
@@ -55160,7 +55160,7 @@ sub_81A9B04: @ 81A9B04
|
||||
bl sub_80B47E0
|
||||
ldr r1, =gUnknown_03005DF0
|
||||
strb r0, [r1]
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
bl sub_81A9B44
|
||||
_081A9B2E:
|
||||
@@ -85360,7 +85360,7 @@ sub_81B9A44: @ 81B9A44
|
||||
thumb_func_start sub_81B9A60
|
||||
sub_81B9A60: @ 81B9A60
|
||||
push {r4,lr}
|
||||
ldr r4, =gUnknown_02038BCA
|
||||
ldr r4, =gTrainerBattleOpponent_A
|
||||
bl Random
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
@@ -85384,7 +85384,7 @@ sub_81B9A60: @ 81B9A60
|
||||
thumb_func_start sub_81B9A90
|
||||
sub_81B9A90: @ 81B9A90
|
||||
push {lr}
|
||||
ldr r3, =gUnknown_02038BCA
|
||||
ldr r3, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r3]
|
||||
ldr r0, =0x0000012b
|
||||
cmp r1, r0
|
||||
@@ -85652,7 +85652,7 @@ _081B9CE6:
|
||||
sub_81B9CF0: @ 81B9CF0
|
||||
push {lr}
|
||||
ldr r0, =gStringVar1
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r1]
|
||||
bl sub_8162E20
|
||||
pop {r0}
|
||||
@@ -86114,7 +86114,7 @@ _081BA0AA:
|
||||
ldrh r0, [r0]
|
||||
cmp r5, r0
|
||||
bne _081BA066
|
||||
ldr r2, =gUnknown_02038BCA
|
||||
ldr r2, =gTrainerBattleOpponent_A
|
||||
strh r3, [r2]
|
||||
ldrh r3, [r2]
|
||||
ldr r4, =gUnknown_0203BC88
|
||||
|
||||
+5
-5
@@ -46461,7 +46461,7 @@ sub_81D61E8: @ 81D61E8
|
||||
lsls r0, 25
|
||||
lsrs r4, r0, 24
|
||||
movs r3, 0
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
mov r8, r0
|
||||
ldr r6, =gSaveBlock2Ptr
|
||||
ldr r1, =gBitTable
|
||||
@@ -46505,7 +46505,7 @@ _081D624A:
|
||||
cmp r0, 0
|
||||
beq _081D62A2
|
||||
movs r3, 0
|
||||
ldr r5, =gUnknown_02038BCC
|
||||
ldr r5, =gTrainerBattleOpponent_B
|
||||
ldr r0, =gBitTable
|
||||
mov r8, r0
|
||||
_081D6260:
|
||||
@@ -46656,7 +46656,7 @@ _081D636A:
|
||||
sub_81D6384: @ 81D6384
|
||||
push {lr}
|
||||
bl ZeroEnemyPartyMons
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_81D62CC
|
||||
@@ -46669,11 +46669,11 @@ sub_81D6384: @ 81D6384
|
||||
sub_81D639C: @ 81D639C
|
||||
push {lr}
|
||||
bl ZeroEnemyPartyMons
|
||||
ldr r0, =gUnknown_02038BCA
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_81D62CC
|
||||
ldr r0, =gUnknown_02038BCC
|
||||
ldr r0, =gTrainerBattleOpponent_B
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x3
|
||||
bl sub_81D62CC
|
||||
|
||||
+1
-1
@@ -125,7 +125,7 @@ sub_80FC180: @ 80FC180
|
||||
sub_80FC190: @ 80FC190
|
||||
push {lr}
|
||||
ldr r1, =gUnknown_0203A051
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
ldrb r0, [r0, 0x1F]
|
||||
ldrb r2, [r1]
|
||||
adds r0, r2
|
||||
|
||||
+1
-1
@@ -2894,7 +2894,7 @@ sub_80EA2E4: @ 80EA2E4
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl sub_813BADC
|
||||
ldr r1, =gUnknown_02038BCA
|
||||
ldr r1, =gTrainerBattleOpponent_A
|
||||
movs r2, 0x80
|
||||
lsls r2, 3
|
||||
adds r0, r2, 0
|
||||
|
||||
@@ -542,7 +542,7 @@ GabbyAndTyBeforeInterview: @ 80EC31C
|
||||
push {r4,lr}
|
||||
ldr r3, =gSaveBlock1Ptr
|
||||
ldr r2, [r3]
|
||||
ldr r0, =gUnknown_03005D10
|
||||
ldr r0, =gBattleResults
|
||||
mov r12, r0
|
||||
ldrh r1, [r0, 0x6]
|
||||
ldr r4, =0x00002ba4
|
||||
@@ -1032,7 +1032,7 @@ sub_80EC728: @ 80EC728
|
||||
movs r4, 0
|
||||
bl sub_80EED88
|
||||
bl sub_80ED718
|
||||
ldr r5, =gUnknown_03005D10
|
||||
ldr r5, =gBattleResults
|
||||
ldrh r0, [r5, 0x28]
|
||||
cmp r0, 0
|
||||
bne _080EC74C
|
||||
@@ -1216,7 +1216,7 @@ _080EC8CA:
|
||||
ldrh r0, [r4, 0x2]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x2]
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrh r0, [r1, 0x28]
|
||||
strh r0, [r4, 0x4]
|
||||
ldrh r0, [r1, 0x6]
|
||||
@@ -1300,7 +1300,7 @@ _080EC940:
|
||||
movs r0, 0x17
|
||||
strb r0, [r4]
|
||||
strb r1, [r4, 0x1]
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrh r0, [r1, 0x6]
|
||||
strh r0, [r4, 0xC]
|
||||
ldrh r0, [r1, 0x20]
|
||||
@@ -4048,7 +4048,7 @@ _080EE1B6:
|
||||
strb r0, [r4]
|
||||
strb r1, [r4, 0x1]
|
||||
movs r5, 0
|
||||
ldr r6, =gUnknown_03005D10
|
||||
ldr r6, =gBattleResults
|
||||
ldr r3, =gUnknown_02037318
|
||||
ldr r7, =gSaveBlock2Ptr
|
||||
adds r2, r6, 0
|
||||
@@ -4122,7 +4122,7 @@ _080EE27E:
|
||||
_080EE280:
|
||||
strb r0, [r4, 0x5]
|
||||
_080EE282:
|
||||
ldr r1, =gUnknown_03005D10
|
||||
ldr r1, =gBattleResults
|
||||
ldrh r0, [r1, 0x20]
|
||||
strh r0, [r4, 0x2]
|
||||
ldrb r0, [r4, 0x5]
|
||||
|
||||
@@ -835,7 +835,7 @@ _080B4E98:
|
||||
bl GetMonData
|
||||
adds r1, r0, 0
|
||||
adds r0, r4, 0
|
||||
bl pokemon_species_get_gender_info
|
||||
bl GetGenderFromSpeciesAndPersonality
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r4, 0xFE
|
||||
|
||||
Reference in New Issue
Block a user