decompile battle_ai_script_commands.c

This commit is contained in:
ProjectRevoTPP
2018-10-03 21:30:13 -04:00
parent 4880b33ff2
commit 621cfbebee
86 changed files with 12681 additions and 16148 deletions
+36 -36
View File
@@ -246,7 +246,7 @@ sub_800F380: @ 800F380
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x4 movs r2, 0x4
bl CpuSet bl CpuSet
ldr r0, _0800F404 @ =gUnknown_2022B4C ldr r0, _0800F404 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ldr r1, _0800F408 @ =0x00010010 ldr r1, _0800F408 @ =0x00010010
ands r0, r1 ands r0, r1
@@ -276,7 +276,7 @@ _0800F3F4: .4byte 0x00002529
_0800F3F8: .4byte 0x00007fff _0800F3F8: .4byte 0x00007fff
_0800F3FC: .4byte 0x0000675a _0800F3FC: .4byte 0x0000675a
_0800F400: .4byte gUnknown_20376B0 _0800F400: .4byte gUnknown_20376B0
_0800F404: .4byte gUnknown_2022B4C _0800F404: .4byte gBattleTypeFlags
_0800F408: .4byte 0x00010010 _0800F408: .4byte 0x00010010
thumb_func_end sub_800F380 thumb_func_end sub_800F380
@@ -342,7 +342,7 @@ sub_800F460: @ 800F460
lsrs r4, 24 lsrs r4, 24
mov r9, r4 mov r9, r4
movs r4, 0 movs r4, 0
ldr r0, _0800F4B8 @ =gUnknown_2022B4C ldr r0, _0800F4B8 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -365,7 +365,7 @@ sub_800F460: @ 800F460
beq _0800F4CA beq _0800F4CA
b _0800F504 b _0800F504
.align 2, 0 .align 2, 0
_0800F4B8: .4byte gUnknown_2022B4C _0800F4B8: .4byte gBattleTypeFlags
_0800F4BC: .4byte gUnknown_3005090 _0800F4BC: .4byte gUnknown_3005090
_0800F4C0: _0800F4C0:
cmp r5, 0x2 cmp r5, 0x2
@@ -447,7 +447,7 @@ _0800F50E:
.align 2, 0 .align 2, 0
_0800F544: .4byte 0x00006001 _0800F544: .4byte 0x00006001
_0800F548: _0800F548:
ldr r0, _0800F564 @ =gUnknown_2023FE8 ldr r0, _0800F564 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB5 adds r0, 0xB5
ldrb r0, [r0] ldrb r0, [r0]
@@ -461,7 +461,7 @@ _0800F548:
ldrh r4, [r0, 0xE] ldrh r4, [r0, 0xE]
b _0800F578 b _0800F578
.align 2, 0 .align 2, 0
_0800F564: .4byte gUnknown_2023FE8 _0800F564: .4byte gBattleStruct
_0800F568: .4byte gUnknown_3005090 _0800F568: .4byte gUnknown_3005090
_0800F56C: _0800F56C:
ldr r1, _0800F5C4 @ =gUnknown_3005090 ldr r1, _0800F5C4 @ =gUnknown_3005090
@@ -529,7 +529,7 @@ sub_800F5CC: @ 800F5CC
_0800F5E0: .4byte gUnknown_2023E8A _0800F5E0: .4byte gUnknown_2023E8A
_0800F5E4: .4byte gUnknown_83FE883 _0800F5E4: .4byte gUnknown_83FE883
_0800F5E8: _0800F5E8:
ldr r0, _0800F61C @ =gUnknown_2022B4C ldr r0, _0800F61C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -538,7 +538,7 @@ _0800F5E8:
cmp r2, 0x1 cmp r2, 0x1
bne _0800F632 bne _0800F632
ldr r2, _0800F620 @ =gUnknown_202273C ldr r2, _0800F620 @ =gUnknown_202273C
ldr r0, _0800F624 @ =gUnknown_2023FE8 ldr r0, _0800F624 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB5 adds r0, 0xB5
ldrb r1, [r0] ldrb r1, [r0]
@@ -555,9 +555,9 @@ _0800F5E8:
beq _0800F6BC beq _0800F6BC
b _0800F6F0 b _0800F6F0
.align 2, 0 .align 2, 0
_0800F61C: .4byte gUnknown_2022B4C _0800F61C: .4byte gBattleTypeFlags
_0800F620: .4byte gUnknown_202273C _0800F620: .4byte gUnknown_202273C
_0800F624: .4byte gUnknown_2023FE8 _0800F624: .4byte gBattleStruct
_0800F628: _0800F628:
cmp r0, 0x2 cmp r0, 0x2
beq _0800F6BC beq _0800F6BC
@@ -566,7 +566,7 @@ _0800F628:
b _0800F682 b _0800F682
_0800F632: _0800F632:
ldr r2, _0800F654 @ =gUnknown_202273C ldr r2, _0800F654 @ =gUnknown_202273C
ldr r0, _0800F658 @ =gUnknown_2023FE8 ldr r0, _0800F658 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB5 adds r0, 0xB5
ldrb r1, [r0] ldrb r1, [r0]
@@ -584,7 +584,7 @@ _0800F632:
b _0800F6F0 b _0800F6F0
.align 2, 0 .align 2, 0
_0800F654: .4byte gUnknown_202273C _0800F654: .4byte gUnknown_202273C
_0800F658: .4byte gUnknown_2023FE8 _0800F658: .4byte gBattleStruct
_0800F65C: _0800F65C:
cmp r0, 0x2 cmp r0, 0x2
beq _0800F682 beq _0800F682
@@ -595,7 +595,7 @@ _0800F666:
cmp r2, 0x1 cmp r2, 0x1
bne _0800F6A4 bne _0800F6A4
ldr r2, _0800F694 @ =gUnknown_202273C ldr r2, _0800F694 @ =gUnknown_202273C
ldr r0, _0800F698 @ =gUnknown_2023FE8 ldr r0, _0800F698 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB5 adds r0, 0xB5
ldrb r1, [r0] ldrb r1, [r0]
@@ -616,12 +616,12 @@ _0800F682:
b _0800F6F0 b _0800F6F0
.align 2, 0 .align 2, 0
_0800F694: .4byte gUnknown_202273C _0800F694: .4byte gUnknown_202273C
_0800F698: .4byte gUnknown_2023FE8 _0800F698: .4byte gBattleStruct
_0800F69C: .4byte gUnknown_83FE874 _0800F69C: .4byte gUnknown_83FE874
_0800F6A0: .4byte gUnknown_83FE87B _0800F6A0: .4byte gUnknown_83FE87B
_0800F6A4: _0800F6A4:
ldr r2, _0800F6D0 @ =gUnknown_202273C ldr r2, _0800F6D0 @ =gUnknown_202273C
ldr r0, _0800F6D4 @ =gUnknown_2023FE8 ldr r0, _0800F6D4 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB5 adds r0, 0xB5
ldrb r1, [r0] ldrb r1, [r0]
@@ -642,7 +642,7 @@ _0800F6BC:
b _0800F6F0 b _0800F6F0
.align 2, 0 .align 2, 0
_0800F6D0: .4byte gUnknown_202273C _0800F6D0: .4byte gUnknown_202273C
_0800F6D4: .4byte gUnknown_2023FE8 _0800F6D4: .4byte gBattleStruct
_0800F6D8: .4byte gUnknown_83FE874 _0800F6D8: .4byte gUnknown_83FE874
_0800F6DC: .4byte gUnknown_83FE87B _0800F6DC: .4byte gUnknown_83FE87B
_0800F6E0: _0800F6E0:
@@ -694,7 +694,7 @@ _0800F72C:
_0800F732: _0800F732:
b _0800FAC4 b _0800FAC4
_0800F734: _0800F734:
ldr r0, _0800F75C @ =gUnknown_2022B4C ldr r0, _0800F75C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -716,7 +716,7 @@ _0800F744:
beq _0800F76E beq _0800F76E
b _0800F7C2 b _0800F7C2
.align 2, 0 .align 2, 0
_0800F75C: .4byte gUnknown_2022B4C _0800F75C: .4byte gBattleTypeFlags
_0800F760: .4byte gUnknown_2022744 _0800F760: .4byte gUnknown_2022744
_0800F764: _0800F764:
cmp r0, 0x2 cmp r0, 0x2
@@ -773,7 +773,7 @@ _0800F7C2:
bge _0800F744 bge _0800F744
b _0800F830 b _0800F830
_0800F7CC: _0800F7CC:
ldr r0, _0800F844 @ =gUnknown_2023FE8 ldr r0, _0800F844 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xB5 adds r0, 0xB5
ldrb r5, [r0] ldrb r5, [r0]
@@ -831,7 +831,7 @@ _0800F830:
strh r0, [r1, 0x8] strh r0, [r1, 0x8]
b _0800FAC4 b _0800FAC4
.align 2, 0 .align 2, 0
_0800F844: .4byte gUnknown_2023FE8 _0800F844: .4byte gBattleStruct
_0800F848: .4byte gUnknown_202273C _0800F848: .4byte gUnknown_202273C
_0800F84C: .4byte gUnknown_3005090 _0800F84C: .4byte gUnknown_3005090
_0800F850: _0800F850:
@@ -853,7 +853,7 @@ _0800F850:
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
bl CreateSprite bl CreateSprite
ldr r4, _0800F8E4 @ =gUnknown_2023FE8 ldr r4, _0800F8E4 @ =gBattleStruct
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x7D adds r1, 0x7D
strb r0, [r1] strb r0, [r1]
@@ -900,7 +900,7 @@ _0800F8D4: .4byte 0x0000021e
_0800F8D8: .4byte gUnknown_20375F8 _0800F8D8: .4byte gUnknown_20375F8
_0800F8DC: .4byte 0x00007fff _0800F8DC: .4byte 0x00007fff
_0800F8E0: .4byte gUnknown_82482E8 _0800F8E0: .4byte gUnknown_82482E8
_0800F8E4: .4byte gUnknown_2023FE8 _0800F8E4: .4byte gBattleStruct
_0800F8E8: .4byte gUnknown_8248300 _0800F8E8: .4byte gUnknown_8248300
_0800F8EC: .4byte gSprites _0800F8EC: .4byte gSprites
_0800F8F0: _0800F8F0:
@@ -1042,7 +1042,7 @@ _0800FA08:
adds r0, r7, 0 adds r0, r7, 0
bl DestroyTask bl DestroyTask
ldr r4, _0800FAD0 @ =gSprites ldr r4, _0800FAD0 @ =gSprites
ldr r5, _0800FAD4 @ =gUnknown_2023FE8 ldr r5, _0800FAD4 @ =gBattleStruct
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x7D adds r0, 0x7D
ldrb r0, [r0] ldrb r0, [r0]
@@ -1138,7 +1138,7 @@ _0800FAC4:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800FAD0: .4byte gSprites _0800FAD0: .4byte gSprites
_0800FAD4: .4byte gUnknown_2023FE8 _0800FAD4: .4byte gBattleStruct
_0800FAD8: .4byte 0x000003ff _0800FAD8: .4byte 0x000003ff
_0800FADC: .4byte 0xfffffc00 _0800FADC: .4byte 0xfffffc00
thumb_func_end sub_800F6FC thumb_func_end sub_800F6FC
@@ -1146,7 +1146,7 @@ _0800FADC: .4byte 0xfffffc00
thumb_func_start sub_800FAE0 thumb_func_start sub_800FAE0
sub_800FAE0: @ 800FAE0 sub_800FAE0: @ 800FAE0
push {r4,lr} push {r4,lr}
ldr r0, _0800FB64 @ =gUnknown_2022B4C ldr r0, _0800FB64 @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x2 movs r0, 0x2
ands r0, r1 ands r0, r1
@@ -1200,7 +1200,7 @@ sub_800FAE0: @ 800FAE0
bl sub_800F034 bl sub_800F034
b _0800FC26 b _0800FC26
.align 2, 0 .align 2, 0
_0800FB64: .4byte gUnknown_2022B4C _0800FB64: .4byte gBattleTypeFlags
_0800FB68: .4byte gUnknown_8E7737C _0800FB68: .4byte gUnknown_8E7737C
_0800FB6C: .4byte 0x06004000 _0800FB6C: .4byte 0x06004000
_0800FB70: .4byte gUnknown_8E77598 _0800FB70: .4byte gUnknown_8E77598
@@ -1250,8 +1250,8 @@ _0800FBD8:
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
beq _0800FC08 beq _0800FC08
ldr r2, _0800FC00 @ =gUnknown_823EAC8 ldr r2, _0800FC00 @ =gTrainers
ldr r0, _0800FC04 @ =gUnknown_20386AE ldr r0, _0800FC04 @ =gTrainerBattleOpponent_A
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -1267,8 +1267,8 @@ _0800FBF8:
bl sub_800F2AC bl sub_800F2AC
b _0800FC26 b _0800FC26
.align 2, 0 .align 2, 0
_0800FC00: .4byte gUnknown_823EAC8 _0800FC00: .4byte gTrainers
_0800FC04: .4byte gUnknown_20386AE _0800FC04: .4byte gTrainerBattleOpponent_A
_0800FC08: _0800FC08:
bl sav1_map_get_battletype bl sav1_map_get_battletype
lsls r0, 24 lsls r0, 24
@@ -1292,7 +1292,7 @@ _0800FC26:
thumb_func_start sub_800FC2C thumb_func_start sub_800FC2C
sub_800FC2C: @ 800FC2C sub_800FC2C: @ 800FC2C
push {lr} push {lr}
ldr r0, _0800FC40 @ =gUnknown_2022B4C ldr r0, _0800FC40 @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
ldr r2, _0800FC44 @ =0x00080902 ldr r2, _0800FC44 @ =0x00080902
ands r2, r1 ands r2, r1
@@ -1301,7 +1301,7 @@ sub_800FC2C: @ 800FC2C
movs r0, 0xA movs r0, 0xA
b _0800FCAA b _0800FCAA
.align 2, 0 .align 2, 0
_0800FC40: .4byte gUnknown_2022B4C _0800FC40: .4byte gBattleTypeFlags
_0800FC44: .4byte 0x00080902 _0800FC44: .4byte 0x00080902
_0800FC48: _0800FC48:
movs r0, 0x80 movs r0, 0x80
@@ -1320,8 +1320,8 @@ _0800FC60:
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
beq _0800FC90 beq _0800FC90
ldr r2, _0800FC80 @ =gUnknown_823EAC8 ldr r2, _0800FC80 @ =gTrainers
ldr r0, _0800FC84 @ =gUnknown_20386AE ldr r0, _0800FC84 @ =gTrainerBattleOpponent_A
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -1333,8 +1333,8 @@ _0800FC60:
movs r0, 0xC movs r0, 0xC
b _0800FCAA b _0800FCAA
.align 2, 0 .align 2, 0
_0800FC80: .4byte gUnknown_823EAC8 _0800FC80: .4byte gTrainers
_0800FC84: .4byte gUnknown_20386AE _0800FC84: .4byte gTrainerBattleOpponent_A
_0800FC88: _0800FC88:
cmp r0, 0x5A cmp r0, 0x5A
bne _0800FC90 bne _0800FC90
+809 -809
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+10 -10
View File
@@ -111,11 +111,11 @@ DoMoveAnim: @ 807259C
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
ldr r2, _080725C0 @ =gUnknown_2037F1A ldr r2, _080725C0 @ =gUnknown_2037F1A
ldr r0, _080725C4 @ =gUnknown_2023D6B ldr r0, _080725C4 @ =sBattler_AI
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r2] strb r0, [r2]
ldr r2, _080725C8 @ =gUnknown_2037F1B ldr r2, _080725C8 @ =gUnknown_2037F1B
ldr r0, _080725CC @ =gUnknown_2023D6C ldr r0, _080725CC @ =gBattlerTarget
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r2] strb r0, [r2]
ldr r0, _080725D0 @ =gUnknown_81C68F4 ldr r0, _080725D0 @ =gUnknown_81C68F4
@@ -125,9 +125,9 @@ DoMoveAnim: @ 807259C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080725C0: .4byte gUnknown_2037F1A _080725C0: .4byte gUnknown_2037F1A
_080725C4: .4byte gUnknown_2023D6B _080725C4: .4byte sBattler_AI
_080725C8: .4byte gUnknown_2037F1B _080725C8: .4byte gUnknown_2037F1B
_080725CC: .4byte gUnknown_2023D6C _080725CC: .4byte gBattlerTarget
_080725D0: .4byte gUnknown_81C68F4 _080725D0: .4byte gUnknown_81C68F4
thumb_func_end DoMoveAnim thumb_func_end DoMoveAnim
@@ -150,7 +150,7 @@ sub_80725D4: @ 80725D4
movs r0, 0 movs r0, 0
bl UpdateOamPriorityInAllHealthboxes bl UpdateOamPriorityInAllHealthboxes
movs r4, 0 movs r4, 0
ldr r6, _08072618 @ =gUnknown_2023BCE ldr r6, _08072618 @ =gBattlerPartyIndexes
movs r7, 0x64 movs r7, 0x64
ldr r5, _0807261C @ =gUnknown_2037F1C ldr r5, _0807261C @ =gUnknown_2037F1C
_08072600: _08072600:
@@ -162,16 +162,16 @@ _08072600:
beq _08072624 beq _08072624
ldrh r0, [r6] ldrh r0, [r6]
muls r0, r7 muls r0, r7
ldr r1, _08072620 @ =gUnknown_202402C ldr r1, _08072620 @ =gEnemyParty
b _0807262A b _0807262A
.align 2, 0 .align 2, 0
_08072618: .4byte gUnknown_2023BCE _08072618: .4byte gBattlerPartyIndexes
_0807261C: .4byte gUnknown_2037F1C _0807261C: .4byte gUnknown_2037F1C
_08072620: .4byte gUnknown_202402C _08072620: .4byte gEnemyParty
_08072624: _08072624:
ldrh r0, [r6] ldrh r0, [r6]
muls r0, r7 muls r0, r7
ldr r1, _0807264C @ =gUnknown_2024284 ldr r1, _0807264C @ =gPlayerParty
_0807262A: _0807262A:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -189,7 +189,7 @@ _0807262A:
mov r1, r9 mov r1, r9
b _08072658 b _08072658
.align 2, 0 .align 2, 0
_0807264C: .4byte gUnknown_2024284 _0807264C: .4byte gPlayerParty
_08072650: .4byte gUnknown_2037F18 _08072650: .4byte gUnknown_2037F18
_08072654: _08072654:
ldr r0, _080726C0 @ =gUnknown_2037F18 ldr r0, _080726C0 @ =gUnknown_2037F18
+54 -54
View File
@@ -34,7 +34,7 @@ _080744B0:
bl GetBankIdentity bl GetBankIdentity
lsls r0, 24 lsls r0, 24
lsrs r0, 22 lsrs r0, 22
ldr r1, _080744D4 @ =gUnknown_2022B4C ldr r1, _080744D4 @ =gBattleTypeFlags
ldr r1, [r1] ldr r1, [r1]
movs r2, 0x1 movs r2, 0x1
ands r1, r2 ands r1, r2
@@ -45,14 +45,14 @@ _080744B0:
b _08074588 b _08074588
.align 2, 0 .align 2, 0
_080744D0: .4byte gUnknown_83AE01C _080744D0: .4byte gUnknown_83AE01C
_080744D4: .4byte gUnknown_2022B4C _080744D4: .4byte gBattleTypeFlags
_080744D8: _080744D8:
ldr r4, _080744F8 @ =gUnknown_83AE01C ldr r4, _080744F8 @ =gUnknown_83AE01C
adds r0, r5, 0 adds r0, r5, 0
bl GetBankIdentity bl GetBankIdentity
lsls r0, 24 lsls r0, 24
lsrs r0, 22 lsrs r0, 22
ldr r1, _080744FC @ =gUnknown_2022B4C ldr r1, _080744FC @ =gBattleTypeFlags
ldr r1, [r1] ldr r1, [r1]
movs r2, 0x1 movs r2, 0x1
ands r1, r2 ands r1, r2
@@ -63,7 +63,7 @@ _080744D8:
b _08074588 b _08074588
.align 2, 0 .align 2, 0
_080744F8: .4byte gUnknown_83AE01C _080744F8: .4byte gUnknown_83AE01C
_080744FC: .4byte gUnknown_2022B4C _080744FC: .4byte gBattleTypeFlags
_08074500: _08074500:
adds r0, r5, 0 adds r0, r5, 0
bl GetBankSide bl GetBankSide
@@ -78,18 +78,18 @@ _08074500:
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
cmp r0, 0 cmp r0, 0
bne _08074570 bne _08074570
ldr r1, _08074530 @ =gUnknown_2023BCE ldr r1, _08074530 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08074534 @ =gUnknown_202402C ldr r1, _08074534 @ =gEnemyParty
b _08074556 b _08074556
.align 2, 0 .align 2, 0
_0807452C: .4byte gUnknown_2024018 _0807452C: .4byte gUnknown_2024018
_08074530: .4byte gUnknown_2023BCE _08074530: .4byte gBattlerPartyIndexes
_08074534: .4byte gUnknown_202402C _08074534: .4byte gEnemyParty
_08074538: _08074538:
ldr r0, _08074564 @ =gUnknown_2024018 ldr r0, _08074564 @ =gUnknown_2024018
ldr r0, [r0] ldr r0, [r0]
@@ -99,13 +99,13 @@ _08074538:
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
cmp r0, 0 cmp r0, 0
bne _08074570 bne _08074570
ldr r1, _08074568 @ =gUnknown_2023BCE ldr r1, _08074568 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0807456C @ =gUnknown_2024284 ldr r1, _0807456C @ =gPlayerParty
_08074556: _08074556:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -115,8 +115,8 @@ _08074556:
b _08074572 b _08074572
.align 2, 0 .align 2, 0
_08074564: .4byte gUnknown_2024018 _08074564: .4byte gUnknown_2024018
_08074568: .4byte gUnknown_2023BCE _08074568: .4byte gBattlerPartyIndexes
_0807456C: .4byte gUnknown_2024284 _0807456C: .4byte gPlayerParty
_08074570: _08074570:
ldrh r1, [r1, 0x2] ldrh r1, [r1, 0x2]
_08074572: _08074572:
@@ -162,13 +162,13 @@ sub_8074590: @ 8074590
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
cmp r0, 0 cmp r0, 0
bne _080745E4 bne _080745E4
ldr r1, _080745DC @ =gUnknown_2023BCE ldr r1, _080745DC @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080745E0 @ =gUnknown_2024284 ldr r1, _080745E0 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -176,8 +176,8 @@ sub_8074590: @ 8074590
b _080745EA b _080745EA
.align 2, 0 .align 2, 0
_080745D8: .4byte gUnknown_2024018 _080745D8: .4byte gUnknown_2024018
_080745DC: .4byte gUnknown_2023BCE _080745DC: .4byte gBattlerPartyIndexes
_080745E0: .4byte gUnknown_2024284 _080745E0: .4byte gPlayerParty
_080745E4: _080745E4:
ldr r0, _08074620 @ =gUnknown_2024008 ldr r0, _08074620 @ =gUnknown_2024008
adds r0, r1, r0 adds r0, r1, r0
@@ -263,13 +263,13 @@ _08074674:
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
cmp r0, 0 cmp r0, 0
bne _080746B0 bne _080746B0
ldr r1, _080746A8 @ =gUnknown_2023BCE ldr r1, _080746A8 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080746AC @ =gUnknown_202402C ldr r1, _080746AC @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -277,8 +277,8 @@ _08074674:
b _080746B6 b _080746B6
.align 2, 0 .align 2, 0
_080746A4: .4byte gUnknown_2024018 _080746A4: .4byte gUnknown_2024018
_080746A8: .4byte gUnknown_2023BCE _080746A8: .4byte gBattlerPartyIndexes
_080746AC: .4byte gUnknown_202402C _080746AC: .4byte gEnemyParty
_080746B0: _080746B0:
ldr r0, _080746EC @ =gUnknown_2024008 ldr r0, _080746EC @ =gUnknown_2024008
adds r0, r1, r0 adds r0, r1, r0
@@ -455,7 +455,7 @@ _080747F2:
ldr r3, _0807483C @ =gUnknown_83AE01C ldr r3, _0807483C @ =gUnknown_83AE01C
lsls r0, 24 lsls r0, 24
lsrs r0, 22 lsrs r0, 22
ldr r1, _08074840 @ =gUnknown_2022B4C ldr r1, _08074840 @ =gBattleTypeFlags
ldr r1, [r1] ldr r1, [r1]
movs r2, 0x1 movs r2, 0x1
ands r1, r2 ands r1, r2
@@ -488,7 +488,7 @@ _08074832:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0807483C: .4byte gUnknown_83AE01C _0807483C: .4byte gUnknown_83AE01C
_08074840: .4byte gUnknown_2022B4C _08074840: .4byte gBattleTypeFlags
thumb_func_end sub_80747AC thumb_func_end sub_80747AC
thumb_func_start sub_8074844 thumb_func_start sub_8074844
@@ -643,18 +643,18 @@ sub_807492C: @ 807492C
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
cmp r0, 0 cmp r0, 0
bne _080749B0 bne _080749B0
ldr r1, _08074970 @ =gUnknown_2023BCE ldr r1, _08074970 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08074974 @ =gUnknown_202402C ldr r1, _08074974 @ =gEnemyParty
b _08074996 b _08074996
.align 2, 0 .align 2, 0
_0807496C: .4byte gUnknown_2024018 _0807496C: .4byte gUnknown_2024018
_08074970: .4byte gUnknown_2023BCE _08074970: .4byte gBattlerPartyIndexes
_08074974: .4byte gUnknown_202402C _08074974: .4byte gEnemyParty
_08074978: _08074978:
ldr r0, _080749A4 @ =gUnknown_2024018 ldr r0, _080749A4 @ =gUnknown_2024018
ldr r0, [r0] ldr r0, [r0]
@@ -664,13 +664,13 @@ _08074978:
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
cmp r0, 0 cmp r0, 0
bne _080749B0 bne _080749B0
ldr r1, _080749A8 @ =gUnknown_2023BCE ldr r1, _080749A8 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080749AC @ =gUnknown_2024284 ldr r1, _080749AC @ =gPlayerParty
_08074996: _08074996:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -680,8 +680,8 @@ _08074996:
b _080749B2 b _080749B2
.align 2, 0 .align 2, 0
_080749A4: .4byte gUnknown_2024018 _080749A4: .4byte gUnknown_2024018
_080749A8: .4byte gUnknown_2023BCE _080749A8: .4byte gBattlerPartyIndexes
_080749AC: .4byte gUnknown_2024284 _080749AC: .4byte gPlayerParty
_080749B0: _080749B0:
ldrh r4, [r1, 0x2] ldrh r4, [r1, 0x2]
_080749B2: _080749B2:
@@ -1896,26 +1896,26 @@ sub_8075224: @ 8075224
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08075260 beq _08075260
ldr r1, _08075258 @ =gUnknown_2023BCE ldr r1, _08075258 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0807525C @ =gUnknown_202402C ldr r1, _0807525C @ =gEnemyParty
b _0807526E b _0807526E
.align 2, 0 .align 2, 0
_08075254: .4byte gUnknown_2023BD6 _08075254: .4byte gUnknown_2023BD6
_08075258: .4byte gUnknown_2023BCE _08075258: .4byte gBattlerPartyIndexes
_0807525C: .4byte gUnknown_202402C _0807525C: .4byte gEnemyParty
_08075260: _08075260:
ldr r1, _08075280 @ =gUnknown_2023BCE ldr r1, _08075280 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08075284 @ =gUnknown_2024284 ldr r1, _08075284 @ =gPlayerParty
_0807526E: _0807526E:
adds r0, r1 adds r0, r1
movs r1, 0x39 movs r1, 0x39
@@ -1925,8 +1925,8 @@ _0807526E:
movs r0, 0x1 movs r0, 0x1
b _0807528A b _0807528A
.align 2, 0 .align 2, 0
_08075280: .4byte gUnknown_2023BCE _08075280: .4byte gBattlerPartyIndexes
_08075284: .4byte gUnknown_2024284 _08075284: .4byte gPlayerParty
_08075288: _08075288:
movs r0, 0 movs r0, 0
_0807528A: _0807528A:
@@ -1937,13 +1937,13 @@ _0807528A:
thumb_func_start sub_8075290 thumb_func_start sub_8075290
sub_8075290: @ 8075290 sub_8075290: @ 8075290
ldr r0, _0807529C @ =gUnknown_2022B4C ldr r0, _0807529C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x1 movs r1, 0x1
ands r0, r1 ands r0, r1
bx lr bx lr
.align 2, 0 .align 2, 0
_0807529C: .4byte gUnknown_2022B4C _0807529C: .4byte gBattleTypeFlags
thumb_func_end sub_8075290 thumb_func_end sub_8075290
thumb_func_start sub_80752A0 thumb_func_start sub_80752A0
@@ -4429,7 +4429,7 @@ sub_80764EC: @ 80764EC
lsrs r5, r0, 24 lsrs r5, r0, 24
movs r4, 0 movs r4, 0
ldr r1, _0807654C @ =gUnknown_2023D44 ldr r1, _0807654C @ =gUnknown_2023D44
ldr r6, _08076550 @ =gUnknown_2023BCE ldr r6, _08076550 @ =gBattlerPartyIndexes
_08076508: _08076508:
adds r0, r4, r1 adds r0, r4, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -4454,7 +4454,7 @@ _08076508:
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08076558 @ =gUnknown_2024284 ldr r1, _08076558 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -4464,9 +4464,9 @@ _08076508:
.align 2, 0 .align 2, 0
_08076548: .4byte gSprites _08076548: .4byte gSprites
_0807654C: .4byte gUnknown_2023D44 _0807654C: .4byte gUnknown_2023D44
_08076550: .4byte gUnknown_2023BCE _08076550: .4byte gBattlerPartyIndexes
_08076554: .4byte gUnknown_2024018 _08076554: .4byte gUnknown_2024018
_08076558: .4byte gUnknown_2024284 _08076558: .4byte gPlayerParty
_0807655C: _0807655C:
ldrh r1, [r1, 0x2] ldrh r1, [r1, 0x2]
_0807655E: _0807655E:
@@ -4488,7 +4488,7 @@ _08076568:
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08076598 @ =gUnknown_202402C ldr r1, _08076598 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -4497,7 +4497,7 @@ _08076568:
b _0807659E b _0807659E
.align 2, 0 .align 2, 0
_08076594: .4byte gUnknown_2024018 _08076594: .4byte gUnknown_2024018
_08076598: .4byte gUnknown_202402C _08076598: .4byte gEnemyParty
_0807659C: _0807659C:
ldrh r1, [r1, 0x2] ldrh r1, [r1, 0x2]
_0807659E: _0807659E:
@@ -5263,14 +5263,14 @@ sub_8076B2C: @ 8076B2C
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
cmp r0, 0 cmp r0, 0
bne _08076B94 bne _08076B94
ldr r0, _08076B8C @ =gUnknown_2023BCE ldr r0, _08076B8C @ =gBattlerPartyIndexes
mov r1, r8 mov r1, r8
lsls r4, r1, 1 lsls r4, r1, 1
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _08076B90 @ =gUnknown_2024284 ldr r5, _08076B90 @ =gPlayerParty
adds r0, r5 adds r0, r5
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -5285,8 +5285,8 @@ sub_8076B2C: @ 8076B2C
b _08076B9C b _08076B9C
.align 2, 0 .align 2, 0
_08076B88: .4byte gUnknown_2024018 _08076B88: .4byte gUnknown_2024018
_08076B8C: .4byte gUnknown_2023BCE _08076B8C: .4byte gBattlerPartyIndexes
_08076B90: .4byte gUnknown_2024284 _08076B90: .4byte gPlayerParty
_08076B94: _08076B94:
ldrh r7, [r1, 0x2] ldrh r7, [r1, 0x2]
ldr r0, _08076BD4 @ =gUnknown_2024008 ldr r0, _08076BD4 @ =gUnknown_2024008
@@ -5359,14 +5359,14 @@ _08076C08:
ldrh r0, [r1, 0x2] ldrh r0, [r1, 0x2]
cmp r0, 0 cmp r0, 0
bne _08076C54 bne _08076C54
ldr r0, _08076C4C @ =gUnknown_2023BCE ldr r0, _08076C4C @ =gBattlerPartyIndexes
mov r1, r8 mov r1, r8
lsls r4, r1, 1 lsls r4, r1, 1
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _08076C50 @ =gUnknown_202402C ldr r5, _08076C50 @ =gEnemyParty
adds r0, r5 adds r0, r5
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -5381,8 +5381,8 @@ _08076C08:
b _08076C5C b _08076C5C
.align 2, 0 .align 2, 0
_08076C48: .4byte gUnknown_2024018 _08076C48: .4byte gUnknown_2024018
_08076C4C: .4byte gUnknown_2023BCE _08076C4C: .4byte gBattlerPartyIndexes
_08076C50: .4byte gUnknown_202402C _08076C50: .4byte gEnemyParty
_08076C54: _08076C54:
ldrh r7, [r1, 0x2] ldrh r7, [r1, 0x2]
ldr r0, _08076C94 @ =gUnknown_2024008 ldr r0, _08076C94 @ =gUnknown_2024008
+66 -66
View File
@@ -11132,7 +11132,7 @@ _080A77B6:
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
mov r9, r0 mov r9, r0
ldr r0, _080A7818 @ =gUnknown_2022B4C ldr r0, _080A7818 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x1 movs r1, 0x1
ands r0, r1 ands r0, r1
@@ -11155,7 +11155,7 @@ _080A77B6:
.align 2, 0 .align 2, 0
_080A7810: .4byte gUnknown_2037F1A _080A7810: .4byte gUnknown_2037F1A
_080A7814: .4byte gUnknown_3005090 _080A7814: .4byte gUnknown_3005090
_080A7818: .4byte gUnknown_2022B4C _080A7818: .4byte gBattleTypeFlags
_080A781C: .4byte gUnknown_2037F1B _080A781C: .4byte gUnknown_2037F1B
_080A7820: _080A7820:
mov r5, sp mov r5, sp
@@ -17711,7 +17711,7 @@ _080AAADE:
sub_80AAAE4: @ 80AAAE4 sub_80AAAE4: @ 80AAAE4
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
ldr r0, _080AAB28 @ =gUnknown_2022B4C ldr r0, _080AAB28 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x1 movs r1, 0x1
ands r0, r1 ands r0, r1
@@ -17740,7 +17740,7 @@ sub_80AAAE4: @ 80AAAE4
bl StartSpriteAffineAnim bl StartSpriteAffineAnim
b _080AAB50 b _080AAB50
.align 2, 0 .align 2, 0
_080AAB28: .4byte gUnknown_2022B4C _080AAB28: .4byte gBattleTypeFlags
_080AAB2C: .4byte gUnknown_2037F1A _080AAB2C: .4byte gUnknown_2037F1A
_080AAB30: _080AAB30:
ldr r4, _080AAB70 @ =gUnknown_2037F1A ldr r4, _080AAB70 @ =gUnknown_2037F1A
@@ -20135,31 +20135,31 @@ sub_80ABDC8: @ 80ABDC8
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080ABDFC bne _080ABDFC
ldr r1, _080ABDF0 @ =gUnknown_2023BCE ldr r1, _080ABDF0 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080ABDF4 @ =gUnknown_2024284 ldr r0, _080ABDF4 @ =gPlayerParty
b _080ABE0C b _080ABE0C
.align 2, 0 .align 2, 0
_080ABDEC: .4byte gUnknown_2037F1A _080ABDEC: .4byte gUnknown_2037F1A
_080ABDF0: .4byte gUnknown_2023BCE _080ABDF0: .4byte gBattlerPartyIndexes
_080ABDF4: .4byte gUnknown_2024284 _080ABDF4: .4byte gPlayerParty
_080ABDF8: _080ABDF8:
adds r0, r2, 0 adds r0, r2, 0
b _080ABE3E b _080ABE3E
_080ABDFC: _080ABDFC:
ldr r1, _080ABE44 @ =gUnknown_2023BCE ldr r1, _080ABE44 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080ABE48 @ =gUnknown_202402C ldr r0, _080ABE48 @ =gEnemyParty
_080ABE0C: _080ABE0C:
adds r5, r1, r0 adds r5, r1, r0
adds r0, r5, 0 adds r0, r5, 0
@@ -20190,8 +20190,8 @@ _080ABE3E:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_080ABE44: .4byte gUnknown_2023BCE _080ABE44: .4byte gBattlerPartyIndexes
_080ABE48: .4byte gUnknown_202402C _080ABE48: .4byte gEnemyParty
thumb_func_end sub_80ABDC8 thumb_func_end sub_80ABDC8
thumb_func_start sub_80ABE4C thumb_func_start sub_80ABE4C
@@ -30866,7 +30866,7 @@ sub_80B107C: @ 80B107C
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
bne _080B10D8 bne _080B10D8
ldr r4, _080B10CC @ =gUnknown_2023D6B ldr r4, _080B10CC @ =sBattler_AI
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8074480 bl sub_8074480
@@ -30895,7 +30895,7 @@ sub_80B107C: @ 80B107C
b _080B10F4 b _080B10F4
.align 2, 0 .align 2, 0
_080B10C8: .4byte gUnknown_2037F02 _080B10C8: .4byte gUnknown_2037F02
_080B10CC: .4byte gUnknown_2023D6B _080B10CC: .4byte sBattler_AI
_080B10D0: .4byte gUnknown_2037F1A _080B10D0: .4byte gUnknown_2037F1A
_080B10D4: .4byte gUnknown_2037F1B _080B10D4: .4byte gUnknown_2037F1B
_080B10D8: _080B10D8:
@@ -31170,7 +31170,7 @@ sub_80B12E8: @ 80B12E8
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
bne _080B132C bne _080B132C
ldr r4, _080B1320 @ =gUnknown_2023D6B ldr r4, _080B1320 @ =sBattler_AI
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_8074480 bl sub_8074480
@@ -31189,7 +31189,7 @@ sub_80B12E8: @ 80B12E8
b _080B1332 b _080B1332
.align 2, 0 .align 2, 0
_080B131C: .4byte gUnknown_2037F02 _080B131C: .4byte gUnknown_2037F02
_080B1320: .4byte gUnknown_2023D6B _080B1320: .4byte sBattler_AI
_080B1324: .4byte gUnknown_2037F1B _080B1324: .4byte gUnknown_2037F1B
_080B1328: .4byte gUnknown_2037F1A _080B1328: .4byte gUnknown_2037F1A
_080B132C: _080B132C:
@@ -43678,7 +43678,7 @@ sub_80B7448: @ 80B7448
ldr r0, _080B74A0 @ =gUnknown_2037F02 ldr r0, _080B74A0 @ =gUnknown_2037F02
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r6, 0x3A] strh r0, [r6, 0x3A]
ldr r4, _080B74A4 @ =gUnknown_2023D6B ldr r4, _080B74A4 @ =sBattler_AI
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_8076B2C bl sub_8076B2C
@@ -43696,7 +43696,7 @@ sub_80B7448: @ 80B7448
.align 2, 0 .align 2, 0
_080B749C: .4byte gUnknown_2037F1A _080B749C: .4byte gUnknown_2037F1A
_080B74A0: .4byte gUnknown_2037F02 _080B74A0: .4byte gUnknown_2037F02
_080B74A4: .4byte gUnknown_2023D6B _080B74A4: .4byte sBattler_AI
_080B74A8: _080B74A8:
lsrs r0, r1, 17 lsrs r0, r1, 17
_080B74AA: _080B74AA:
@@ -46138,14 +46138,14 @@ _080B87CA:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B8818 beq _080B8818
ldr r1, _080B8810 @ =gUnknown_2023BCE ldr r1, _080B8810 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080B8814 @ =gUnknown_202402C ldr r1, _080B8814 @ =gEnemyParty
b _080B8828 b _080B8828
.align 2, 0 .align 2, 0
_080B87EC: .4byte gUnknown_2022984 _080B87EC: .4byte gUnknown_2022984
@@ -46157,17 +46157,17 @@ _080B8800: .4byte 0x00000c08
_080B8804: .4byte gUnknown_2037F1A _080B8804: .4byte gUnknown_2037F1A
_080B8808: .4byte gSprites _080B8808: .4byte gSprites
_080B880C: .4byte gUnknown_2023D44 _080B880C: .4byte gUnknown_2023D44
_080B8810: .4byte gUnknown_2023BCE _080B8810: .4byte gBattlerPartyIndexes
_080B8814: .4byte gUnknown_202402C _080B8814: .4byte gEnemyParty
_080B8818: _080B8818:
ldr r1, _080B88B8 @ =gUnknown_2023BCE ldr r1, _080B88B8 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080B88BC @ =gUnknown_2024284 ldr r1, _080B88BC @ =gPlayerParty
_080B8828: _080B8828:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -46233,8 +46233,8 @@ _080B8828:
bl sub_8075B48 bl sub_8075B48
b _080B88EC b _080B88EC
.align 2, 0 .align 2, 0
_080B88B8: .4byte gUnknown_2023BCE _080B88B8: .4byte gBattlerPartyIndexes
_080B88BC: .4byte gUnknown_2024284 _080B88BC: .4byte gPlayerParty
_080B88C0: .4byte gUnknown_2037F1A _080B88C0: .4byte gUnknown_2037F1A
_080B88C4: .4byte gUnknown_8D1D388 _080B88C4: .4byte gUnknown_8D1D388
_080B88C8: .4byte gUnknown_8D1D224 _080B88C8: .4byte gUnknown_8D1D224
@@ -51093,14 +51093,14 @@ _080BADFE:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080BAE4C beq _080BAE4C
ldr r1, _080BAE44 @ =gUnknown_2023BCE ldr r1, _080BAE44 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BAE48 @ =gUnknown_202402C ldr r1, _080BAE48 @ =gEnemyParty
b _080BAE5C b _080BAE5C
.align 2, 0 .align 2, 0
_080BAE20: .4byte gUnknown_2022984 _080BAE20: .4byte gUnknown_2022984
@@ -51112,17 +51112,17 @@ _080BAE34: .4byte 0x00000c08
_080BAE38: .4byte gUnknown_2037F1A _080BAE38: .4byte gUnknown_2037F1A
_080BAE3C: .4byte gSprites _080BAE3C: .4byte gSprites
_080BAE40: .4byte gUnknown_2023D44 _080BAE40: .4byte gUnknown_2023D44
_080BAE44: .4byte gUnknown_2023BCE _080BAE44: .4byte gBattlerPartyIndexes
_080BAE48: .4byte gUnknown_202402C _080BAE48: .4byte gEnemyParty
_080BAE4C: _080BAE4C:
ldr r1, _080BAF0C @ =gUnknown_2023BCE ldr r1, _080BAF0C @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BAF10 @ =gUnknown_2024284 ldr r1, _080BAF10 @ =gPlayerParty
_080BAE5C: _080BAE5C:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -51204,8 +51204,8 @@ _080BAEAC:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BAF0C: .4byte gUnknown_2023BCE _080BAF0C: .4byte gBattlerPartyIndexes
_080BAF10: .4byte gUnknown_2024284 _080BAF10: .4byte gPlayerParty
_080BAF14: .4byte gUnknown_2037F1A _080BAF14: .4byte gUnknown_2037F1A
_080BAF18: .4byte gUnknown_8D20858 _080BAF18: .4byte gUnknown_8D20858
_080BAF1C: .4byte gUnknown_8D2083C _080BAF1C: .4byte gUnknown_8D2083C
@@ -51561,7 +51561,7 @@ _080BB20A:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080BB25C beq _080BB25C
ldr r1, _080BB254 @ =gUnknown_2023BCE ldr r1, _080BB254 @ =gBattlerPartyIndexes
ldr r0, [r4] ldr r0, [r4]
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 1 lsls r0, 1
@@ -51569,7 +51569,7 @@ _080BB20A:
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BB258 @ =gUnknown_202402C ldr r1, _080BB258 @ =gEnemyParty
b _080BB26E b _080BB26E
.align 2, 0 .align 2, 0
_080BB230: .4byte gUnknown_2037F1B _080BB230: .4byte gUnknown_2037F1B
@@ -51581,10 +51581,10 @@ _080BB244: .4byte 0x00003f3d
_080BB248: .4byte 0x00003f42 _080BB248: .4byte 0x00003f42
_080BB24C: .4byte gSprites _080BB24C: .4byte gSprites
_080BB250: .4byte gUnknown_2023D44 _080BB250: .4byte gUnknown_2023D44
_080BB254: .4byte gUnknown_2023BCE _080BB254: .4byte gBattlerPartyIndexes
_080BB258: .4byte gUnknown_202402C _080BB258: .4byte gEnemyParty
_080BB25C: _080BB25C:
ldr r1, _080BB290 @ =gUnknown_2023BCE ldr r1, _080BB290 @ =gBattlerPartyIndexes
ldr r0, [r4] ldr r0, [r4]
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 1 lsls r0, 1
@@ -51592,7 +51592,7 @@ _080BB25C:
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BB294 @ =gUnknown_2024284 ldr r1, _080BB294 @ =gPlayerParty
_080BB26E: _080BB26E:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -51610,8 +51610,8 @@ _080BB26E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BB290: .4byte gUnknown_2023BCE _080BB290: .4byte gBattlerPartyIndexes
_080BB294: .4byte gUnknown_2024284 _080BB294: .4byte gPlayerParty
_080BB298: .4byte gUnknown_3005090 _080BB298: .4byte gUnknown_3005090
_080BB29C: .4byte sub_80BB2A0 _080BB29C: .4byte sub_80BB2A0
thumb_func_end sub_80BB0D8 thumb_func_end sub_80BB0D8
@@ -52693,13 +52693,13 @@ _080BBAFC:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080BBB3C beq _080BBB3C
ldr r1, _080BBB34 @ =gUnknown_2023BCE ldr r1, _080BBB34 @ =gBattlerPartyIndexes
lsls r0, r7, 1 lsls r0, r7, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BBB38 @ =gUnknown_202402C ldr r1, _080BBB38 @ =gEnemyParty
b _080BBB4A b _080BBB4A
.align 2, 0 .align 2, 0
_080BBB20: .4byte gUnknown_2022984 _080BBB20: .4byte gUnknown_2022984
@@ -52707,16 +52707,16 @@ _080BBB24: .4byte gUnknown_2022986
_080BBB28: .4byte 0x00003f3f _080BBB28: .4byte 0x00003f3f
_080BBB2C: .4byte 0x00003f3d _080BBB2C: .4byte 0x00003f3d
_080BBB30: .4byte 0x00003f42 _080BBB30: .4byte 0x00003f42
_080BBB34: .4byte gUnknown_2023BCE _080BBB34: .4byte gBattlerPartyIndexes
_080BBB38: .4byte gUnknown_202402C _080BBB38: .4byte gEnemyParty
_080BBB3C: _080BBB3C:
ldr r1, _080BBC10 @ =gUnknown_2023BCE ldr r1, _080BBC10 @ =gBattlerPartyIndexes
lsls r0, r7, 1 lsls r0, r7, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BBC14 @ =gUnknown_2024284 ldr r1, _080BBC14 @ =gPlayerParty
_080BBB4A: _080BBB4A:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -52811,8 +52811,8 @@ _080BBBA8:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BBC10: .4byte gUnknown_2023BCE _080BBC10: .4byte gBattlerPartyIndexes
_080BBC14: .4byte gUnknown_2024284 _080BBC14: .4byte gPlayerParty
_080BBC18: .4byte gUnknown_2023D44 _080BBC18: .4byte gUnknown_2023D44
_080BBC1C: .4byte gUnknown_2022978 _080BBC1C: .4byte gUnknown_2022978
_080BBC20: .4byte gUnknown_202297A _080BBC20: .4byte gUnknown_202297A
@@ -53377,7 +53377,7 @@ sub_80BC060: @ 80BC060
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080BC080 @ =gUnknown_2037F1A ldr r2, _080BC080 @ =gUnknown_2037F1A
ldr r1, _080BC084 @ =gUnknown_2023D6C ldr r1, _080BC084 @ =gBattlerTarget
ldrb r1, [r1] ldrb r1, [r1]
strb r1, [r2] strb r1, [r2]
ldr r2, _080BC088 @ =gUnknown_2037F1B ldr r2, _080BC088 @ =gUnknown_2037F1B
@@ -53389,7 +53389,7 @@ sub_80BC060: @ 80BC060
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BC080: .4byte gUnknown_2037F1A _080BC080: .4byte gUnknown_2037F1A
_080BC084: .4byte gUnknown_2023D6C _080BC084: .4byte gBattlerTarget
_080BC088: .4byte gUnknown_2037F1B _080BC088: .4byte gUnknown_2037F1B
_080BC08C: .4byte gUnknown_2023D6E _080BC08C: .4byte gUnknown_2023D6E
thumb_func_end sub_80BC060 thumb_func_end sub_80BC060
@@ -53437,7 +53437,7 @@ sub_80BC0DC: @ 80BC0DC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080BC0F4 @ =gUnknown_2037F1B ldr r2, _080BC0F4 @ =gUnknown_2037F1B
ldr r1, _080BC0F8 @ =gUnknown_2023D6C ldr r1, _080BC0F8 @ =gBattlerTarget
ldrb r1, [r1] ldrb r1, [r1]
strb r1, [r2] strb r1, [r2]
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
@@ -53445,7 +53445,7 @@ sub_80BC0DC: @ 80BC0DC
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BC0F4: .4byte gUnknown_2037F1B _080BC0F4: .4byte gUnknown_2037F1B
_080BC0F8: .4byte gUnknown_2023D6C _080BC0F8: .4byte gBattlerTarget
thumb_func_end sub_80BC0DC thumb_func_end sub_80BC0DC
thumb_func_start sub_80BC0FC thumb_func_start sub_80BC0FC
@@ -53454,7 +53454,7 @@ sub_80BC0FC: @ 80BC0FC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080BC11C @ =gUnknown_2037F1A ldr r2, _080BC11C @ =gUnknown_2037F1A
ldr r1, _080BC120 @ =gUnknown_2023D6B ldr r1, _080BC120 @ =sBattler_AI
ldrb r1, [r1] ldrb r1, [r1]
strb r1, [r2] strb r1, [r2]
ldr r2, _080BC124 @ =gUnknown_2037F1B ldr r2, _080BC124 @ =gUnknown_2037F1B
@@ -53466,7 +53466,7 @@ sub_80BC0FC: @ 80BC0FC
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BC11C: .4byte gUnknown_2037F1A _080BC11C: .4byte gUnknown_2037F1A
_080BC120: .4byte gUnknown_2023D6B _080BC120: .4byte sBattler_AI
_080BC124: .4byte gUnknown_2037F1B _080BC124: .4byte gUnknown_2037F1B
_080BC128: .4byte gUnknown_2023D6E _080BC128: .4byte gUnknown_2023D6E
thumb_func_end sub_80BC0FC thumb_func_end sub_80BC0FC
@@ -53796,7 +53796,7 @@ sub_80BC3A0: @ 80BC3A0
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, _080BC3B8 @ =gUnknown_2022B4C ldr r0, _080BC3B8 @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x2 movs r0, 0x2
ands r0, r1 ands r0, r1
@@ -53805,7 +53805,7 @@ sub_80BC3A0: @ 80BC3A0
ldr r0, _080BC3BC @ =sub_80BCC4C ldr r0, _080BC3BC @ =sub_80BCC4C
b _080BC3E8 b _080BC3E8
.align 2, 0 .align 2, 0
_080BC3B8: .4byte gUnknown_2022B4C _080BC3B8: .4byte gBattleTypeFlags
_080BC3BC: .4byte sub_80BCC4C _080BC3BC: .4byte sub_80BCC4C
_080BC3C0: _080BC3C0:
movs r0, 0x80 movs r0, 0x80
@@ -53938,7 +53938,7 @@ _080BC4C0:
.4byte _080BC574 .4byte _080BC574
.4byte _080BC6B4 .4byte _080BC6B4
_080BC4D4: _080BC4D4:
ldr r0, _080BC4EC @ =gUnknown_2022B4C ldr r0, _080BC4EC @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -53951,7 +53951,7 @@ _080BC4D4:
movs r1, 0x10 movs r1, 0x10
b _080BC4FA b _080BC4FA
.align 2, 0 .align 2, 0
_080BC4EC: .4byte gUnknown_2022B4C _080BC4EC: .4byte gBattleTypeFlags
_080BC4F0: _080BC4F0:
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r4 adds r0, r4
@@ -54310,7 +54310,7 @@ _080BC7AC:
adds r2, r0, r1 adds r2, r0, r1
movs r3, 0x10 movs r3, 0x10
strh r3, [r2, 0x10] strh r3, [r2, 0x10]
ldr r0, _080BC7CC @ =gUnknown_2022B4C ldr r0, _080BC7CC @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -54320,7 +54320,7 @@ _080BC7AC:
b _080BC7D4 b _080BC7D4
.align 2, 0 .align 2, 0
_080BC7C8: .4byte gUnknown_3005090 _080BC7C8: .4byte gUnknown_3005090
_080BC7CC: .4byte gUnknown_2022B4C _080BC7CC: .4byte gBattleTypeFlags
_080BC7D0: _080BC7D0:
movs r0, 0x1 movs r0, 0x1
strh r0, [r2, 0xC] strh r0, [r2, 0xC]
@@ -54629,7 +54629,7 @@ _080BCA28:
lsls r0, 3 lsls r0, 3
adds r2, r0, r1 adds r2, r0, r1
strh r4, [r2, 0x10] strh r4, [r2, 0x10]
ldr r0, _080BCA6C @ =gUnknown_2022B4C ldr r0, _080BCA6C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -54641,7 +54641,7 @@ _080BCA28:
_080BCA60: .4byte 0x00001842 _080BCA60: .4byte 0x00001842
_080BCA64: .4byte 0x00000808 _080BCA64: .4byte 0x00000808
_080BCA68: .4byte gUnknown_3005090 _080BCA68: .4byte gUnknown_3005090
_080BCA6C: .4byte gUnknown_2022B4C _080BCA6C: .4byte gBattleTypeFlags
_080BCA70: _080BCA70:
movs r0, 0x1 movs r0, 0x1
_080BCA72: _080BCA72:
@@ -54999,7 +54999,7 @@ _080BCD34:
adds r0, 0x1 adds r0, 0x1
strh r0, [r1, 0x8] strh r0, [r1, 0x8]
ldr r4, _080BCDB4 @ =gSprites ldr r4, _080BCDB4 @ =gSprites
ldr r5, _080BCDB8 @ =gUnknown_2023FE8 ldr r5, _080BCDB8 @ =gBattleStruct
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x7D adds r0, 0x7D
ldrb r0, [r0] ldrb r0, [r0]
@@ -55058,7 +55058,7 @@ _080BCD34:
b _080BCEE6 b _080BCEE6
.align 2, 0 .align 2, 0
_080BCDB4: .4byte gSprites _080BCDB4: .4byte gSprites
_080BCDB8: .4byte gUnknown_2023FE8 _080BCDB8: .4byte gBattleStruct
_080BCDBC: .4byte sub_801182C _080BCDBC: .4byte sub_801182C
_080BCDC0: .4byte 0x00003f06 _080BCDC0: .4byte 0x00003f06
_080BCDC4: _080BCDC4:
+20 -20
View File
@@ -5834,7 +5834,7 @@ sub_80E0FB8: @ 80E0FB8
beq _080E107C beq _080E107C
movs r0, 0 movs r0, 0
str r0, [sp, 0x1C] str r0, [sp, 0x1C]
ldr r6, _080E1044 @ =gUnknown_2023BCE ldr r6, _080E1044 @ =gBattlerPartyIndexes
ldr r4, _080E1048 @ =gUnknown_2037F1B ldr r4, _080E1048 @ =gUnknown_2037F1B
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
@@ -5842,7 +5842,7 @@ sub_80E0FB8: @ 80E0FB8
ldrh r0, [r0] ldrh r0, [r0]
movs r5, 0x64 movs r5, 0x64
muls r0, r5 muls r0, r5
ldr r7, _080E104C @ =gUnknown_2024284 ldr r7, _080E104C @ =gPlayerParty
adds r0, r7 adds r0, r7
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -5879,9 +5879,9 @@ sub_80E0FB8: @ 80E0FB8
b _080E1062 b _080E1062
.align 2, 0 .align 2, 0
_080E1040: .4byte gUnknown_2037F1A _080E1040: .4byte gUnknown_2037F1A
_080E1044: .4byte gUnknown_2023BCE _080E1044: .4byte gBattlerPartyIndexes
_080E1048: .4byte gUnknown_2037F1B _080E1048: .4byte gUnknown_2037F1B
_080E104C: .4byte gUnknown_2024284 _080E104C: .4byte gPlayerParty
_080E1050: .4byte gUnknown_2024018 _080E1050: .4byte gUnknown_2024018
_080E1054: _080E1054:
ldrb r0, [r4] ldrb r0, [r4]
@@ -5889,7 +5889,7 @@ _080E1054:
adds r0, r6 adds r0, r6
ldrh r0, [r0] ldrh r0, [r0]
muls r0, r5 muls r0, r5
ldr r1, _080E1070 @ =gUnknown_202402C ldr r1, _080E1070 @ =gEnemyParty
adds r0, r1 adds r0, r1
_080E1062: _080E1062:
movs r1, 0xB movs r1, 0xB
@@ -5898,7 +5898,7 @@ _080E1062:
lsrs r6, r0, 16 lsrs r6, r0, 16
b _080E1076 b _080E1076
.align 2, 0 .align 2, 0
_080E1070: .4byte gUnknown_202402C _080E1070: .4byte gEnemyParty
_080E1074: _080E1074:
ldrh r6, [r1, 0x2] ldrh r6, [r1, 0x2]
_080E1076: _080E1076:
@@ -5908,7 +5908,7 @@ _080E1076:
_080E107C: _080E107C:
movs r2, 0x1 movs r2, 0x1
str r2, [sp, 0x1C] str r2, [sp, 0x1C]
ldr r6, _080E10E0 @ =gUnknown_2023BCE ldr r6, _080E10E0 @ =gBattlerPartyIndexes
ldr r4, _080E10E4 @ =gUnknown_2037F1B ldr r4, _080E10E4 @ =gUnknown_2037F1B
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
@@ -5916,7 +5916,7 @@ _080E107C:
ldrh r0, [r0] ldrh r0, [r0]
movs r5, 0x64 movs r5, 0x64
muls r0, r5 muls r0, r5
ldr r7, _080E10E8 @ =gUnknown_202402C ldr r7, _080E10E8 @ =gEnemyParty
adds r0, r7 adds r0, r7
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -5949,15 +5949,15 @@ _080E107C:
adds r0, r6 adds r0, r6
ldrh r0, [r0] ldrh r0, [r0]
muls r0, r5 muls r0, r5
ldr r1, _080E10F0 @ =gUnknown_2024284 ldr r1, _080E10F0 @ =gPlayerParty
adds r0, r1 adds r0, r1
b _080E1100 b _080E1100
.align 2, 0 .align 2, 0
_080E10E0: .4byte gUnknown_2023BCE _080E10E0: .4byte gBattlerPartyIndexes
_080E10E4: .4byte gUnknown_2037F1B _080E10E4: .4byte gUnknown_2037F1B
_080E10E8: .4byte gUnknown_202402C _080E10E8: .4byte gEnemyParty
_080E10EC: .4byte gUnknown_2024018 _080E10EC: .4byte gUnknown_2024018
_080E10F0: .4byte gUnknown_2024284 _080E10F0: .4byte gPlayerParty
_080E10F4: _080E10F4:
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
@@ -11343,14 +11343,14 @@ _080E3A2C:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E3ACC bne _080E3ACC
ldr r7, _080E3A94 @ =gUnknown_2023BCE ldr r7, _080E3A94 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r7 adds r0, r7
ldrh r0, [r0] ldrh r0, [r0]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _080E3A98 @ =gUnknown_2024284 ldr r5, _080E3A98 @ =gPlayerParty
adds r0, r5 adds r0, r5
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -11385,8 +11385,8 @@ _080E3A2C:
b _080E3AA2 b _080E3AA2
.align 2, 0 .align 2, 0
_080E3A90: .4byte gUnknown_2037F1A _080E3A90: .4byte gUnknown_2037F1A
_080E3A94: .4byte gUnknown_2023BCE _080E3A94: .4byte gBattlerPartyIndexes
_080E3A98: .4byte gUnknown_2024284 _080E3A98: .4byte gPlayerParty
_080E3A9C: .4byte gUnknown_2024018 _080E3A9C: .4byte gUnknown_2024018
_080E3AA0: _080E3AA0:
ldrh r5, [r1, 0x2] ldrh r5, [r1, 0x2]
@@ -11412,14 +11412,14 @@ _080E3AA2:
.align 2, 0 .align 2, 0
_080E3AC8: .4byte gSprites _080E3AC8: .4byte gSprites
_080E3ACC: _080E3ACC:
ldr r7, _080E3B24 @ =gUnknown_2023BCE ldr r7, _080E3B24 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r7 adds r0, r7
ldrh r0, [r0] ldrh r0, [r0]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _080E3B28 @ =gUnknown_202402C ldr r5, _080E3B28 @ =gEnemyParty
adds r0, r5 adds r0, r5
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -11453,8 +11453,8 @@ _080E3ACC:
lsrs r5, r0, 16 lsrs r5, r0, 16
b _080E3B32 b _080E3B32
.align 2, 0 .align 2, 0
_080E3B24: .4byte gUnknown_2023BCE _080E3B24: .4byte gBattlerPartyIndexes
_080E3B28: .4byte gUnknown_202402C _080E3B28: .4byte gEnemyParty
_080E3B2C: .4byte gUnknown_2024018 _080E3B2C: .4byte gUnknown_2024018
_080E3B30: _080E3B30:
ldrh r5, [r1, 0x2] ldrh r5, [r1, 0x2]
+10 -10
View File
@@ -910,29 +910,29 @@ sub_80EF344: @ 80EF344
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080EF38C bne _080EF38C
ldr r1, _080EF384 @ =gUnknown_2023BCE ldr r1, _080EF384 @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080EF388 @ =gUnknown_2024284 ldr r1, _080EF388 @ =gPlayerParty
b _080EF39C b _080EF39C
.align 2, 0 .align 2, 0
_080EF37C: .4byte gUnknown_2023D44 _080EF37C: .4byte gUnknown_2023D44
_080EF380: .4byte gUnknown_2037F1A _080EF380: .4byte gUnknown_2037F1A
_080EF384: .4byte gUnknown_2023BCE _080EF384: .4byte gBattlerPartyIndexes
_080EF388: .4byte gUnknown_2024284 _080EF388: .4byte gPlayerParty
_080EF38C: _080EF38C:
ldr r1, _080EF3CC @ =gUnknown_2023BCE ldr r1, _080EF3CC @ =gBattlerPartyIndexes
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080EF3D0 @ =gUnknown_202402C ldr r1, _080EF3D0 @ =gEnemyParty
_080EF39C: _080EF39C:
adds r0, r1 adds r0, r1
movs r1, 0x26 movs r1, 0x26
@@ -956,8 +956,8 @@ _080EF39C:
beq _080EF458 beq _080EF458
b _080EF482 b _080EF482
.align 2, 0 .align 2, 0
_080EF3CC: .4byte gUnknown_2023BCE _080EF3CC: .4byte gBattlerPartyIndexes
_080EF3D0: .4byte gUnknown_202402C _080EF3D0: .4byte gEnemyParty
_080EF3D4: .4byte gUnknown_3005090 _080EF3D4: .4byte gUnknown_3005090
_080EF3D8: _080EF3D8:
ldr r5, _080EF450 @ =gUnknown_2037F1A ldr r5, _080EF450 @ =gUnknown_2037F1A
@@ -1347,7 +1347,7 @@ sub_80EF6D4: @ 80EF6D4
push {r6,r7} push {r6,r7}
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, _080EF6F4 @ =gUnknown_2022B4C ldr r0, _080EF6F4 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
lsls r1, 2 lsls r1, 2
@@ -1358,7 +1358,7 @@ sub_80EF6D4: @ 80EF6D4
movs r6, 0xB movs r6, 0xB
b _080EF708 b _080EF708
.align 2, 0 .align 2, 0
_080EF6F4: .4byte gUnknown_2022B4C _080EF6F4: .4byte gBattleTypeFlags
_080EF6F8: _080EF6F8:
movs r5, 0x17 movs r5, 0x17
movs r6, 0xB movs r6, 0xB
+16 -16
View File
@@ -379,25 +379,25 @@ _080DD0E8:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080DD10C beq _080DD10C
ldr r1, _080DD104 @ =gUnknown_2023BCE ldr r1, _080DD104 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080DD108 @ =gUnknown_202402C ldr r1, _080DD108 @ =gEnemyParty
b _080DD11A b _080DD11A
.align 2, 0 .align 2, 0
_080DD104: .4byte gUnknown_2023BCE _080DD104: .4byte gBattlerPartyIndexes
_080DD108: .4byte gUnknown_202402C _080DD108: .4byte gEnemyParty
_080DD10C: _080DD10C:
ldr r1, _080DD140 @ =gUnknown_2023BCE ldr r1, _080DD140 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080DD144 @ =gUnknown_2024284 ldr r1, _080DD144 @ =gPlayerParty
_080DD11A: _080DD11A:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -418,8 +418,8 @@ _080DD13A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DD140: .4byte gUnknown_2023BCE _080DD140: .4byte gBattlerPartyIndexes
_080DD144: .4byte gUnknown_2024284 _080DD144: .4byte gPlayerParty
thumb_func_end sub_80DD06C thumb_func_end sub_80DD06C
thumb_func_start sub_80DD148 thumb_func_start sub_80DD148
@@ -491,25 +491,25 @@ _080DD1C4:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080DD1E8 beq _080DD1E8
ldr r1, _080DD1E0 @ =gUnknown_2023BCE ldr r1, _080DD1E0 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080DD1E4 @ =gUnknown_202402C ldr r1, _080DD1E4 @ =gEnemyParty
b _080DD1F6 b _080DD1F6
.align 2, 0 .align 2, 0
_080DD1E0: .4byte gUnknown_2023BCE _080DD1E0: .4byte gBattlerPartyIndexes
_080DD1E4: .4byte gUnknown_202402C _080DD1E4: .4byte gEnemyParty
_080DD1E8: _080DD1E8:
ldr r1, _080DD234 @ =gUnknown_2023BCE ldr r1, _080DD234 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080DD238 @ =gUnknown_2024284 ldr r1, _080DD238 @ =gPlayerParty
_080DD1F6: _080DD1F6:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -540,8 +540,8 @@ _080DD1F6:
bl PlayCry3 bl PlayCry3
b _080DD24C b _080DD24C
.align 2, 0 .align 2, 0
_080DD234: .4byte gUnknown_2023BCE _080DD234: .4byte gBattlerPartyIndexes
_080DD238: .4byte gUnknown_2024284 _080DD238: .4byte gPlayerParty
_080DD23C: .4byte gUnknown_3005090 _080DD23C: .4byte gUnknown_3005090
_080DD240: .4byte gUnknown_2037F02 _080DD240: .4byte gUnknown_2037F02
_080DD244: _080DD244:
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+83 -83
View File
@@ -13,7 +13,7 @@ nullsub_79: @ 80DD534
thumb_func_start sub_80DD538 thumb_func_start sub_80DD538
sub_80DD538: @ 80DD538 sub_80DD538: @ 80DD538
ldr r1, _080DD548 @ =gUnknown_3004FE0 ldr r1, _080DD548 @ =gUnknown_3004FE0
ldr r0, _080DD54C @ =gUnknown_2023BC4 ldr r0, _080DD54C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -22,7 +22,7 @@ sub_80DD538: @ 80DD538
bx lr bx lr
.align 2, 0 .align 2, 0
_080DD548: .4byte gUnknown_3004FE0 _080DD548: .4byte gUnknown_3004FE0
_080DD54C: .4byte gUnknown_2023BC4 _080DD54C: .4byte gActiveBattler
_080DD550: .4byte SafariBufferRunCommand _080DD550: .4byte SafariBufferRunCommand
thumb_func_end sub_80DD538 thumb_func_end sub_80DD538
@@ -30,8 +30,8 @@ _080DD550: .4byte SafariBufferRunCommand
SafariBufferRunCommand: @ 80DD554 SafariBufferRunCommand: @ 80DD554
push {lr} push {lr}
ldr r2, _080DD588 @ =gUnknown_2023BC8 ldr r2, _080DD588 @ =gUnknown_2023BC8
ldr r1, _080DD58C @ =gUnknown_825E45C ldr r1, _080DD58C @ =gBitTable
ldr r0, _080DD590 @ =gUnknown_2023BC4 ldr r0, _080DD590 @ =gActiveBattler
ldrb r3, [r0] ldrb r3, [r0]
lsls r0, r3, 2 lsls r0, r3, 2
adds r0, r1 adds r0, r1
@@ -55,8 +55,8 @@ SafariBufferRunCommand: @ 80DD554
b _080DD5A0 b _080DD5A0
.align 2, 0 .align 2, 0
_080DD588: .4byte gUnknown_2023BC8 _080DD588: .4byte gUnknown_2023BC8
_080DD58C: .4byte gUnknown_825E45C _080DD58C: .4byte gBitTable
_080DD590: .4byte gUnknown_2023BC4 _080DD590: .4byte gActiveBattler
_080DD594: .4byte gUnknown_2022BC4 _080DD594: .4byte gUnknown_2022BC4
_080DD598: .4byte gUnknown_83FED00 _080DD598: .4byte gUnknown_83FED00
_080DD59C: _080DD59C:
@@ -79,7 +79,7 @@ HandleInputChooseAction_0: @ 80DD5A4
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r1, _080DD5D8 @ =gUnknown_2023FF8 ldr r1, _080DD5D8 @ =gUnknown_2023FF8
ldr r0, _080DD5DC @ =gUnknown_2023BC4 ldr r0, _080DD5DC @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -93,7 +93,7 @@ HandleInputChooseAction_0: @ 80DD5A4
.align 2, 0 .align 2, 0
_080DD5D4: .4byte gMain _080DD5D4: .4byte gMain
_080DD5D8: .4byte gUnknown_2023FF8 _080DD5D8: .4byte gUnknown_2023FF8
_080DD5DC: .4byte gUnknown_2023BC4 _080DD5DC: .4byte gActiveBattler
_080DD5E0: _080DD5E0:
cmp r0, 0x2 cmp r0, 0x2
beq _080DD5F6 beq _080DD5F6
@@ -129,7 +129,7 @@ _080DD612:
cmp r0, 0 cmp r0, 0
beq _080DD650 beq _080DD650
ldr r5, _080DD648 @ =gUnknown_2023FF8 ldr r5, _080DD648 @ =gUnknown_2023FF8
ldr r4, _080DD64C @ =gUnknown_2023BC4 ldr r4, _080DD64C @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
@@ -150,14 +150,14 @@ _080DD612:
b _080DD6BE b _080DD6BE
.align 2, 0 .align 2, 0
_080DD648: .4byte gUnknown_2023FF8 _080DD648: .4byte gUnknown_2023FF8
_080DD64C: .4byte gUnknown_2023BC4 _080DD64C: .4byte gActiveBattler
_080DD650: _080DD650:
movs r0, 0x10 movs r0, 0x10
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080DD68C beq _080DD68C
ldr r5, _080DD684 @ =gUnknown_2023FF8 ldr r5, _080DD684 @ =gUnknown_2023FF8
ldr r4, _080DD688 @ =gUnknown_2023BC4 ldr r4, _080DD688 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
@@ -178,14 +178,14 @@ _080DD650:
b _080DD6BE b _080DD6BE
.align 2, 0 .align 2, 0
_080DD684: .4byte gUnknown_2023FF8 _080DD684: .4byte gUnknown_2023FF8
_080DD688: .4byte gUnknown_2023BC4 _080DD688: .4byte gActiveBattler
_080DD68C: _080DD68C:
movs r0, 0x40 movs r0, 0x40
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080DD6D8 beq _080DD6D8
ldr r5, _080DD6D0 @ =gUnknown_2023FF8 ldr r5, _080DD6D0 @ =gUnknown_2023FF8
ldr r4, _080DD6D4 @ =gUnknown_2023BC4 ldr r4, _080DD6D4 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
@@ -214,14 +214,14 @@ _080DD6BE:
b _080DD71A b _080DD71A
.align 2, 0 .align 2, 0
_080DD6D0: .4byte gUnknown_2023FF8 _080DD6D0: .4byte gUnknown_2023FF8
_080DD6D4: .4byte gUnknown_2023BC4 _080DD6D4: .4byte gActiveBattler
_080DD6D8: _080DD6D8:
movs r0, 0x80 movs r0, 0x80
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080DD71A beq _080DD71A
ldr r5, _080DD720 @ =gUnknown_2023FF8 ldr r5, _080DD720 @ =gUnknown_2023FF8
ldr r4, _080DD724 @ =gUnknown_2023BC4 ldr r4, _080DD724 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
@@ -252,7 +252,7 @@ _080DD71A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DD720: .4byte gUnknown_2023FF8 _080DD720: .4byte gUnknown_2023FF8
_080DD724: .4byte gUnknown_2023BC4 _080DD724: .4byte gActiveBattler
thumb_func_end HandleInputChooseAction_0 thumb_func_end HandleInputChooseAction_0
thumb_func_start sub_80DD728 thumb_func_start sub_80DD728
@@ -260,7 +260,7 @@ sub_80DD728: @ 80DD728
push {lr} push {lr}
ldr r2, _080DD750 @ =gSprites ldr r2, _080DD750 @ =gSprites
ldr r1, _080DD754 @ =gUnknown_2023D44 ldr r1, _080DD754 @ =gUnknown_2023D44
ldr r0, _080DD758 @ =gUnknown_2023BC4 ldr r0, _080DD758 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -280,7 +280,7 @@ _080DD74C:
.align 2, 0 .align 2, 0
_080DD750: .4byte gSprites _080DD750: .4byte gSprites
_080DD754: .4byte gUnknown_2023D44 _080DD754: .4byte gUnknown_2023D44
_080DD758: .4byte gUnknown_2023BC4 _080DD758: .4byte gActiveBattler
_080DD75C: .4byte SpriteCallbackDummy _080DD75C: .4byte SpriteCallbackDummy
thumb_func_end sub_80DD728 thumb_func_end sub_80DD728
@@ -303,7 +303,7 @@ sub_80DD778: @ 80DD778
push {lr} push {lr}
ldr r2, _080DD7A0 @ =gSprites ldr r2, _080DD7A0 @ =gSprites
ldr r1, _080DD7A4 @ =gUnknown_3004FF0 ldr r1, _080DD7A4 @ =gUnknown_3004FF0
ldr r0, _080DD7A8 @ =gUnknown_2023BC4 ldr r0, _080DD7A8 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -323,7 +323,7 @@ _080DD79C:
.align 2, 0 .align 2, 0
_080DD7A0: .4byte gSprites _080DD7A0: .4byte gSprites
_080DD7A4: .4byte gUnknown_3004FF0 _080DD7A4: .4byte gUnknown_3004FF0
_080DD7A8: .4byte gUnknown_2023BC4 _080DD7A8: .4byte gActiveBattler
_080DD7AC: .4byte SpriteCallbackDummy _080DD7AC: .4byte SpriteCallbackDummy
thumb_func_end sub_80DD778 thumb_func_end sub_80DD778
@@ -368,7 +368,7 @@ CompleteOnSpecialAnimDone_0: @ 80DD7F0
beq _080DD816 beq _080DD816
ldr r0, _080DD824 @ =gUnknown_2024018 ldr r0, _080DD824 @ =gUnknown_2024018
ldr r2, [r0] ldr r2, [r0]
ldr r0, _080DD828 @ =gUnknown_2023BC4 ldr r0, _080DD828 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, [r2, 0x4] ldr r2, [r2, 0x4]
lsls r0, r1, 1 lsls r0, r1, 1
@@ -388,7 +388,7 @@ _080DD81A:
.align 2, 0 .align 2, 0
_080DD820: .4byte gUnknown_2024005 _080DD820: .4byte gUnknown_2024005
_080DD824: .4byte gUnknown_2024018 _080DD824: .4byte gUnknown_2024018
_080DD828: .4byte gUnknown_2023BC4 _080DD828: .4byte gActiveBattler
thumb_func_end CompleteOnSpecialAnimDone_0 thumb_func_end CompleteOnSpecialAnimDone_0
thumb_func_start sub_80DD82C thumb_func_start sub_80DD82C
@@ -401,7 +401,7 @@ sub_80DD82C: @ 80DD82C
cmp r0, 0 cmp r0, 0
bne _080DD848 bne _080DD848
ldr r1, _080DD850 @ =gUnknown_3004FE0 ldr r1, _080DD850 @ =gUnknown_3004FE0
ldr r0, _080DD854 @ =gUnknown_2023BC4 ldr r0, _080DD854 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -413,7 +413,7 @@ _080DD848:
.align 2, 0 .align 2, 0
_080DD84C: .4byte gUnknown_2037AB8 _080DD84C: .4byte gUnknown_2037AB8
_080DD850: .4byte gUnknown_3004FE0 _080DD850: .4byte gUnknown_3004FE0
_080DD854: .4byte gUnknown_2023BC4 _080DD854: .4byte gActiveBattler
_080DD858: .4byte CompleteWhenChosePokeblock _080DD858: .4byte CompleteWhenChosePokeblock
thumb_func_end sub_80DD82C thumb_func_end sub_80DD82C
@@ -451,7 +451,7 @@ CompleteOnFinishedBattleAnimation_3: @ 80DD898
push {lr} push {lr}
ldr r0, _080DD8C0 @ =gUnknown_2024018 ldr r0, _080DD8C0 @ =gUnknown_2024018
ldr r2, [r0] ldr r2, [r0]
ldr r0, _080DD8C4 @ =gUnknown_2023BC4 ldr r0, _080DD8C4 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, [r2, 0x4] ldr r2, [r2, 0x4]
lsls r0, r1, 1 lsls r0, r1, 1
@@ -469,7 +469,7 @@ _080DD8BA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DD8C0: .4byte gUnknown_2024018 _080DD8C0: .4byte gUnknown_2024018
_080DD8C4: .4byte gUnknown_2023BC4 _080DD8C4: .4byte gActiveBattler
thumb_func_end CompleteOnFinishedBattleAnimation_3 thumb_func_end CompleteOnFinishedBattleAnimation_3
thumb_func_start SafariBufferExecCompleted thumb_func_start SafariBufferExecCompleted
@@ -477,13 +477,13 @@ SafariBufferExecCompleted: @ 80DD8C8
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
ldr r1, _080DD908 @ =gUnknown_3004FE0 ldr r1, _080DD908 @ =gUnknown_3004FE0
ldr r4, _080DD90C @ =gUnknown_2023BC4 ldr r4, _080DD90C @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldr r1, _080DD910 @ =SafariBufferRunCommand ldr r1, _080DD910 @ =SafariBufferRunCommand
str r1, [r0] str r1, [r0]
ldr r0, _080DD914 @ =gUnknown_2022B4C ldr r0, _080DD914 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -505,13 +505,13 @@ SafariBufferExecCompleted: @ 80DD8C8
b _080DD92E b _080DD92E
.align 2, 0 .align 2, 0
_080DD908: .4byte gUnknown_3004FE0 _080DD908: .4byte gUnknown_3004FE0
_080DD90C: .4byte gUnknown_2023BC4 _080DD90C: .4byte gActiveBattler
_080DD910: .4byte SafariBufferRunCommand _080DD910: .4byte SafariBufferRunCommand
_080DD914: .4byte gUnknown_2022B4C _080DD914: .4byte gBattleTypeFlags
_080DD918: .4byte gUnknown_2022BC4 _080DD918: .4byte gUnknown_2022BC4
_080DD91C: _080DD91C:
ldr r2, _080DD938 @ =gUnknown_2023BC8 ldr r2, _080DD938 @ =gUnknown_2023BC8
ldr r1, _080DD93C @ =gUnknown_825E45C ldr r1, _080DD93C @ =gBitTable
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -526,7 +526,7 @@ _080DD92E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DD938: .4byte gUnknown_2023BC8 _080DD938: .4byte gUnknown_2023BC8
_080DD93C: .4byte gUnknown_825E45C _080DD93C: .4byte gBitTable
thumb_func_end SafariBufferExecCompleted thumb_func_end SafariBufferExecCompleted
thumb_func_start CompleteOnFinishedStatusAnimation_3 thumb_func_start CompleteOnFinishedStatusAnimation_3
@@ -534,7 +534,7 @@ CompleteOnFinishedStatusAnimation_3: @ 80DD940
push {lr} push {lr}
ldr r0, _080DD968 @ =gUnknown_2024018 ldr r0, _080DD968 @ =gUnknown_2024018
ldr r2, [r0] ldr r2, [r0]
ldr r0, _080DD96C @ =gUnknown_2023BC4 ldr r0, _080DD96C @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, [r2, 0x4] ldr r2, [r2, 0x4]
lsls r0, r1, 1 lsls r0, r1, 1
@@ -552,7 +552,7 @@ _080DD962:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DD968: .4byte gUnknown_2024018 _080DD968: .4byte gUnknown_2024018
_080DD96C: .4byte gUnknown_2023BC4 _080DD96C: .4byte gActiveBattler
thumb_func_end CompleteOnFinishedStatusAnimation_3 thumb_func_end CompleteOnFinishedStatusAnimation_3
thumb_func_start sub_80DD970 thumb_func_start sub_80DD970
@@ -617,7 +617,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
ldr r4, _080DDA7C @ =gSaveBlock2Ptr ldr r4, _080DDA7C @ =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
ldr r5, _080DDA80 @ =gUnknown_2023BC4 ldr r5, _080DDA80 @ =gActiveBattler
ldrb r1, [r5] ldrb r1, [r5]
bl sub_8034750 bl sub_8034750
ldr r0, [r4] ldr r0, [r4]
@@ -703,7 +703,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDA7C: .4byte gSaveBlock2Ptr _080DDA7C: .4byte gSaveBlock2Ptr
_080DDA80: .4byte gUnknown_2023BC4 _080DDA80: .4byte gActiveBattler
_080DDA84: .4byte gUnknown_20244DC _080DDA84: .4byte gUnknown_20244DC
_080DDA88: .4byte gUnknown_8239F8C _080DDA88: .4byte gUnknown_8239F8C
_080DDA8C: .4byte gUnknown_2023D44 _080DDA8C: .4byte gUnknown_2023D44
@@ -757,7 +757,7 @@ sub_80DDAD4: @ 80DDAD4
ldr r1, _080DDB18 @ =gUnknown_2024005 ldr r1, _080DDB18 @ =gUnknown_2024005
movs r0, 0x1 movs r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r5, _080DDB1C @ =gUnknown_2023BC4 ldr r5, _080DDB1C @ =gActiveBattler
ldrb r4, [r5] ldrb r4, [r5]
movs r0, 0x1 movs r0, 0x1
bl GetBankByIdentity bl GetBankByIdentity
@@ -780,7 +780,7 @@ sub_80DDAD4: @ 80DDAD4
.align 2, 0 .align 2, 0
_080DDB14: .4byte gUnknown_2024018 _080DDB14: .4byte gUnknown_2024018
_080DDB18: .4byte gUnknown_2024005 _080DDB18: .4byte gUnknown_2024005
_080DDB1C: .4byte gUnknown_2023BC4 _080DDB1C: .4byte gActiveBattler
_080DDB20: .4byte gUnknown_3004FE0 _080DDB20: .4byte gUnknown_3004FE0
_080DDB24: .4byte CompleteOnSpecialAnimDone_0 _080DDB24: .4byte CompleteOnSpecialAnimDone_0
thumb_func_end sub_80DDAD4 thumb_func_end sub_80DDAD4
@@ -789,7 +789,7 @@ _080DDB24: .4byte CompleteOnSpecialAnimDone_0
sub_80DDB28: @ 80DDB28 sub_80DDB28: @ 80DDB28
push {r4,r5,lr} push {r4,r5,lr}
ldr r1, _080DDB70 @ =gUnknown_2022BC4 ldr r1, _080DDB70 @ =gUnknown_2022BC4
ldr r5, _080DDB74 @ =gUnknown_2023BC4 ldr r5, _080DDB74 @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
adds r1, 0x1 adds r1, 0x1
@@ -823,7 +823,7 @@ sub_80DDB28: @ 80DDB28
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDB70: .4byte gUnknown_2022BC4 _080DDB70: .4byte gUnknown_2022BC4
_080DDB74: .4byte gUnknown_2023BC4 _080DDB74: .4byte gActiveBattler
_080DDB78: .4byte gUnknown_2024018 _080DDB78: .4byte gUnknown_2024018
_080DDB7C: .4byte gUnknown_2024005 _080DDB7C: .4byte gUnknown_2024005
_080DDB80: .4byte gUnknown_3004FE0 _080DDB80: .4byte gUnknown_3004FE0
@@ -854,7 +854,7 @@ sub_80DDBA0: @ 80DDBA0
strh r1, [r0] strh r1, [r0]
ldr r0, _080DDBD8 @ =gUnknown_2022976 ldr r0, _080DDBD8 @ =gUnknown_2022976
strh r1, [r0] strh r1, [r0]
ldr r0, _080DDBDC @ =gUnknown_2023BC4 ldr r0, _080DDBDC @ =gActiveBattler
ldrb r4, [r0] ldrb r4, [r0]
lsls r4, 9 lsls r4, 9
ldr r0, _080DDBE0 @ =gUnknown_2022BC6 ldr r0, _080DDBE0 @ =gUnknown_2022BC6
@@ -873,7 +873,7 @@ sub_80DDBA0: @ 80DDBA0
.align 2, 0 .align 2, 0
_080DDBD4: .4byte gUnknown_2022974 _080DDBD4: .4byte gUnknown_2022974
_080DDBD8: .4byte gUnknown_2022976 _080DDBD8: .4byte gUnknown_2022976
_080DDBDC: .4byte gUnknown_2023BC4 _080DDBDC: .4byte gActiveBattler
_080DDBE0: .4byte gUnknown_2022BC6 _080DDBE0: .4byte gUnknown_2022BC6
_080DDBE4: .4byte gUnknown_202298C _080DDBE4: .4byte gUnknown_202298C
_080DDBE8: _080DDBE8:
@@ -882,7 +882,7 @@ _080DDBE8:
bl sub_80D87BC bl sub_80D87BC
_080DDBF0: _080DDBF0:
ldr r1, _080DDC08 @ =gUnknown_3004FE0 ldr r1, _080DDC08 @ =gUnknown_3004FE0
ldr r0, _080DDC0C @ =gUnknown_2023BC4 ldr r0, _080DDC0C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -894,14 +894,14 @@ _080DDBF0:
.align 2, 0 .align 2, 0
_080DDC04: .4byte gUnknown_202298C _080DDC04: .4byte gUnknown_202298C
_080DDC08: .4byte gUnknown_3004FE0 _080DDC08: .4byte gUnknown_3004FE0
_080DDC0C: .4byte gUnknown_2023BC4 _080DDC0C: .4byte gActiveBattler
_080DDC10: .4byte CompleteOnInactiveTextPrinter_3 _080DDC10: .4byte CompleteOnInactiveTextPrinter_3
thumb_func_end sub_80DDBA0 thumb_func_end sub_80DDBA0
thumb_func_start sub_80DDC14 thumb_func_start sub_80DDC14
sub_80DDC14: @ 80DDC14 sub_80DDC14: @ 80DDC14
push {lr} push {lr}
ldr r0, _080DDC2C @ =gUnknown_2023BC4 ldr r0, _080DDC2C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -910,7 +910,7 @@ sub_80DDC14: @ 80DDC14
bl sub_80DDBA0 bl sub_80DDBA0
b _080DDC34 b _080DDC34
.align 2, 0 .align 2, 0
_080DDC2C: .4byte gUnknown_2023BC4 _080DDC2C: .4byte gActiveBattler
_080DDC30: _080DDC30:
bl SafariBufferExecCompleted bl SafariBufferExecCompleted
_080DDC34: _080DDC34:
@@ -932,7 +932,7 @@ sub_80DDC38: @ 80DDC38
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r1, _080DDC6C @ =gUnknown_3004FE0 ldr r1, _080DDC6C @ =gUnknown_3004FE0
ldr r0, _080DDC70 @ =gUnknown_2023BC4 ldr r0, _080DDC70 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -945,7 +945,7 @@ _080DDC5E:
_080DDC64: .4byte gUnknown_2022974 _080DDC64: .4byte gUnknown_2022974
_080DDC68: .4byte gUnknown_2022976 _080DDC68: .4byte gUnknown_2022976
_080DDC6C: .4byte gUnknown_3004FE0 _080DDC6C: .4byte gUnknown_3004FE0
_080DDC70: .4byte gUnknown_2023BC4 _080DDC70: .4byte gActiveBattler
_080DDC74: .4byte HandleInputChooseAction_0 _080DDC74: .4byte HandleInputChooseAction_0
thumb_func_end sub_80DDC38 thumb_func_end sub_80DDC38
@@ -953,7 +953,7 @@ _080DDC74: .4byte HandleInputChooseAction_0
sub_80DDC78: @ 80DDC78 sub_80DDC78: @ 80DDC78
push {r4,lr} push {r4,lr}
ldr r1, _080DDCCC @ =gUnknown_3004FE0 ldr r1, _080DDCCC @ =gUnknown_3004FE0
ldr r0, _080DDCD0 @ =gUnknown_2023BC4 ldr r0, _080DDCD0 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -974,7 +974,7 @@ _080DDC9A:
cmp r4, 0x3 cmp r4, 0x3
ble _080DDC9A ble _080DDC9A
ldr r1, _080DDCE0 @ =gUnknown_2023FF8 ldr r1, _080DDCE0 @ =gUnknown_2023FF8
ldr r0, _080DDCD0 @ =gUnknown_2023BC4 ldr r0, _080DDCD0 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -990,7 +990,7 @@ _080DDC9A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDCCC: .4byte gUnknown_3004FE0 _080DDCCC: .4byte gUnknown_3004FE0
_080DDCD0: .4byte gUnknown_2023BC4 _080DDCD0: .4byte gActiveBattler
_080DDCD4: .4byte sub_80DDC38 _080DDCD4: .4byte sub_80DDC38
_080DDCD8: .4byte gUnknown_83FDA4C _080DDCD8: .4byte gUnknown_83FDA4C
_080DDCDC: .4byte gUnknown_83FE747 _080DDCDC: .4byte gUnknown_83FE747
@@ -1027,7 +1027,7 @@ sub_80DDD04: @ 80DDD04
movs r3, 0x10 movs r3, 0x10
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
ldr r1, _080DDD34 @ =gUnknown_3004FE0 ldr r1, _080DDD34 @ =gUnknown_3004FE0
ldr r2, _080DDD38 @ =gUnknown_2023BC4 ldr r2, _080DDD38 @ =gActiveBattler
ldrb r0, [r2] ldrb r0, [r2]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -1041,7 +1041,7 @@ sub_80DDD04: @ 80DDD04
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDD34: .4byte gUnknown_3004FE0 _080DDD34: .4byte gUnknown_3004FE0
_080DDD38: .4byte gUnknown_2023BC4 _080DDD38: .4byte gActiveBattler
_080DDD3C: .4byte sub_80DD82C _080DDD3C: .4byte sub_80DD82C
_080DDD40: .4byte gUnknown_2024004 _080DDD40: .4byte gUnknown_2024004
thumb_func_end sub_80DDD04 thumb_func_end sub_80DDD04
@@ -1082,17 +1082,17 @@ sub_80DDD68: @ 80DDD68
SafariHandleStatusIconUpdate: @ 80DDD74 SafariHandleStatusIconUpdate: @ 80DDD74
push {lr} push {lr}
ldr r0, _080DDDA0 @ =gUnknown_3004FF0 ldr r0, _080DDDA0 @ =gUnknown_3004FF0
ldr r1, _080DDDA4 @ =gUnknown_2023BC4 ldr r1, _080DDDA4 @ =gActiveBattler
ldrb r1, [r1] ldrb r1, [r1]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _080DDDA8 @ =gUnknown_2023BCE ldr r2, _080DDDA8 @ =gBattlerPartyIndexes
lsls r1, 1 lsls r1, 1
adds r1, r2 adds r1, r2
ldrh r2, [r1] ldrh r2, [r1]
movs r1, 0x64 movs r1, 0x64
muls r1, r2 muls r1, r2
ldr r2, _080DDDAC @ =gUnknown_2024284 ldr r2, _080DDDAC @ =gPlayerParty
adds r1, r2 adds r1, r2
movs r2, 0xB movs r2, 0xB
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
@@ -1101,9 +1101,9 @@ SafariHandleStatusIconUpdate: @ 80DDD74
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDDA0: .4byte gUnknown_3004FF0 _080DDDA0: .4byte gUnknown_3004FF0
_080DDDA4: .4byte gUnknown_2023BC4 _080DDDA4: .4byte gActiveBattler
_080DDDA8: .4byte gUnknown_2023BCE _080DDDA8: .4byte gBattlerPartyIndexes
_080DDDAC: .4byte gUnknown_2024284 _080DDDAC: .4byte gPlayerParty
thumb_func_end SafariHandleStatusIconUpdate thumb_func_end SafariHandleStatusIconUpdate
thumb_func_start sub_80DDDB0 thumb_func_start sub_80DDDB0
@@ -1237,7 +1237,7 @@ sub_80DDE64: @ 80DDE64
thumb_func_start SafariHandlePlaySE thumb_func_start SafariHandlePlaySE
SafariHandlePlaySE: @ 80DDE70 SafariHandlePlaySE: @ 80DDE70
push {r4,lr} push {r4,lr}
ldr r4, _080DDEAC @ =gUnknown_2023BC4 ldr r4, _080DDEAC @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -1265,7 +1265,7 @@ _080DDE84:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDEAC: .4byte gUnknown_2023BC4 _080DDEAC: .4byte gActiveBattler
_080DDEB0: .4byte gUnknown_2022BC4 _080DDEB0: .4byte gUnknown_2022BC4
thumb_func_end SafariHandlePlaySE thumb_func_end SafariHandlePlaySE
@@ -1273,7 +1273,7 @@ _080DDEB0: .4byte gUnknown_2022BC4
SafariHandlecmd44: @ 80DDEB4 SafariHandlecmd44: @ 80DDEB4
push {lr} push {lr}
ldr r2, _080DDEDC @ =gUnknown_2022BC4 ldr r2, _080DDEDC @ =gUnknown_2022BC4
ldr r0, _080DDEE0 @ =gUnknown_2023BC4 ldr r0, _080DDEE0 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
lsls r1, 9 lsls r1, 9
adds r0, r2, 0x1 adds r0, r2, 0x1
@@ -1290,21 +1290,21 @@ SafariHandlecmd44: @ 80DDEB4
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDEDC: .4byte gUnknown_2022BC4 _080DDEDC: .4byte gUnknown_2022BC4
_080DDEE0: .4byte gUnknown_2023BC4 _080DDEE0: .4byte gActiveBattler
thumb_func_end SafariHandlecmd44 thumb_func_end SafariHandlecmd44
thumb_func_start SafariHandleFaintingCry thumb_func_start SafariHandleFaintingCry
SafariHandleFaintingCry: @ 80DDEE4 SafariHandleFaintingCry: @ 80DDEE4
push {lr} push {lr}
ldr r1, _080DDF14 @ =gUnknown_2023BCE ldr r1, _080DDF14 @ =gBattlerPartyIndexes
ldr r0, _080DDF18 @ =gUnknown_2023BC4 ldr r0, _080DDF18 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 1 lsls r0, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080DDF1C @ =gUnknown_2024284 ldr r1, _080DDF1C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -1316,16 +1316,16 @@ SafariHandleFaintingCry: @ 80DDEE4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDF14: .4byte gUnknown_2023BCE _080DDF14: .4byte gBattlerPartyIndexes
_080DDF18: .4byte gUnknown_2023BC4 _080DDF18: .4byte gActiveBattler
_080DDF1C: .4byte gUnknown_2024284 _080DDF1C: .4byte gPlayerParty
thumb_func_end SafariHandleFaintingCry thumb_func_end SafariHandleFaintingCry
thumb_func_start SafariHandleIntroSlide thumb_func_start SafariHandleIntroSlide
SafariHandleIntroSlide: @ 80DDF20 SafariHandleIntroSlide: @ 80DDF20
push {lr} push {lr}
ldr r1, _080DDF48 @ =gUnknown_2022BC4 ldr r1, _080DDF48 @ =gUnknown_2022BC4
ldr r0, _080DDF4C @ =gUnknown_2023BC4 ldr r0, _080DDF4C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 9 lsls r0, 9
adds r1, 0x1 adds r1, 0x1
@@ -1342,7 +1342,7 @@ SafariHandleIntroSlide: @ 80DDF20
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDF48: .4byte gUnknown_2022BC4 _080DDF48: .4byte gUnknown_2022BC4
_080DDF4C: .4byte gUnknown_2023BC4 _080DDF4C: .4byte gActiveBattler
_080DDF50: .4byte gUnknown_2023F4C _080DDF50: .4byte gUnknown_2023F4C
thumb_func_end SafariHandleIntroSlide thumb_func_end SafariHandleIntroSlide
@@ -1350,17 +1350,17 @@ _080DDF50: .4byte gUnknown_2023F4C
SafariHandleIntroTrainerBallThrow: @ 80DDF54 SafariHandleIntroTrainerBallThrow: @ 80DDF54
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _080DDF98 @ =gUnknown_3004FF0 ldr r5, _080DDF98 @ =gUnknown_3004FF0
ldr r4, _080DDF9C @ =gUnknown_2023BC4 ldr r4, _080DDF9C @ =gActiveBattler
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r5 adds r0, r1, r5
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _080DDFA0 @ =gUnknown_2023BCE ldr r2, _080DDFA0 @ =gBattlerPartyIndexes
lsls r1, 1 lsls r1, 1
adds r1, r2 adds r1, r2
ldrh r2, [r1] ldrh r2, [r1]
movs r1, 0x64 movs r1, 0x64
muls r1, r2 muls r1, r2
ldr r2, _080DDFA4 @ =gUnknown_2024284 ldr r2, _080DDFA4 @ =gPlayerParty
adds r1, r2 adds r1, r2
movs r2, 0xA movs r2, 0xA
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
@@ -1381,9 +1381,9 @@ SafariHandleIntroTrainerBallThrow: @ 80DDF54
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DDF98: .4byte gUnknown_3004FF0 _080DDF98: .4byte gUnknown_3004FF0
_080DDF9C: .4byte gUnknown_2023BC4 _080DDF9C: .4byte gActiveBattler
_080DDFA0: .4byte gUnknown_2023BCE _080DDFA0: .4byte gBattlerPartyIndexes
_080DDFA4: .4byte gUnknown_2024284 _080DDFA4: .4byte gPlayerParty
_080DDFA8: .4byte gUnknown_3004FE0 _080DDFA8: .4byte gUnknown_3004FE0
_080DDFAC: .4byte sub_80DD778 _080DDFAC: .4byte sub_80DD778
thumb_func_end SafariHandleIntroTrainerBallThrow thumb_func_end SafariHandleIntroTrainerBallThrow
@@ -1425,7 +1425,7 @@ SafariHandleBattleAnimation: @ 80DDFE0
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, _080DE018 @ =gUnknown_2022BC4 ldr r5, _080DE018 @ =gUnknown_2022BC4
ldr r6, _080DE01C @ =gUnknown_2023BC4 ldr r6, _080DE01C @ =gActiveBattler
ldrb r2, [r6] ldrb r2, [r6]
lsls r1, r2, 9 lsls r1, r2, 9
adds r0, r5, 0x1 adds r0, r5, 0x1
@@ -1450,7 +1450,7 @@ SafariHandleBattleAnimation: @ 80DDFE0
b _080DE02C b _080DE02C
.align 2, 0 .align 2, 0
_080DE018: .4byte gUnknown_2022BC4 _080DE018: .4byte gUnknown_2022BC4
_080DE01C: .4byte gUnknown_2023BC4 _080DE01C: .4byte gActiveBattler
_080DE020: _080DE020:
ldr r0, _080DE034 @ =gUnknown_3004FE0 ldr r0, _080DE034 @ =gUnknown_3004FE0
ldrb r1, [r6] ldrb r1, [r6]
@@ -1489,7 +1489,7 @@ SafariHandleCmd55: @ 80DE054
push {r4,lr} push {r4,lr}
ldr r2, _080DE098 @ =gUnknown_2023E8A ldr r2, _080DE098 @ =gUnknown_2023E8A
ldr r1, _080DE09C @ =gUnknown_2022BC4 ldr r1, _080DE09C @ =gUnknown_2022BC4
ldr r4, _080DE0A0 @ =gUnknown_2023BC4 ldr r4, _080DE0A0 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
lsls r0, 9 lsls r0, 9
adds r1, 0x1 adds r1, 0x1
@@ -1501,7 +1501,7 @@ SafariHandleCmd55: @ 80DE054
movs r0, 0x3 movs r0, 0x3
bl BeginFastPaletteFade bl BeginFastPaletteFade
bl SafariBufferExecCompleted bl SafariBufferExecCompleted
ldr r0, _080DE0A4 @ =gUnknown_2022B4C ldr r0, _080DE0A4 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x6 movs r1, 0x6
ands r0, r1 ands r0, r1
@@ -1520,8 +1520,8 @@ _080DE090:
.align 2, 0 .align 2, 0
_080DE098: .4byte gUnknown_2023E8A _080DE098: .4byte gUnknown_2023E8A
_080DE09C: .4byte gUnknown_2022BC4 _080DE09C: .4byte gUnknown_2022BC4
_080DE0A0: .4byte gUnknown_2023BC4 _080DE0A0: .4byte gActiveBattler
_080DE0A4: .4byte gUnknown_2022B4C _080DE0A4: .4byte gBattleTypeFlags
_080DE0A8: .4byte gUnknown_3004FE0 _080DE0A8: .4byte gUnknown_3004FE0
_080DE0AC: .4byte sub_80DD7B0 _080DE0AC: .4byte sub_80DD7B0
thumb_func_end SafariHandleCmd55 thumb_func_end SafariHandleCmd55
+79 -79
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_800D230 thumb_func_start sub_800D230
sub_800D230: @ 800D230 sub_800D230: @ 800D230
push {lr} push {lr}
ldr r0, _0800D268 @ =gUnknown_2022B4C ldr r0, _0800D268 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -34,7 +34,7 @@ _0800D262:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800D268: .4byte gUnknown_2022B4C _0800D268: .4byte gBattleTypeFlags
_0800D26C: .4byte gUnknown_3003F3C _0800D26C: .4byte gUnknown_3003F3C
_0800D270: .4byte gUnknown_3003F64 _0800D270: .4byte gUnknown_3003F64
_0800D274: .4byte sub_8081A90 _0800D274: .4byte sub_8081A90
@@ -82,7 +82,7 @@ _0800D298:
str r4, [r0] str r4, [r0]
bl ClearBattleAnimationVars bl ClearBattleAnimationVars
bl sub_8043FBC bl sub_8043FBC
bl sub_80C6D0C bl BattleAI_HandleItemUseBeforeAISetup
ldr r0, _0800D304 @ =gUnknown_2022B54 ldr r0, _0800D304 @ =gUnknown_2022B54
str r4, [r0] str r4, [r0]
ldr r0, _0800D308 @ =gUnknown_2023DDC ldr r0, _0800D308 @ =gUnknown_2023DDC
@@ -108,7 +108,7 @@ _0800D308: .4byte gUnknown_2023DDC
thumb_func_start sub_800D30C thumb_func_start sub_800D30C
sub_800D30C: @ 800D30C sub_800D30C: @ 800D30C
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _0800D320 @ =gUnknown_2022B4C ldr r0, _0800D320 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -117,12 +117,12 @@ sub_800D30C: @ 800D30C
bl sub_800D494 bl sub_800D494
b _0800D328 b _0800D328
.align 2, 0 .align 2, 0
_0800D320: .4byte gUnknown_2022B4C _0800D320: .4byte gBattleTypeFlags
_0800D324: _0800D324:
bl sub_800D364 bl sub_800D364
_0800D328: _0800D328:
bl sub_800D768 bl sub_800D768
ldr r0, _0800D35C @ =gUnknown_2022B4C ldr r0, _0800D35C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -148,14 +148,14 @@ _0800D356:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800D35C: .4byte gUnknown_2022B4C _0800D35C: .4byte gBattleTypeFlags
_0800D360: .4byte gUnknown_2023BCC _0800D360: .4byte gUnknown_2023BCC
thumb_func_end sub_800D30C thumb_func_end sub_800D30C
thumb_func_start sub_800D364 thumb_func_start sub_800D364
sub_800D364: @ 800D364 sub_800D364: @ 800D364
push {r4,lr} push {r4,lr}
ldr r0, _0800D398 @ =gUnknown_2022B4C ldr r0, _0800D398 @ =gBattleTypeFlags
ldr r2, [r0] ldr r2, [r0]
movs r4, 0x1 movs r4, 0x1
adds r3, r2, 0 adds r3, r2, 0
@@ -181,7 +181,7 @@ sub_800D364: @ 800D364
movs r0, 0x2 movs r0, 0x2
b _0800D478 b _0800D478
.align 2, 0 .align 2, 0
_0800D398: .4byte gUnknown_2022B4C _0800D398: .4byte gBattleTypeFlags
_0800D39C: .4byte gUnknown_3004F84 _0800D39C: .4byte gUnknown_3004F84
_0800D3A0: .4byte sub_80123C0 _0800D3A0: .4byte sub_80123C0
_0800D3A4: .4byte gUnknown_3004FE0 _0800D3A4: .4byte gUnknown_3004FE0
@@ -301,7 +301,7 @@ sub_800D494: @ 800D494
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
ldr r4, _0800D4D0 @ =gUnknown_2022B4C ldr r4, _0800D4D0 @ =gBattleTypeFlags
ldr r0, [r4] ldr r0, [r4]
movs r5, 0x1 movs r5, 0x1
adds r3, r0, 0 adds r3, r0, 0
@@ -327,7 +327,7 @@ sub_800D494: @ 800D494
movs r0, 0x2 movs r0, 0x2
b _0800D752 b _0800D752
.align 2, 0 .align 2, 0
_0800D4D0: .4byte gUnknown_2022B4C _0800D4D0: .4byte gBattleTypeFlags
_0800D4D4: .4byte gUnknown_3004F84 _0800D4D4: .4byte gUnknown_3004F84
_0800D4D8: .4byte sub_80123C0 _0800D4D8: .4byte sub_80123C0
_0800D4DC: .4byte gUnknown_3004FE0 _0800D4DC: .4byte gUnknown_3004FE0
@@ -433,7 +433,7 @@ _0800D5BC:
mov r12, r1 mov r12, r1
ldr r7, _0800D5F0 @ =gUnknown_2023BD6 ldr r7, _0800D5F0 @ =gUnknown_2023BD6
mov r8, r0 mov r8, r0
ldr r6, _0800D5F4 @ =gUnknown_2023BCE ldr r6, _0800D5F4 @ =gBattlerPartyIndexes
movs r4, 0 movs r4, 0
movs r2, 0x3 movs r2, 0x3
mov r9, r2 mov r9, r2
@@ -453,7 +453,7 @@ _0800D5E4: .4byte gUnknown_3004F84
_0800D5E8: .4byte sub_80123C0 _0800D5E8: .4byte sub_80123C0
_0800D5EC: .4byte gUnknown_202273C _0800D5EC: .4byte gUnknown_202273C
_0800D5F0: .4byte gUnknown_2023BD6 _0800D5F0: .4byte gUnknown_2023BD6
_0800D5F4: .4byte gUnknown_2023BCE _0800D5F4: .4byte gBattlerPartyIndexes
_0800D5F8: _0800D5F8:
cmp r0, 0x3 cmp r0, 0x3
bne _0800D61A bne _0800D61A
@@ -662,7 +662,7 @@ sub_800D768: @ 800D768
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
ldr r0, _0800D788 @ =gUnknown_2022B4C ldr r0, _0800D788 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -674,7 +674,7 @@ _0800D780:
mov r8, r0 mov r8, r0
b _0800D892 b _0800D892
.align 2, 0 .align 2, 0
_0800D788: .4byte gUnknown_2022B4C _0800D788: .4byte gBattleTypeFlags
_0800D78C: _0800D78C:
movs r5, 0 movs r5, 0
movs r0, 0x1 movs r0, 0x1
@@ -696,13 +696,13 @@ _0800D7A0:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _0800D7C0 bne _0800D7C0
ldr r0, _0800D7BC @ =gUnknown_2024284 ldr r0, _0800D7BC @ =gPlayerParty
b _0800D7C2 b _0800D7C2
.align 2, 0 .align 2, 0
_0800D7B8: .4byte gUnknown_2023BD6 _0800D7B8: .4byte gUnknown_2023BD6
_0800D7BC: .4byte gUnknown_2024284 _0800D7BC: .4byte gPlayerParty
_0800D7C0: _0800D7C0:
ldr r0, _0800D800 @ =gUnknown_202402C ldr r0, _0800D800 @ =gEnemyParty
_0800D7C2: _0800D7C2:
adds r4, r7, r0 adds r4, r7, r0
adds r0, r4, 0 adds r0, r4, 0
@@ -727,13 +727,13 @@ _0800D7C2:
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
bne _0800D888 bne _0800D888
ldr r0, _0800D804 @ =gUnknown_2023BCE ldr r0, _0800D804 @ =gBattlerPartyIndexes
adds r0, r6, r0 adds r0, r6, r0
strh r5, [r0] strh r5, [r0]
b _0800D890 b _0800D890
.align 2, 0 .align 2, 0
_0800D800: .4byte gUnknown_202402C _0800D800: .4byte gEnemyParty
_0800D804: .4byte gUnknown_2023BCE _0800D804: .4byte gBattlerPartyIndexes
_0800D808: _0800D808:
mov r0, r9 mov r0, r9
ldrb r1, [r0] ldrb r1, [r0]
@@ -741,7 +741,7 @@ _0800D808:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _0800D830 bne _0800D830
ldr r0, _0800D82C @ =gUnknown_2024284 ldr r0, _0800D82C @ =gPlayerParty
adds r4, r7, r0 adds r4, r7, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -752,9 +752,9 @@ _0800D808:
movs r1, 0xB movs r1, 0xB
b _0800D844 b _0800D844
.align 2, 0 .align 2, 0
_0800D82C: .4byte gUnknown_2024284 _0800D82C: .4byte gPlayerParty
_0800D830: _0800D830:
ldr r0, _0800D880 @ =gUnknown_202402C ldr r0, _0800D880 @ =gEnemyParty
adds r4, r7, r0 adds r4, r7, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -779,7 +779,7 @@ _0800D844:
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
bne _0800D888 bne _0800D888
ldr r1, _0800D884 @ =gUnknown_2023BCE ldr r1, _0800D884 @ =gBattlerPartyIndexes
mov r0, r8 mov r0, r8
subs r0, 0x2 subs r0, 0x2
lsls r0, 1 lsls r0, 1
@@ -791,8 +791,8 @@ _0800D844:
strh r5, [r0] strh r5, [r0]
b _0800D890 b _0800D890
.align 2, 0 .align 2, 0
_0800D880: .4byte gUnknown_202402C _0800D880: .4byte gEnemyParty
_0800D884: .4byte gUnknown_2023BCE _0800D884: .4byte gBattlerPartyIndexes
_0800D888: _0800D888:
adds r7, 0x64 adds r7, 0x64
adds r5, 0x1 adds r5, 0x1
@@ -827,7 +827,7 @@ PrepareBufferDataTransfer: @ 800D8B0
adds r5, r3, 0 adds r5, r3, 0
lsls r2, 16 lsls r2, 16
lsrs r2, 16 lsrs r2, 16
ldr r0, _0800D8D8 @ =gUnknown_2022B4C ldr r0, _0800D8D8 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -839,7 +839,7 @@ PrepareBufferDataTransfer: @ 800D8B0
bl PrepareBufferDataTransferLink bl PrepareBufferDataTransferLink
b _0800D92E b _0800D92E
.align 2, 0 .align 2, 0
_0800D8D8: .4byte gUnknown_2022B4C _0800D8D8: .4byte gBattleTypeFlags
_0800D8DC: _0800D8DC:
cmp r5, 0 cmp r5, 0
beq _0800D8E6 beq _0800D8E6
@@ -851,7 +851,7 @@ _0800D8E6:
cmp r3, r2 cmp r3, r2
bge _0800D92E bge _0800D92E
ldr r6, _0800D908 @ =gUnknown_2022BC4 ldr r6, _0800D908 @ =gUnknown_2022BC4
ldr r5, _0800D90C @ =gUnknown_2023BC4 ldr r5, _0800D90C @ =gActiveBattler
_0800D8F0: _0800D8F0:
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
@@ -866,13 +866,13 @@ _0800D8F0:
b _0800D92E b _0800D92E
.align 2, 0 .align 2, 0
_0800D908: .4byte gUnknown_2022BC4 _0800D908: .4byte gUnknown_2022BC4
_0800D90C: .4byte gUnknown_2023BC4 _0800D90C: .4byte gActiveBattler
_0800D910: _0800D910:
movs r3, 0 movs r3, 0
cmp r3, r2 cmp r3, r2
bge _0800D92E bge _0800D92E
ldr r6, _0800D934 @ =gUnknown_20233C4 ldr r6, _0800D934 @ =gUnknown_20233C4
ldr r5, _0800D938 @ =gUnknown_2023BC4 ldr r5, _0800D938 @ =gActiveBattler
_0800D91A: _0800D91A:
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 9 lsls r0, 9
@@ -890,7 +890,7 @@ _0800D92E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800D934: .4byte gUnknown_20233C4 _0800D934: .4byte gUnknown_20233C4
_0800D938: .4byte gUnknown_2023BC4 _0800D938: .4byte gActiveBattler
thumb_func_end PrepareBufferDataTransfer thumb_func_end PrepareBufferDataTransfer
thumb_func_start CreateTasksForSendRecvLinkBuffers thumb_func_start CreateTasksForSendRecvLinkBuffers
@@ -1041,7 +1041,7 @@ _0800DA3E:
ldrsh r1, [r0, r7] ldrsh r1, [r0, r7]
ldr r0, [r4] ldr r0, [r4]
adds r1, r0 adds r1, r0
ldr r0, _0800DB58 @ =gUnknown_2023BC4 ldr r0, _0800DB58 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldrb r1, [r3] ldrb r1, [r3]
@@ -1053,7 +1053,7 @@ _0800DA3E:
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
ldr r0, [r4] ldr r0, [r4]
adds r1, r0 adds r1, r0
ldr r0, _0800DB5C @ =gUnknown_2023D6B ldr r0, _0800DB5C @ =sBattler_AI
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldrb r1, [r3] ldrb r1, [r3]
@@ -1065,7 +1065,7 @@ _0800DA3E:
ldrsh r1, [r0, r7] ldrsh r1, [r0, r7]
ldr r0, [r4] ldr r0, [r4]
adds r1, r0 adds r1, r0
ldr r0, _0800DB60 @ =gUnknown_2023D6C ldr r0, _0800DB60 @ =gBattlerTarget
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1, 0x3] strb r0, [r1, 0x3]
ldrb r1, [r3] ldrb r1, [r3]
@@ -1103,7 +1103,7 @@ _0800DA3E:
ldrsh r1, [r0, r7] ldrsh r1, [r0, r7]
ldr r0, [r4] ldr r0, [r4]
adds r1, r0 adds r1, r0
ldr r0, _0800DB64 @ =gUnknown_2023D70 ldr r0, _0800DB64 @ =gAbsentBattlerFlags
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
ldrb r1, [r3] ldrb r1, [r3]
@@ -1162,10 +1162,10 @@ _0800DB2C:
_0800DB4C: .4byte gUnknown_3005090 _0800DB4C: .4byte gUnknown_3005090
_0800DB50: .4byte gUnknown_202286C _0800DB50: .4byte gUnknown_202286C
_0800DB54: .4byte gUnknown_2023FEC _0800DB54: .4byte gUnknown_2023FEC
_0800DB58: .4byte gUnknown_2023BC4 _0800DB58: .4byte gActiveBattler
_0800DB5C: .4byte gUnknown_2023D6B _0800DB5C: .4byte sBattler_AI
_0800DB60: .4byte gUnknown_2023D6C _0800DB60: .4byte gBattlerTarget
_0800DB64: .4byte gUnknown_2023D70 _0800DB64: .4byte gAbsentBattlerFlags
_0800DB68: .4byte gUnknown_2023D6E _0800DB68: .4byte gUnknown_2023D6E
thumb_func_end PrepareBufferDataTransferLink thumb_func_end PrepareBufferDataTransferLink
@@ -1242,7 +1242,7 @@ _0800DBF4:
bl GetLinkPlayerCount_2 bl GetLinkPlayerCount_2
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
ldr r0, _0800DC10 @ =gUnknown_2022B4C ldr r0, _0800DC10 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -1252,7 +1252,7 @@ _0800DBF4:
bgt _0800DC1A bgt _0800DC1A
b _0800DD20 b _0800DD20
.align 2, 0 .align 2, 0
_0800DC10: .4byte gUnknown_2022B4C _0800DC10: .4byte gBattleTypeFlags
_0800DC14: _0800DC14:
cmp r2, 0x1 cmp r2, 0x1
bgt _0800DC1A bgt _0800DC1A
@@ -1407,7 +1407,7 @@ sub_800DD28: @ 800DD28
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0800DE28 beq _0800DE28
ldr r0, _0800DD60 @ =gUnknown_2022B4C ldr r0, _0800DD60 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x20 movs r1, 0x20
ands r0, r1 ands r0, r1
@@ -1425,7 +1425,7 @@ sub_800DD28: @ 800DD28
b _0800DE1C b _0800DE1C
.align 2, 0 .align 2, 0
_0800DD5C: .4byte gUnknown_3003F64 _0800DD5C: .4byte gUnknown_3003F64
_0800DD60: .4byte gUnknown_2022B4C _0800DD60: .4byte gBattleTypeFlags
_0800DD64: .4byte gUnknown_202273C _0800DD64: .4byte gUnknown_202273C
_0800DD68: .4byte 0x00002211 _0800DD68: .4byte 0x00002211
_0800DD6C: .4byte gUnknown_2022118 _0800DD6C: .4byte gUnknown_2022118
@@ -1433,7 +1433,7 @@ _0800DD70:
bl GetBlockReceivedStatus bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _0800DE38 @ =gUnknown_825E45C ldr r2, _0800DE38 @ =gBitTable
lsls r1, r4, 2 lsls r1, r4, 2
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
@@ -1533,7 +1533,7 @@ _0800DE28:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800DE38: .4byte gUnknown_825E45C _0800DE38: .4byte gBitTable
_0800DE3C: .4byte gUnknown_202211C _0800DE3C: .4byte gUnknown_202211C
_0800DE40: .4byte gUnknown_3005090 _0800DE40: .4byte gUnknown_3005090
_0800DE44: .4byte gUnknown_202286D _0800DE44: .4byte gUnknown_202286D
@@ -1604,7 +1604,7 @@ _0800DEBC:
b _0800DF7A b _0800DF7A
_0800DEC2: _0800DEC2:
ldr r2, _0800DF2C @ =gUnknown_2023BC8 ldr r2, _0800DF2C @ =gUnknown_2023BC8
ldr r1, _0800DF30 @ =gUnknown_825E45C ldr r1, _0800DF30 @ =gBitTable
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r1 adds r0, r1
ldr r1, [r2] ldr r1, [r2]
@@ -1621,13 +1621,13 @@ _0800DEC2:
bl memcpy bl memcpy
adds r0, r4, 0 adds r0, r4, 0
bl sub_8017298 bl sub_8017298
ldr r0, _0800DF38 @ =gUnknown_2022B4C ldr r0, _0800DF38 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x4 movs r1, 0x4
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _0800DF7A bne _0800DF7A
ldr r2, _0800DF3C @ =gUnknown_2023D6B ldr r2, _0800DF3C @ =sBattler_AI
movs r4, 0x26 movs r4, 0x26
ldrsh r0, [r5, r4] ldrsh r0, [r5, r4]
mov r3, r8 mov r3, r8
@@ -1635,13 +1635,13 @@ _0800DEC2:
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
strb r0, [r2] strb r0, [r2]
ldr r2, _0800DF40 @ =gUnknown_2023D6C ldr r2, _0800DF40 @ =gBattlerTarget
movs r4, 0x26 movs r4, 0x26
ldrsh r0, [r5, r4] ldrsh r0, [r5, r4]
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x3] ldrb r0, [r0, 0x3]
strb r0, [r2] strb r0, [r2]
ldr r2, _0800DF44 @ =gUnknown_2023D70 ldr r2, _0800DF44 @ =gAbsentBattlerFlags
movs r3, 0x26 movs r3, 0x26
ldrsh r0, [r5, r3] ldrsh r0, [r5, r3]
adds r0, r1 adds r0, r1
@@ -1656,12 +1656,12 @@ _0800DEC2:
b _0800DF7A b _0800DF7A
.align 2, 0 .align 2, 0
_0800DF2C: .4byte gUnknown_2023BC8 _0800DF2C: .4byte gUnknown_2023BC8
_0800DF30: .4byte gUnknown_825E45C _0800DF30: .4byte gBitTable
_0800DF34: .4byte gUnknown_2022BC4 _0800DF34: .4byte gUnknown_2022BC4
_0800DF38: .4byte gUnknown_2022B4C _0800DF38: .4byte gBattleTypeFlags
_0800DF3C: .4byte gUnknown_2023D6B _0800DF3C: .4byte sBattler_AI
_0800DF40: .4byte gUnknown_2023D6C _0800DF40: .4byte gBattlerTarget
_0800DF44: .4byte gUnknown_2023D70 _0800DF44: .4byte gAbsentBattlerFlags
_0800DF48: .4byte gUnknown_2023D6E _0800DF48: .4byte gUnknown_2023D6E
_0800DF4C: _0800DF4C:
lsls r0, r4, 9 lsls r0, r4, 9
@@ -1677,7 +1677,7 @@ _0800DF60: .4byte gUnknown_20233C4
_0800DF64: _0800DF64:
ldrb r2, [r3, 0x8] ldrb r2, [r3, 0x8]
ldr r3, _0800DF98 @ =gUnknown_2023BC8 ldr r3, _0800DF98 @ =gUnknown_2023BC8
ldr r1, _0800DF9C @ =gUnknown_825E45C ldr r1, _0800DF9C @ =gBitTable
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r1 adds r0, r1
lsls r2, 2 lsls r2, 2
@@ -1705,7 +1705,7 @@ _0800DF8C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800DF98: .4byte gUnknown_2023BC8 _0800DF98: .4byte gUnknown_2023BC8
_0800DF9C: .4byte gUnknown_825E45C _0800DF9C: .4byte gBitTable
_0800DFA0: .4byte gUnknown_3005090 _0800DFA0: .4byte gUnknown_3005090
thumb_func_end Task_HandleCopyReceivedLinkBuffersData thumb_func_end Task_HandleCopyReceivedLinkBuffersData
@@ -2120,7 +2120,7 @@ EmitMoveAnimation: @ 800E1FC
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0800E29C bne _0800E29C
ldr r0, _0800E298 @ =gUnknown_2023F1C ldr r0, _0800E298 @ =gBattleWeather
ldrh r0, [r0] ldrh r0, [r0]
strb r0, [r7, 0xC] strb r0, [r7, 0xC]
ands r6, r0 ands r6, r0
@@ -2131,7 +2131,7 @@ EmitMoveAnimation: @ 800E1FC
.align 2, 0 .align 2, 0
_0800E290: .4byte gUnknown_2022874 _0800E290: .4byte gUnknown_2022874
_0800E294: .4byte gUnknown_2023D72 _0800E294: .4byte gUnknown_2023D72
_0800E298: .4byte gUnknown_2023F1C _0800E298: .4byte gBattleWeather
_0800E29C: _0800E29C:
ldr r0, _0800E2D0 @ =gUnknown_2022874 ldr r0, _0800E2D0 @ =gUnknown_2022874
movs r1, 0 movs r1, 0
@@ -2184,7 +2184,7 @@ EmitPrintString: @ 800E2D4
strb r1, [r2, 0x3] strb r1, [r2, 0x3]
adds r0, r2, 0x4 adds r0, r2, 0x4
mov r12, r0 mov r12, r0
ldr r4, _0800E3BC @ =gUnknown_2023D4A ldr r4, _0800E3BC @ =gCurrentMove
ldrh r0, [r4] ldrh r0, [r4]
strh r0, [r2, 0x4] strh r0, [r2, 0x4]
ldr r0, _0800E3C0 @ =gUnknown_2023D4C ldr r0, _0800E3C0 @ =gUnknown_2023D4C
@@ -2197,10 +2197,10 @@ EmitPrintString: @ 800E2D4
ldr r0, _0800E3C8 @ =gUnknown_2023D6A ldr r0, _0800E3C8 @ =gUnknown_2023D6A
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
ldr r0, _0800E3CC @ =gUnknown_2023FC4 ldr r0, _0800E3CC @ =gBattleScripting
ldrb r0, [r0, 0x17] ldrb r0, [r0, 0x17]
strb r0, [r1, 0x7] strb r0, [r1, 0x7]
ldr r0, _0800E3D0 @ =gUnknown_2023FE8 ldr r0, _0800E3D0 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r1, r0, 0 adds r1, r0, 0
adds r1, 0x52 adds r1, 0x52
@@ -2213,7 +2213,7 @@ EmitPrintString: @ 800E2D4
ldr r0, _0800E3D4 @ =gUnknown_2023D6F ldr r0, _0800E3D4 @ =gUnknown_2023D6F
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r3, 0xA] strb r0, [r3, 0xA]
ldr r3, _0800E3D8 @ =gUnknown_8250C04 ldr r3, _0800E3D8 @ =gBattleMoves
ldrh r1, [r4] ldrh r1, [r4]
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r1 adds r0, r1
@@ -2227,7 +2227,7 @@ EmitPrintString: @ 800E2D4
ldr r0, _0800E3DC @ =gUnknown_2022AD8 ldr r0, _0800E3DC @ =gUnknown_2022AD8
mov r8, r0 mov r8, r0
adds r2, 0x10 adds r2, 0x10
ldr r0, _0800E3E0 @ =gUnknown_2023BE4 ldr r0, _0800E3E0 @ =gBattleMons
adds r4, r0, 0 adds r4, r0, 0
adds r4, 0x20 adds r4, 0x20
_0800E35A: _0800E35A:
@@ -2278,16 +2278,16 @@ _0800E378:
.align 2, 0 .align 2, 0
_0800E3B4: .4byte gUnknown_2022874 _0800E3B4: .4byte gUnknown_2022874
_0800E3B8: .4byte gUnknown_2023E8A _0800E3B8: .4byte gUnknown_2023E8A
_0800E3BC: .4byte gUnknown_2023D4A _0800E3BC: .4byte gCurrentMove
_0800E3C0: .4byte gUnknown_2023D4C _0800E3C0: .4byte gUnknown_2023D4C
_0800E3C4: .4byte gUnknown_2023D68 _0800E3C4: .4byte gUnknown_2023D68
_0800E3C8: .4byte gUnknown_2023D6A _0800E3C8: .4byte gUnknown_2023D6A
_0800E3CC: .4byte gUnknown_2023FC4 _0800E3CC: .4byte gBattleScripting
_0800E3D0: .4byte gUnknown_2023FE8 _0800E3D0: .4byte gBattleStruct
_0800E3D4: .4byte gUnknown_2023D6F _0800E3D4: .4byte gUnknown_2023D6F
_0800E3D8: .4byte gUnknown_8250C04 _0800E3D8: .4byte gBattleMoves
_0800E3DC: .4byte gUnknown_2022AD8 _0800E3DC: .4byte gUnknown_2022AD8
_0800E3E0: .4byte gUnknown_2023BE4 _0800E3E0: .4byte gBattleMons
_0800E3E4: .4byte gUnknown_2022AC8 _0800E3E4: .4byte gUnknown_2022AC8
_0800E3E8: .4byte gUnknown_2022AB8 _0800E3E8: .4byte gUnknown_2022AB8
thumb_func_end EmitPrintString thumb_func_end EmitPrintString
@@ -2313,7 +2313,7 @@ EmitPrintSelectionString: @ 800E3EC
strb r1, [r2, 0x3] strb r1, [r2, 0x3]
adds r0, r2, 0x4 adds r0, r2, 0x4
mov r12, r0 mov r12, r0
ldr r0, _0800E4AC @ =gUnknown_2023D4A ldr r0, _0800E4AC @ =gCurrentMove
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r2, 0x4] strh r0, [r2, 0x4]
ldr r0, _0800E4B0 @ =gUnknown_2023D4C ldr r0, _0800E4B0 @ =gUnknown_2023D4C
@@ -2326,10 +2326,10 @@ EmitPrintSelectionString: @ 800E3EC
ldr r0, _0800E4B8 @ =gUnknown_2023D6A ldr r0, _0800E4B8 @ =gUnknown_2023D6A
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
ldr r0, _0800E4BC @ =gUnknown_2023FC4 ldr r0, _0800E4BC @ =gBattleScripting
ldrb r0, [r0, 0x17] ldrb r0, [r0, 0x17]
strb r0, [r1, 0x7] strb r0, [r1, 0x7]
ldr r0, _0800E4C0 @ =gUnknown_2023FE8 ldr r0, _0800E4C0 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x52 adds r0, 0x52
ldrb r0, [r0] ldrb r0, [r0]
@@ -2340,7 +2340,7 @@ EmitPrintSelectionString: @ 800E3EC
mov r8, r7 mov r8, r7
mov r4, r9 mov r4, r9
adds r4, 0x10 adds r4, 0x10
ldr r0, _0800E4C8 @ =gUnknown_2023BE4 ldr r0, _0800E4C8 @ =gBattleMons
adds r2, r0, 0 adds r2, r0, 0
adds r2, 0x20 adds r2, 0x20
_0800E44E: _0800E44E:
@@ -2390,14 +2390,14 @@ _0800E46C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800E4A8: .4byte gUnknown_2022874 _0800E4A8: .4byte gUnknown_2022874
_0800E4AC: .4byte gUnknown_2023D4A _0800E4AC: .4byte gCurrentMove
_0800E4B0: .4byte gUnknown_2023D4C _0800E4B0: .4byte gUnknown_2023D4C
_0800E4B4: .4byte gUnknown_2023D68 _0800E4B4: .4byte gUnknown_2023D68
_0800E4B8: .4byte gUnknown_2023D6A _0800E4B8: .4byte gUnknown_2023D6A
_0800E4BC: .4byte gUnknown_2023FC4 _0800E4BC: .4byte gBattleScripting
_0800E4C0: .4byte gUnknown_2023FE8 _0800E4C0: .4byte gBattleStruct
_0800E4C4: .4byte gUnknown_2022AD8 _0800E4C4: .4byte gUnknown_2022AD8
_0800E4C8: .4byte gUnknown_2023BE4 _0800E4C8: .4byte gBattleMons
_0800E4CC: .4byte gUnknown_2022AC8 _0800E4CC: .4byte gUnknown_2022AC8
_0800E4D0: .4byte gUnknown_2022AB8 _0800E4D0: .4byte gUnknown_2022AB8
thumb_func_end EmitPrintSelectionString thumb_func_end EmitPrintSelectionString
+60 -60
View File
@@ -196,7 +196,7 @@ InitAndLaunchChosenStatusAnimation: @ 8033F1C
lsls r0, 24 lsls r0, 24
ldr r6, _08033F50 @ =gUnknown_2024018 ldr r6, _08033F50 @ =gUnknown_2024018
ldr r1, [r6] ldr r1, [r6]
ldr r5, _08033F54 @ =gUnknown_2023BC4 ldr r5, _08033F54 @ =gActiveBattler
ldrb r2, [r5] ldrb r2, [r5]
ldr r3, [r1, 0x4] ldr r3, [r1, 0x4]
lsls r1, r2, 1 lsls r1, r2, 1
@@ -217,7 +217,7 @@ InitAndLaunchChosenStatusAnimation: @ 8033F1C
b _08034016 b _08034016
.align 2, 0 .align 2, 0
_08033F50: .4byte gUnknown_2024018 _08033F50: .4byte gUnknown_2024018
_08033F54: .4byte gUnknown_2023BC4 _08033F54: .4byte gActiveBattler
_08033F58: _08033F58:
cmp r4, 0x8 cmp r4, 0x8
beq _08033F64 beq _08033F64
@@ -666,7 +666,7 @@ mplay_80342A4: @ 80342A4
adds r1, 0x1 adds r1, 0x1
strb r1, [r0, 0x8] strb r1, [r0, 0x8]
ldr r2, [r2] ldr r2, [r2]
ldr r0, _080342F8 @ =gUnknown_2023BC4 ldr r0, _080342F8 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, [r2, 0x4] ldr r2, [r2, 0x4]
lsls r0, r1, 1 lsls r0, r1, 1
@@ -688,7 +688,7 @@ _080342F0:
b _08034316 b _08034316
.align 2, 0 .align 2, 0
_080342F4: .4byte gUnknown_2024018 _080342F4: .4byte gUnknown_2024018
_080342F8: .4byte gUnknown_2023BC4 _080342F8: .4byte gActiveBattler
_080342FC: .4byte gMPlay_SE1 _080342FC: .4byte gMPlay_SE1
_08034300: .4byte gMPlay_SE2 _08034300: .4byte gMPlay_SE2
_08034304: _08034304:
@@ -822,7 +822,7 @@ _080343DA:
movs r7, 0x80 movs r7, 0x80
lsls r7, 1 lsls r7, 1
add r7, r9 add r7, r9
ldr r5, _0803447C @ =gUnknown_2023FE8 ldr r5, _0803447C @ =gBattleStruct
ldr r1, [r5] ldr r1, [r5]
movs r4, 0x80 movs r4, 0x80
lsls r4, 1 lsls r4, 1
@@ -871,7 +871,7 @@ _08034468:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08034478: .4byte 0x00000181 _08034478: .4byte 0x00000181
_0803447C: .4byte gUnknown_2023FE8 _0803447C: .4byte gBattleStruct
_08034480: .4byte gUnknown_2024024 _08034480: .4byte gUnknown_2024024
_08034484: .4byte gUnknown_2024018 _08034484: .4byte gUnknown_2024018
_08034488: .4byte 0x00007fff _08034488: .4byte 0x00007fff
@@ -1028,7 +1028,7 @@ _0803459A:
movs r7, 0x80 movs r7, 0x80
lsls r7, 1 lsls r7, 1
add r7, r9 add r7, r9
ldr r5, _0803463C @ =gUnknown_2023FE8 ldr r5, _0803463C @ =gBattleStruct
ldr r1, [r5] ldr r1, [r5]
movs r4, 0x80 movs r4, 0x80
lsls r4, 1 lsls r4, 1
@@ -1076,7 +1076,7 @@ _08034626:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08034638: .4byte 0x00000181 _08034638: .4byte 0x00000181
_0803463C: .4byte gUnknown_2023FE8 _0803463C: .4byte gBattleStruct
_08034640: .4byte gUnknown_2024024 _08034640: .4byte gUnknown_2024024
_08034644: .4byte gUnknown_2024018 _08034644: .4byte gUnknown_2024018
_08034648: .4byte 0x00007fff _08034648: .4byte 0x00007fff
@@ -1342,7 +1342,7 @@ _08034864:
bne _080348CC bne _080348CC
cmp r4, 0x2 cmp r4, 0x2
bne _0803489C bne _0803489C
ldr r0, _08034888 @ =gUnknown_2022B4C ldr r0, _08034888 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
ands r0, r1 ands r0, r1
@@ -1352,7 +1352,7 @@ _08034864:
bl sub_800F034 bl sub_800F034
b _0803495A b _0803495A
.align 2, 0 .align 2, 0
_08034888: .4byte gUnknown_2022B4C _08034888: .4byte gBattleTypeFlags
_0803488C: .4byte gUnknown_8260238 _0803488C: .4byte gUnknown_8260238
_08034890: _08034890:
ldr r0, _08034898 @ =gUnknown_8260208 ldr r0, _08034898 @ =gUnknown_8260208
@@ -1524,7 +1524,7 @@ _080349D4:
strb r0, [r4] strb r0, [r4]
b _08034AF2 b _08034AF2
_080349DC: _080349DC:
ldr r0, _080349F4 @ =gUnknown_2022B4C ldr r0, _080349F4 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
ands r0, r1 ands r0, r1
@@ -1536,7 +1536,7 @@ _080349DC:
bl CreateSafariPlayerHealthboxSprites bl CreateSafariPlayerHealthboxSprites
b _080349FE b _080349FE
.align 2, 0 .align 2, 0
_080349F4: .4byte gUnknown_2022B4C _080349F4: .4byte gBattleTypeFlags
_080349F8: _080349F8:
ldrb r0, [r4] ldrb r0, [r4]
bl CreateBankHealthboxSprites bl CreateBankHealthboxSprites
@@ -1581,7 +1581,7 @@ _08034A48:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08034A90 bne _08034A90
ldr r0, _08034A80 @ =gUnknown_2022B4C ldr r0, _08034A80 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
ands r0, r1 ands r0, r1
@@ -1591,34 +1591,34 @@ _08034A48:
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _08034A88 @ =gUnknown_2023BCE ldr r2, _08034A88 @ =gBattlerPartyIndexes
lsls r1, 1 lsls r1, 1
adds r1, r2 adds r1, r2
ldrh r2, [r1] ldrh r2, [r1]
movs r1, 0x64 movs r1, 0x64
muls r1, r2 muls r1, r2
ldr r2, _08034A8C @ =gUnknown_2024284 ldr r2, _08034A8C @ =gPlayerParty
adds r1, r2 adds r1, r2
movs r2, 0 movs r2, 0
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
b _08034AAE b _08034AAE
.align 2, 0 .align 2, 0
_08034A80: .4byte gUnknown_2022B4C _08034A80: .4byte gBattleTypeFlags
_08034A84: .4byte gUnknown_3004FF0 _08034A84: .4byte gUnknown_3004FF0
_08034A88: .4byte gUnknown_2023BCE _08034A88: .4byte gBattlerPartyIndexes
_08034A8C: .4byte gUnknown_2024284 _08034A8C: .4byte gPlayerParty
_08034A90: _08034A90:
ldr r0, _08034AD8 @ =gUnknown_3004FF0 ldr r0, _08034AD8 @ =gUnknown_3004FF0
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _08034ADC @ =gUnknown_2023BCE ldr r2, _08034ADC @ =gBattlerPartyIndexes
lsls r1, 1 lsls r1, 1
adds r1, r2 adds r1, r2
ldrh r2, [r1] ldrh r2, [r1]
movs r1, 0x64 movs r1, 0x64
muls r1, r2 muls r1, r2
ldr r2, _08034AE0 @ =gUnknown_202402C ldr r2, _08034AE0 @ =gEnemyParty
adds r1, r2 adds r1, r2
movs r2, 0 movs r2, 0
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
@@ -1648,8 +1648,8 @@ _08034AD0:
b _08034AF2 b _08034AF2
.align 2, 0 .align 2, 0
_08034AD8: .4byte gUnknown_3004FF0 _08034AD8: .4byte gUnknown_3004FF0
_08034ADC: .4byte gUnknown_2023BCE _08034ADC: .4byte gBattlerPartyIndexes
_08034AE0: .4byte gUnknown_202402C _08034AE0: .4byte gEnemyParty
_08034AE4: .4byte gUnknown_2023BCC _08034AE4: .4byte gUnknown_2023BCC
_08034AE8: _08034AE8:
bl LoadAndCreateEnemyShadowSprites bl LoadAndCreateEnemyShadowSprites
@@ -1817,7 +1817,7 @@ _08034C16:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r10, r0 mov r10, r0
ldr r0, _08034D58 @ =gUnknown_2023BCE ldr r0, _08034D58 @ =gBattlerPartyIndexes
mov r1, r9 mov r1, r9
lsls r1, 1 lsls r1, 1
adds r0, r1, r0 adds r0, r1, r0
@@ -1825,7 +1825,7 @@ _08034C16:
ldrh r0, [r0] ldrh r0, [r0]
movs r2, 0x64 movs r2, 0x64
muls r0, r2 muls r0, r2
ldr r3, _08034D5C @ =gUnknown_202402C ldr r3, _08034D5C @ =gEnemyParty
adds r0, r3 adds r0, r3
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -1836,7 +1836,7 @@ _08034C16:
ldrh r0, [r1] ldrh r0, [r1]
movs r2, 0x64 movs r2, 0x64
muls r0, r2 muls r0, r2
ldr r3, _08034D5C @ =gUnknown_202402C ldr r3, _08034D5C @ =gEnemyParty
adds r0, r3 adds r0, r3
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -1845,7 +1845,7 @@ _08034C16:
ldrh r0, [r1] ldrh r0, [r1]
movs r2, 0x64 movs r2, 0x64
muls r0, r2 muls r0, r2
ldr r3, _08034D5C @ =gUnknown_202402C ldr r3, _08034D5C @ =gEnemyParty
adds r0, r3 adds r0, r3
movs r1, 0x1 movs r1, 0x1
bl GetMonData bl GetMonData
@@ -1935,7 +1935,7 @@ _08034C16:
ldrh r0, [r2] ldrh r0, [r2]
movs r3, 0x64 movs r3, 0x64
muls r0, r3 muls r0, r3
ldr r1, _08034D5C @ =gUnknown_202402C ldr r1, _08034D5C @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
mov r2, r8 mov r2, r8
@@ -1951,7 +1951,7 @@ _08034C16:
ldrh r1, [r2] ldrh r1, [r2]
movs r3, 0x64 movs r3, 0x64
muls r1, r3 muls r1, r3
ldr r2, _08034D5C @ =gUnknown_202402C ldr r2, _08034D5C @ =gEnemyParty
adds r1, r2 adds r1, r2
bl sub_80496C0 bl sub_80496C0
ldrb r0, [r4] ldrb r0, [r4]
@@ -1959,8 +1959,8 @@ _08034C16:
bl sub_804981C bl sub_804981C
b _08035062 b _08035062
.align 2, 0 .align 2, 0
_08034D58: .4byte gUnknown_2023BCE _08034D58: .4byte gBattlerPartyIndexes
_08034D5C: .4byte gUnknown_202402C _08034D5C: .4byte gEnemyParty
_08034D60: .4byte gUnknown_82350AC _08034D60: .4byte gUnknown_82350AC
_08034D64: .4byte gUnknown_202401C _08034D64: .4byte gUnknown_202401C
_08034D68: .4byte gSprites _08034D68: .4byte gSprites
@@ -1995,7 +1995,7 @@ _08034D88:
adds r0, r2 adds r0, r2
lsrs r0, 16 lsrs r0, 16
mov r10, r0 mov r10, r0
ldr r2, _08034E34 @ =gUnknown_2023FE8 ldr r2, _08034E34 @ =gBattleStruct
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0, 0x8] ldr r0, [r0, 0x8]
ldrh r1, [r0] ldrh r1, [r0]
@@ -2051,7 +2051,7 @@ _08034E0E:
_08034E28: .4byte gUnknown_2023D44 _08034E28: .4byte gUnknown_2023D44
_08034E2C: .4byte gSprites _08034E2C: .4byte gSprites
_08034E30: .4byte gUnknown_2024018 _08034E30: .4byte gUnknown_2024018
_08034E34: .4byte gUnknown_2023FE8 _08034E34: .4byte gBattleStruct
_08034E38: .4byte gUnknown_2024024 _08034E38: .4byte gUnknown_2024024
_08034E3C: .4byte 0x00007fff _08034E3C: .4byte 0x00007fff
_08034E40: .4byte gUnknown_20375F8 _08034E40: .4byte gUnknown_20375F8
@@ -2069,27 +2069,27 @@ _08034E4C:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _08034E80 bne _08034E80
ldr r1, _08034E78 @ =gUnknown_2023BCE ldr r1, _08034E78 @ =gBattlerPartyIndexes
ldr r2, [sp] ldr r2, [sp]
lsls r0, r2, 1 lsls r0, r2, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08034E7C @ =gUnknown_202402C ldr r1, _08034E7C @ =gEnemyParty
b _08034E90 b _08034E90
.align 2, 0 .align 2, 0
_08034E78: .4byte gUnknown_2023BCE _08034E78: .4byte gBattlerPartyIndexes
_08034E7C: .4byte gUnknown_202402C _08034E7C: .4byte gEnemyParty
_08034E80: _08034E80:
ldr r1, _08034EFC @ =gUnknown_2023BCE ldr r1, _08034EFC @ =gBattlerPartyIndexes
ldr r3, [sp] ldr r3, [sp]
lsls r0, r3, 1 lsls r0, r3, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08034F00 @ =gUnknown_2024284 ldr r1, _08034F00 @ =gPlayerParty
_08034E90: _08034E90:
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
@@ -2102,14 +2102,14 @@ _08034E90:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08034F10 bne _08034F10
ldr r0, _08034EFC @ =gUnknown_2023BCE ldr r0, _08034EFC @ =gBattlerPartyIndexes
mov r1, r9 mov r1, r9
lsls r4, r1, 1 lsls r4, r1, 1
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
movs r7, 0x64 movs r7, 0x64
muls r0, r7 muls r0, r7
ldr r5, _08034F00 @ =gUnknown_2024284 ldr r5, _08034F00 @ =gPlayerParty
adds r0, r5 adds r0, r5
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -2140,20 +2140,20 @@ _08034E90:
bl HandleLoadSpecialPokePic_DontHandleDeoxys bl HandleLoadSpecialPokePic_DontHandleDeoxys
b _08034F5E b _08034F5E
.align 2, 0 .align 2, 0
_08034EFC: .4byte gUnknown_2023BCE _08034EFC: .4byte gBattlerPartyIndexes
_08034F00: .4byte gUnknown_2024284 _08034F00: .4byte gPlayerParty
_08034F04: .4byte gUnknown_823654C _08034F04: .4byte gUnknown_823654C
_08034F08: .4byte gUnknown_202401C _08034F08: .4byte gUnknown_202401C
_08034F0C: .4byte gUnknown_2024008 _08034F0C: .4byte gUnknown_2024008
_08034F10: _08034F10:
ldr r0, _08035074 @ =gUnknown_2023BCE ldr r0, _08035074 @ =gBattlerPartyIndexes
mov r1, r9 mov r1, r9
lsls r4, r1, 1 lsls r4, r1, 1
adds r4, r0 adds r4, r0
ldrh r0, [r4] ldrh r0, [r4]
movs r7, 0x64 movs r7, 0x64
muls r0, r7 muls r0, r7
ldr r5, _08035078 @ =gUnknown_202402C ldr r5, _08035078 @ =gEnemyParty
adds r0, r5 adds r0, r5
movs r1, 0 movs r1, 0
bl GetMonData bl GetMonData
@@ -2237,7 +2237,7 @@ _08034F5E:
ldr r0, _0803509C @ =0x00000181 ldr r0, _0803509C @ =0x00000181
cmp r8, r0 cmp r8, r0
bne _08034FFC bne _08034FFC
ldr r5, _080350A0 @ =gUnknown_2023FE8 ldr r5, _080350A0 @ =gBattleStruct
ldr r1, [r5] ldr r1, [r5]
movs r4, 0x80 movs r4, 0x80
lsls r4, 1 lsls r4, 1
@@ -2313,8 +2313,8 @@ _08035062:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08035074: .4byte gUnknown_2023BCE _08035074: .4byte gBattlerPartyIndexes
_08035078: .4byte gUnknown_202402C _08035078: .4byte gEnemyParty
_0803507C: .4byte gUnknown_82350AC _0803507C: .4byte gUnknown_82350AC
_08035080: .4byte gUnknown_202401C _08035080: .4byte gUnknown_202401C
_08035084: .4byte gUnknown_2024008 _08035084: .4byte gUnknown_2024008
@@ -2324,7 +2324,7 @@ _08035090: .4byte 0x06010000
_08035094: .4byte 0x040000d4 _08035094: .4byte 0x040000d4
_08035098: .4byte 0x84000200 _08035098: .4byte 0x84000200
_0803509C: .4byte 0x00000181 _0803509C: .4byte 0x00000181
_080350A0: .4byte gUnknown_2023FE8 _080350A0: .4byte gBattleStruct
_080350A4: .4byte gUnknown_2024024 _080350A4: .4byte gUnknown_2024024
_080350A8: .4byte 0x00007fff _080350A8: .4byte 0x00007fff
_080350AC: .4byte gUnknown_20375F8 _080350AC: .4byte gUnknown_20375F8
@@ -2412,28 +2412,28 @@ _08035158:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08035184 beq _08035184
ldr r1, _0803517C @ =gUnknown_2023BCE ldr r1, _0803517C @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08035180 @ =gUnknown_202402C ldr r1, _08035180 @ =gEnemyParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
bl BattleLoadOpponentMonSpriteGfx bl BattleLoadOpponentMonSpriteGfx
b _0803519A b _0803519A
.align 2, 0 .align 2, 0
_0803517C: .4byte gUnknown_2023BCE _0803517C: .4byte gBattlerPartyIndexes
_08035180: .4byte gUnknown_202402C _08035180: .4byte gEnemyParty
_08035184: _08035184:
ldr r1, _080351A0 @ =gUnknown_2023BCE ldr r1, _080351A0 @ =gBattlerPartyIndexes
lsls r0, r6, 1 lsls r0, r6, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080351A4 @ =gUnknown_2024284 ldr r1, _080351A4 @ =gPlayerParty
adds r0, r1 adds r0, r1
adds r1, r6, 0 adds r1, r6, 0
bl sub_8034498 bl sub_8034498
@@ -2442,8 +2442,8 @@ _0803519A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080351A0: .4byte gUnknown_2023BCE _080351A0: .4byte gBattlerPartyIndexes
_080351A4: .4byte gUnknown_2024284 _080351A4: .4byte gPlayerParty
thumb_func_end sub_80350BC thumb_func_end sub_80350BC
thumb_func_start LoadBattleMonGfxAndAnimate thumb_func_start LoadBattleMonGfxAndAnimate
@@ -2729,7 +2729,7 @@ sub_803539C: @ 803539C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r9, r0 mov r9, r0
ldr r5, _08035448 @ =gUnknown_2023BCE ldr r5, _08035448 @ =gBattlerPartyIndexes
mov r1, r8 mov r1, r8
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r5 adds r0, r5
@@ -2748,7 +2748,7 @@ sub_803539C: @ 803539C
movs r7, 0x64 movs r7, 0x64
adds r0, r4, 0 adds r0, r4, 0
muls r0, r7 muls r0, r7
ldr r6, _0803544C @ =gUnknown_2024284 ldr r6, _0803544C @ =gPlayerParty
adds r4, r0, r6 adds r4, r0, r6
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -2784,8 +2784,8 @@ _08035432:
.align 2, 0 .align 2, 0
_08035440: .4byte gMain _08035440: .4byte gMain
_08035444: .4byte 0x00000439 _08035444: .4byte 0x00000439
_08035448: .4byte gUnknown_2023BCE _08035448: .4byte gBattlerPartyIndexes
_0803544C: .4byte gUnknown_2024284 _0803544C: .4byte gPlayerParty
thumb_func_end sub_803539C thumb_func_end sub_803539C
thumb_func_start sub_8035450 thumb_func_start sub_8035450
+46 -46
View File
@@ -1844,7 +1844,7 @@ _08048966:
ldrh r4, [r0, 0x38] ldrh r4, [r0, 0x38]
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r5, _08048A04 @ =gUnknown_2023FE8 ldr r5, _08048A04 @ =gBattleStruct
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x7C adds r0, 0x7C
ldrb r1, [r0] ldrb r1, [r0]
@@ -1909,7 +1909,7 @@ _080489D0:
_080489F8: .4byte 0x04000008 _080489F8: .4byte 0x04000008
_080489FC: .4byte gSprites _080489FC: .4byte gSprites
_08048A00: .4byte 0x06010000 _08048A00: .4byte 0x06010000
_08048A04: .4byte gUnknown_2023FE8 _08048A04: .4byte gBattleStruct
_08048A08: .4byte gUnknown_202401C _08048A08: .4byte gUnknown_202401C
_08048A0C: _08048A0C:
ldr r0, [r5] ldr r0, [r5]
@@ -1963,7 +1963,7 @@ sub_8048A4C: @ 8048A4C
_08048A66: _08048A66:
ldr r1, _08048B7C @ =gSprites ldr r1, _08048B7C @ =gSprites
mov r10, r1 mov r10, r1
ldr r2, _08048B80 @ =gUnknown_2023BCE ldr r2, _08048B80 @ =gBattlerPartyIndexes
mov r8, r2 mov r8, r2
_08048A6E: _08048A6E:
ldr r0, _08048B84 @ =gUnknown_3004FF0 ldr r0, _08048B84 @ =gUnknown_3004FF0
@@ -2042,7 +2042,7 @@ _08048ABA:
bne _08048B08 bne _08048B08
b _08048CE0 b _08048CE0
_08048B08: _08048B08:
ldr r0, _08048B90 @ =gUnknown_2022B4C ldr r0, _08048B90 @ =gBattleTypeFlags
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x80 movs r0, 0x80
ands r2, r0 ands r2, r0
@@ -2078,7 +2078,7 @@ _08048B16:
ldrh r0, [r1] ldrh r0, [r1]
movs r2, 0x64 movs r2, 0x64
muls r0, r2 muls r0, r2
ldr r1, _08048B9C @ =gUnknown_2024284 ldr r1, _08048B9C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x39 movs r1, 0x39
bl GetMonData bl GetMonData
@@ -2093,19 +2093,19 @@ _08048B16:
ldrh r0, [r2] ldrh r0, [r2]
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r2, _08048B9C @ =gUnknown_2024284 ldr r2, _08048B9C @ =gPlayerParty
b _08048C6E b _08048C6E
.align 2, 0 .align 2, 0
_08048B78: .4byte gUnknown_2023BCC _08048B78: .4byte gUnknown_2023BCC
_08048B7C: .4byte gSprites _08048B7C: .4byte gSprites
_08048B80: .4byte gUnknown_2023BCE _08048B80: .4byte gBattlerPartyIndexes
_08048B84: .4byte gUnknown_3004FF0 _08048B84: .4byte gUnknown_3004FF0
_08048B88: .4byte SpriteCallbackDummy _08048B88: .4byte SpriteCallbackDummy
_08048B8C: .4byte gUnknown_2024018 _08048B8C: .4byte gUnknown_2024018
_08048B90: .4byte gUnknown_2022B4C _08048B90: .4byte gBattleTypeFlags
_08048B94: .4byte 0x06010000 _08048B94: .4byte 0x06010000
_08048B98: .4byte 0x05000040 _08048B98: .4byte 0x05000040
_08048B9C: .4byte gUnknown_2024284 _08048B9C: .4byte gPlayerParty
_08048BA0: _08048BA0:
ldrb r0, [r6] ldrb r0, [r6]
bl UpdateStatusIconInHealthbox bl UpdateStatusIconInHealthbox
@@ -2114,7 +2114,7 @@ _08048BA0:
ldrh r1, [r2] ldrh r1, [r2]
movs r2, 0x64 movs r2, 0x64
muls r1, r2 muls r1, r2
ldr r2, _08048BDC @ =gUnknown_2024284 ldr r2, _08048BDC @ =gPlayerParty
adds r1, r2 adds r1, r2
movs r2, 0x5 movs r2, 0x5
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
@@ -2134,13 +2134,13 @@ _08048BA0:
bl CpuSet bl CpuSet
b _08048CCA b _08048CCA
.align 2, 0 .align 2, 0
_08048BDC: .4byte gUnknown_2024284 _08048BDC: .4byte gPlayerParty
_08048BE0: .4byte 0x06010680 _08048BE0: .4byte 0x06010680
_08048BE4: .4byte 0x04000008 _08048BE4: .4byte 0x04000008
_08048BE8: _08048BE8:
cmp r4, 0x1 cmp r4, 0x1
bne _08048C94 bne _08048C94
ldr r0, _08048C0C @ =gUnknown_2022B4C ldr r0, _08048C0C @ =gBattleTypeFlags
ldr r2, [r0] ldr r2, [r0]
movs r0, 0x80 movs r0, 0x80
ands r2, r0 ands r2, r0
@@ -2151,13 +2151,13 @@ _08048BE8:
ldrh r1, [r2] ldrh r1, [r2]
movs r2, 0x64 movs r2, 0x64
muls r1, r2 muls r1, r2
ldr r2, _08048C10 @ =gUnknown_202402C ldr r2, _08048C10 @ =gEnemyParty
adds r1, r2 adds r1, r2
bl sub_80487F8 bl sub_80487F8
b _08048CCA b _08048CCA
.align 2, 0 .align 2, 0
_08048C0C: .4byte gUnknown_2022B4C _08048C0C: .4byte gBattleTypeFlags
_08048C10: .4byte gUnknown_202402C _08048C10: .4byte gEnemyParty
_08048C14: _08048C14:
ldrb r1, [r6] ldrb r1, [r6]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -2185,7 +2185,7 @@ _08048C14:
ldrh r0, [r1] ldrh r0, [r1]
movs r2, 0x64 movs r2, 0x64
muls r0, r2 muls r0, r2
ldr r1, _08048C90 @ =gUnknown_202402C ldr r1, _08048C90 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x39 movs r1, 0x39
bl GetMonData bl GetMonData
@@ -2200,7 +2200,7 @@ _08048C14:
ldrh r0, [r2] ldrh r0, [r2]
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r2, _08048C90 @ =gUnknown_202402C ldr r2, _08048C90 @ =gEnemyParty
_08048C6E: _08048C6E:
adds r0, r2 adds r0, r2
movs r1, 0x3A movs r1, 0x3A
@@ -2215,7 +2215,7 @@ _08048C6E:
.align 2, 0 .align 2, 0
_08048C88: .4byte 0x06010000 _08048C88: .4byte 0x06010000
_08048C8C: .4byte 0x05000040 _08048C8C: .4byte 0x05000040
_08048C90: .4byte gUnknown_202402C _08048C90: .4byte gEnemyParty
_08048C94: _08048C94:
ldrb r0, [r6] ldrb r0, [r6]
bl UpdateStatusIconInHealthbox bl UpdateStatusIconInHealthbox
@@ -2224,11 +2224,11 @@ _08048C94:
ldrh r1, [r2] ldrh r1, [r2]
movs r5, 0x64 movs r5, 0x64
muls r1, r5 muls r1, r5
ldr r4, _08048D04 @ =gUnknown_202402C ldr r4, _08048D04 @ =gEnemyParty
adds r1, r4 adds r1, r4
movs r2, 0x5 movs r2, 0x5
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
ldr r0, _08048D08 @ =gUnknown_2022B4C ldr r0, _08048D08 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
ands r0, r1 ands r0, r1
@@ -2273,8 +2273,8 @@ _08048CF2:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08048D04: .4byte gUnknown_202402C _08048D04: .4byte gEnemyParty
_08048D08: .4byte gUnknown_2022B4C _08048D08: .4byte gBattleTypeFlags
_08048D0C: .4byte gUnknown_3004FF0 _08048D0C: .4byte gUnknown_3004FF0
_08048D10: .4byte gUnknown_2023BCC _08048D10: .4byte gUnknown_2023BCC
thumb_func_end sub_8048A4C thumb_func_end sub_8048A4C
@@ -2593,7 +2593,7 @@ _08048F86:
cmp r0, 0 cmp r0, 0
bne _0804906E bne _0804906E
movs r6, 0 movs r6, 0
ldr r5, _08048FD8 @ =gUnknown_2022B4C ldr r5, _08048FD8 @ =gBattleTypeFlags
mov r10, r5 mov r10, r5
ldr r0, _08048FDC @ =0x0000ffff ldr r0, _08048FDC @ =0x0000ffff
mov r9, r0 mov r9, r0
@@ -2628,7 +2628,7 @@ _08048FAA:
b _08049056 b _08049056
.align 2, 0 .align 2, 0
_08048FD4: .4byte 0x0000ff88 _08048FD4: .4byte 0x0000ff88
_08048FD8: .4byte gUnknown_2022B4C _08048FD8: .4byte gBattleTypeFlags
_08048FDC: .4byte 0x0000ffff _08048FDC: .4byte 0x0000ffff
_08048FE0: .4byte gSprites _08048FE0: .4byte gSprites
_08048FE4: .4byte 0x000003ff _08048FE4: .4byte 0x000003ff
@@ -2706,7 +2706,7 @@ _08049062:
b _08049148 b _08049148
_0804906E: _0804906E:
movs r6, 0 movs r6, 0
ldr r1, _080490B4 @ =gUnknown_2022B4C ldr r1, _080490B4 @ =gBattleTypeFlags
mov r10, r1 mov r10, r1
ldr r2, _080490B8 @ =0x0000ffff ldr r2, _080490B8 @ =0x0000ffff
mov r9, r2 mov r9, r2
@@ -2741,7 +2741,7 @@ _08049088:
adds r1, 0x3 adds r1, 0x3
b _08049132 b _08049132
.align 2, 0 .align 2, 0
_080490B4: .4byte gUnknown_2022B4C _080490B4: .4byte gBattleTypeFlags
_080490B8: .4byte 0x0000ffff _080490B8: .4byte 0x0000ffff
_080490BC: .4byte gSprites _080490BC: .4byte gSprites
_080490C0: .4byte 0x000003ff _080490C0: .4byte 0x000003ff
@@ -3721,7 +3721,7 @@ sub_804981C: @ 804981C
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
mov r10, r1 mov r10, r1
ldr r0, _080498DC @ =gUnknown_2022B4C ldr r0, _080498DC @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
ldr r0, _080498E0 @ =0x00010210 ldr r0, _080498E0 @ =0x00010210
ands r0, r1 ands r0, r1
@@ -3746,13 +3746,13 @@ sub_804981C: @ 804981C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0804991C beq _0804991C
ldr r1, _080498E8 @ =gUnknown_2023BCE ldr r1, _080498E8 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r5, r0, r1 adds r5, r0, r1
ldrh r0, [r5] ldrh r0, [r5]
movs r7, 0x64 movs r7, 0x64
muls r0, r7 muls r0, r7
ldr r6, _080498EC @ =gUnknown_202402C ldr r6, _080498EC @ =gEnemyParty
adds r0, r6 adds r0, r6
adds r1, r4, 0 adds r1, r4, 0
bl sub_80448F8 bl sub_80448F8
@@ -3799,11 +3799,11 @@ sub_804981C: @ 804981C
bl CpuSet bl CpuSet
b _0804991C b _0804991C
.align 2, 0 .align 2, 0
_080498DC: .4byte gUnknown_2022B4C _080498DC: .4byte gBattleTypeFlags
_080498E0: .4byte 0x00010210 _080498E0: .4byte 0x00010210
_080498E4: .4byte gSprites _080498E4: .4byte gSprites
_080498E8: .4byte gUnknown_2023BCE _080498E8: .4byte gBattlerPartyIndexes
_080498EC: .4byte gUnknown_202402C _080498EC: .4byte gEnemyParty
_080498F0: .4byte 0x06010000 _080498F0: .4byte 0x06010000
_080498F4: .4byte 0x04000008 _080498F4: .4byte 0x04000008
_080498F8: _080498F8:
@@ -3866,13 +3866,13 @@ UpdateStatusIconInHealthbox: @ 8049934
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080499A4 bne _080499A4
ldr r1, _0804999C @ =gUnknown_2023BCE ldr r1, _0804999C @ =gBattlerPartyIndexes
lsls r0, r7, 1 lsls r0, r7, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080499A0 @ =gUnknown_2024284 ldr r1, _080499A0 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x37 movs r1, 0x37
bl GetMonData bl GetMonData
@@ -3888,16 +3888,16 @@ UpdateStatusIconInHealthbox: @ 8049934
b _080499C0 b _080499C0
.align 2, 0 .align 2, 0
_08049998: .4byte gSprites _08049998: .4byte gSprites
_0804999C: .4byte gUnknown_2023BCE _0804999C: .4byte gBattlerPartyIndexes
_080499A0: .4byte gUnknown_2024284 _080499A0: .4byte gPlayerParty
_080499A4: _080499A4:
ldr r1, _080499E0 @ =gUnknown_2023BCE ldr r1, _080499E0 @ =gBattlerPartyIndexes
lsls r0, r7, 1 lsls r0, r7, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080499E4 @ =gUnknown_202402C ldr r1, _080499E4 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x37 movs r1, 0x37
bl GetMonData bl GetMonData
@@ -3919,8 +3919,8 @@ _080499C0:
movs r0, 0x2 movs r0, 0x2
b _08049AF4 b _08049AF4
.align 2, 0 .align 2, 0
_080499E0: .4byte gUnknown_2023BCE _080499E0: .4byte gBattlerPartyIndexes
_080499E4: .4byte gUnknown_202402C _080499E4: .4byte gEnemyParty
_080499E8: _080499E8:
movs r0, 0x88 movs r0, 0x88
ands r0, r4 ands r0, r4
@@ -4502,7 +4502,7 @@ _08049E96:
ldr r0, _08049F48 @ =gUnknown_8253AE4 ldr r0, _08049F48 @ =gUnknown_8253AE4
mov r12, r0 mov r12, r0
lsls r1, r4, 2 lsls r1, r4, 2
ldr r2, _08049F4C @ =gUnknown_8254784 ldr r2, _08049F4C @ =gBaseStats
lsls r0, r5, 3 lsls r0, r5, 3
subs r0, r5 subs r0, r5
lsls r0, 2 lsls r0, 2
@@ -4566,7 +4566,7 @@ _08049F2E:
.align 2, 0 .align 2, 0
_08049F44: .4byte gSprites _08049F44: .4byte gSprites
_08049F48: .4byte gUnknown_8253AE4 _08049F48: .4byte gUnknown_8253AE4
_08049F4C: .4byte gUnknown_8254784 _08049F4C: .4byte gBaseStats
_08049F50: _08049F50:
cmp r7, 0x3 cmp r7, 0x3
beq _08049F58 beq _08049F58
@@ -4911,13 +4911,13 @@ _0804A1D8:
movs r4, 0x8 movs r4, 0x8
str r4, [sp, 0x4] str r4, [sp, 0x4]
bl sub_804A3C4 bl sub_804A3C4
ldr r1, _0804A280 @ =gUnknown_2023BCE ldr r1, _0804A280 @ =gBattlerPartyIndexes
lsls r0, r6, 1 lsls r0, r6, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0804A284 @ =gUnknown_2024284 ldr r1, _0804A284 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x38 movs r1, 0x38
bl GetMonData bl GetMonData
@@ -4978,8 +4978,8 @@ _0804A23A:
b _0804A2CC b _0804A2CC
.align 2, 0 .align 2, 0
_0804A27C: .4byte gUnknown_2024018 _0804A27C: .4byte gUnknown_2024018
_0804A280: .4byte gUnknown_2023BCE _0804A280: .4byte gBattlerPartyIndexes
_0804A284: .4byte gUnknown_2024284 _0804A284: .4byte gPlayerParty
_0804A288: .4byte gSprites _0804A288: .4byte gSprites
_0804A28C: .4byte 0x06010000 _0804A28C: .4byte 0x06010000
_0804A290: .4byte 0x04000008 _0804A290: .4byte 0x04000008
+218 -218
View File
File diff suppressed because it is too large Load Diff
+2986 -2986
View File
File diff suppressed because it is too large Load Diff
+64 -64
View File
@@ -163,7 +163,7 @@ sub_807F748: @ 807F748
ldr r1, _0807F780 @ =gMain ldr r1, _0807F780 @ =gMain
ldr r0, _0807F784 @ =sub_807FB40 ldr r0, _0807F784 @ =sub_807FB40
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807F788 @ =gUnknown_2022B4C ldr r1, _0807F788 @ =gBattleTypeFlags
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
bl GetWildBattleTransition bl GetWildBattleTransition
@@ -180,7 +180,7 @@ sub_807F748: @ 807F748
.align 2, 0 .align 2, 0
_0807F780: .4byte gMain _0807F780: .4byte gMain
_0807F784: .4byte sub_807FB40 _0807F784: .4byte sub_807FB40
_0807F788: .4byte gUnknown_2022B4C _0807F788: .4byte gBattleTypeFlags
thumb_func_end sub_807F748 thumb_func_end sub_807F748
thumb_func_start sub_807F78C thumb_func_start sub_807F78C
@@ -192,7 +192,7 @@ sub_807F78C: @ 807F78C
ldr r1, _0807F7C8 @ =gMain ldr r1, _0807F7C8 @ =gMain
ldr r0, _0807F7CC @ =sub_807FB40 ldr r0, _0807F7CC @ =sub_807FB40
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807F7D0 @ =gUnknown_2022B4C ldr r1, _0807F7D0 @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
lsls r0, 3 lsls r0, 3
str r0, [r1] str r0, [r1]
@@ -210,7 +210,7 @@ sub_807F78C: @ 807F78C
.align 2, 0 .align 2, 0
_0807F7C8: .4byte gMain _0807F7C8: .4byte gMain
_0807F7CC: .4byte sub_807FB40 _0807F7CC: .4byte sub_807FB40
_0807F7D0: .4byte gUnknown_2022B4C _0807F7D0: .4byte gBattleTypeFlags
_0807F7D4: .4byte 0x00000155 _0807F7D4: .4byte 0x00000155
thumb_func_end sub_807F78C thumb_func_end sub_807F78C
@@ -223,7 +223,7 @@ sub_807F7D8: @ 807F7D8
ldr r1, _0807F804 @ =gMain ldr r1, _0807F804 @ =gMain
ldr r0, _0807F808 @ =sub_80A0F4C ldr r0, _0807F808 @ =sub_80A0F4C
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807F80C @ =gUnknown_2022B4C ldr r1, _0807F80C @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
str r0, [r1] str r0, [r1]
bl GetWildBattleTransition bl GetWildBattleTransition
@@ -236,7 +236,7 @@ sub_807F7D8: @ 807F7D8
.align 2, 0 .align 2, 0
_0807F804: .4byte gMain _0807F804: .4byte gMain
_0807F808: .4byte sub_80A0F4C _0807F808: .4byte sub_80A0F4C
_0807F80C: .4byte gUnknown_2022B4C _0807F80C: .4byte gBattleTypeFlags
thumb_func_end sub_807F7D8 thumb_func_end sub_807F7D8
thumb_func_start sub_807F810 thumb_func_start sub_807F810
@@ -248,7 +248,7 @@ sub_807F810: @ 807F810
ldr r1, _0807F854 @ =gMain ldr r1, _0807F854 @ =gMain
ldr r0, _0807F858 @ =sub_807FB40 ldr r0, _0807F858 @ =sub_807FB40
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807F85C @ =gUnknown_2022B4C ldr r1, _0807F85C @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
lsls r0, 8 lsls r0, 8
str r0, [r1] str r0, [r1]
@@ -257,7 +257,7 @@ sub_807F810: @ 807F810
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
bl sub_807F690 bl sub_807F690
ldr r0, _0807F860 @ =gUnknown_202402C ldr r0, _0807F860 @ =gEnemyParty
ldr r2, _0807F864 @ =gUnknown_841D148 ldr r2, _0807F864 @ =gUnknown_841D148
movs r1, 0x2 movs r1, 0x2
bl sub_804037C bl sub_804037C
@@ -270,8 +270,8 @@ sub_807F810: @ 807F810
.align 2, 0 .align 2, 0
_0807F854: .4byte gMain _0807F854: .4byte gMain
_0807F858: .4byte sub_807FB40 _0807F858: .4byte sub_807FB40
_0807F85C: .4byte gUnknown_2022B4C _0807F85C: .4byte gBattleTypeFlags
_0807F860: .4byte gUnknown_202402C _0807F860: .4byte gEnemyParty
_0807F864: .4byte gUnknown_841D148 _0807F864: .4byte gUnknown_841D148
thumb_func_end sub_807F810 thumb_func_end sub_807F810
@@ -294,7 +294,7 @@ sub_807F868: @ 807F868
thumb_func_start sub_807F888 thumb_func_start sub_807F888
sub_807F888: @ 807F888 sub_807F888: @ 807F888
push {lr} push {lr}
ldr r0, _0807F8B4 @ =gUnknown_202402C ldr r0, _0807F8B4 @ =gEnemyParty
movs r1, 0xD movs r1, 0xD
movs r2, 0x5 movs r2, 0x5
bl CreateMaleMon bl CreateMaleMon
@@ -302,7 +302,7 @@ sub_807F888: @ 807F888
ldr r1, _0807F8B8 @ =gMain ldr r1, _0807F8B8 @ =gMain
ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807F8C0 @ =gUnknown_2022B4C ldr r1, _0807F8C0 @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
lsls r0, 2 lsls r0, 2
str r0, [r1] str r0, [r1]
@@ -312,10 +312,10 @@ sub_807F888: @ 807F888
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0807F8B4: .4byte gUnknown_202402C _0807F8B4: .4byte gEnemyParty
_0807F8B8: .4byte gMain _0807F8B8: .4byte gMain
_0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807F8C0: .4byte gUnknown_2022B4C _0807F8C0: .4byte gBattleTypeFlags
thumb_func_end sub_807F888 thumb_func_end sub_807F888
thumb_func_start sub_807F8C4 thumb_func_start sub_807F8C4
@@ -325,7 +325,7 @@ sub_807F8C4: @ 807F8C4
ldr r1, _0807F8F8 @ =gMain ldr r1, _0807F8F8 @ =gMain
ldr r0, _0807F8FC @ =sub_807FBA0 ldr r0, _0807F8FC @ =sub_807FBA0
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807F900 @ =gUnknown_2022B4C ldr r1, _0807F900 @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
lsls r0, 10 lsls r0, 10
str r0, [r1] str r0, [r1]
@@ -343,7 +343,7 @@ sub_807F8C4: @ 807F8C4
.align 2, 0 .align 2, 0
_0807F8F8: .4byte gMain _0807F8F8: .4byte gMain
_0807F8FC: .4byte sub_807FBA0 _0807F8FC: .4byte sub_807FBA0
_0807F900: .4byte gUnknown_2022B4C _0807F900: .4byte gBattleTypeFlags
thumb_func_end sub_807F8C4 thumb_func_end sub_807F8C4
thumb_func_start sub_807F904 thumb_func_start sub_807F904
@@ -360,11 +360,11 @@ sub_807F904: @ 807F904
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0807F958 beq _0807F958
ldr r1, _0807F950 @ =gUnknown_2022B4C ldr r1, _0807F950 @ =gBattleTypeFlags
movs r0, 0xA0 movs r0, 0xA0
lsls r0, 8 lsls r0, 8
str r0, [r1] str r0, [r1]
ldr r0, _0807F954 @ =gUnknown_202402C ldr r0, _0807F954 @ =gEnemyParty
movs r1, 0xFE movs r1, 0xFE
str r1, [sp] str r1, [sp]
movs r1, 0xC movs r1, 0xC
@@ -380,10 +380,10 @@ sub_807F904: @ 807F904
_0807F944: .4byte gMain _0807F944: .4byte gMain
_0807F948: .4byte sub_807FBF0 _0807F948: .4byte sub_807FBF0
_0807F94C: .4byte 0x00000167 _0807F94C: .4byte 0x00000167
_0807F950: .4byte gUnknown_2022B4C _0807F950: .4byte gBattleTypeFlags
_0807F954: .4byte gUnknown_202402C _0807F954: .4byte gEnemyParty
_0807F958: _0807F958:
ldr r1, _0807F98C @ =gUnknown_2022B4C ldr r1, _0807F98C @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
lsls r0, 8 lsls r0, 8
str r0, [r1] str r0, [r1]
@@ -393,7 +393,7 @@ _0807F960:
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
bl sub_807F690 bl sub_807F690
ldr r0, _0807F990 @ =gUnknown_202402C ldr r0, _0807F990 @ =gEnemyParty
ldr r2, _0807F994 @ =gUnknown_841D148 ldr r2, _0807F994 @ =gUnknown_841D148
movs r1, 0x2 movs r1, 0x2
bl sub_804037C bl sub_804037C
@@ -405,8 +405,8 @@ _0807F960:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0807F98C: .4byte gUnknown_2022B4C _0807F98C: .4byte gBattleTypeFlags
_0807F990: .4byte gUnknown_202402C _0807F990: .4byte gEnemyParty
_0807F994: .4byte gUnknown_841D148 _0807F994: .4byte gUnknown_841D148
thumb_func_end sub_807F904 thumb_func_end sub_807F904
@@ -417,7 +417,7 @@ sub_807F998: @ 807F998
ldr r1, _0807F9CC @ =gMain ldr r1, _0807F9CC @ =gMain
ldr r0, _0807F9D0 @ =sub_807FBA0 ldr r0, _0807F9D0 @ =sub_807FBA0
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807F9D4 @ =gUnknown_2022B4C ldr r1, _0807F9D4 @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
lsls r0, 6 lsls r0, 6
str r0, [r1] str r0, [r1]
@@ -435,7 +435,7 @@ sub_807F998: @ 807F998
.align 2, 0 .align 2, 0
_0807F9CC: .4byte gMain _0807F9CC: .4byte gMain
_0807F9D0: .4byte sub_807FBA0 _0807F9D0: .4byte sub_807FBA0
_0807F9D4: .4byte gUnknown_2022B4C _0807F9D4: .4byte gBattleTypeFlags
thumb_func_end sub_807F998 thumb_func_end sub_807F998
thumb_func_start sub_807F9D8 thumb_func_start sub_807F9D8
@@ -445,11 +445,11 @@ sub_807F9D8: @ 807F9D8
ldr r1, _0807FA0C @ =gMain ldr r1, _0807FA0C @ =gMain
ldr r0, _0807FA10 @ =sub_807FBA0 ldr r0, _0807FA10 @ =sub_807FBA0
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807FA14 @ =gUnknown_2022B4C ldr r1, _0807FA14 @ =gBattleTypeFlags
movs r0, 0x84 movs r0, 0x84
lsls r0, 11 lsls r0, 11
str r0, [r1] str r0, [r1]
ldr r0, _0807FA18 @ =gUnknown_202402C ldr r0, _0807FA18 @ =gEnemyParty
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
@@ -467,8 +467,8 @@ sub_807F9D8: @ 807F9D8
.align 2, 0 .align 2, 0
_0807FA0C: .4byte gMain _0807FA0C: .4byte gMain
_0807FA10: .4byte sub_807FBA0 _0807FA10: .4byte sub_807FBA0
_0807FA14: .4byte gUnknown_2022B4C _0807FA14: .4byte gBattleTypeFlags
_0807FA18: .4byte gUnknown_202402C _0807FA18: .4byte gEnemyParty
_0807FA1C: _0807FA1C:
cmp r1, 0xF9 cmp r1, 0xF9
blt _0807FA4C blt _0807FA4C
@@ -517,7 +517,7 @@ sub_807FA68: @ 807FA68
ldr r1, _0807FA90 @ =gMain ldr r1, _0807FA90 @ =gMain
ldr r0, _0807FA94 @ =sub_807FBA0 ldr r0, _0807FA94 @ =sub_807FBA0
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807FA98 @ =gUnknown_2022B4C ldr r1, _0807FA98 @ =gBattleTypeFlags
movs r0, 0xC0 movs r0, 0xC0
lsls r0, 6 lsls r0, 6
str r0, [r1] str r0, [r1]
@@ -533,7 +533,7 @@ sub_807FA68: @ 807FA68
.align 2, 0 .align 2, 0
_0807FA90: .4byte gMain _0807FA90: .4byte gMain
_0807FA94: .4byte sub_807FBA0 _0807FA94: .4byte sub_807FBA0
_0807FA98: .4byte gUnknown_2022B4C _0807FA98: .4byte gBattleTypeFlags
_0807FA9C: .4byte gGameVersion _0807FA9C: .4byte gGameVersion
_0807FAA0: _0807FAA0:
movs r1, 0x85 movs r1, 0x85
@@ -556,7 +556,7 @@ sub_807FABC: @ 807FABC
ldr r1, _0807FAEC @ =gMain ldr r1, _0807FAEC @ =gMain
ldr r0, _0807FAF0 @ =sub_807FBA0 ldr r0, _0807FAF0 @ =sub_807FBA0
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r1, _0807FAF4 @ =gUnknown_2022B4C ldr r1, _0807FAF4 @ =gBattleTypeFlags
movs r0, 0xC0 movs r0, 0xC0
lsls r0, 7 lsls r0, 7
str r0, [r1] str r0, [r1]
@@ -573,7 +573,7 @@ sub_807FABC: @ 807FABC
.align 2, 0 .align 2, 0
_0807FAEC: .4byte gMain _0807FAEC: .4byte gMain
_0807FAF0: .4byte sub_807FBA0 _0807FAF0: .4byte sub_807FBA0
_0807FAF4: .4byte gUnknown_2022B4C _0807FAF4: .4byte gBattleTypeFlags
thumb_func_end sub_807FABC thumb_func_end sub_807FABC
thumb_func_start sub_807FAF8 thumb_func_start sub_807FAF8
@@ -956,7 +956,7 @@ _0807FDFE:
movs r0, 0x64 movs r0, 0x64
adds r1, r6, 0 adds r1, r6, 0
muls r1, r0 muls r1, r0
ldr r0, _0807FE50 @ =gUnknown_2024284 ldr r0, _0807FE50 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -994,7 +994,7 @@ _0807FE48:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0807FE50: .4byte gUnknown_2024284 _0807FE50: .4byte gPlayerParty
thumb_func_end GetSumOfPlayerPartyLevel thumb_func_end GetSumOfPlayerPartyLevel
thumb_func_start reads_trainer_data_byte0 thumb_func_start reads_trainer_data_byte0
@@ -1004,7 +1004,7 @@ reads_trainer_data_byte0: @ 807FE54
lsrs r0, 16 lsrs r0, 16
lsls r1, 24 lsls r1, 24
lsrs r4, r1, 24 lsrs r4, r1, 24
ldr r5, _0807FE88 @ =gUnknown_823EAC8 ldr r5, _0807FE88 @ =gTrainers
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
@@ -1026,7 +1026,7 @@ _0807FE74:
beq _0807FE96 beq _0807FE96
b _0807FF2C b _0807FF2C
.align 2, 0 .align 2, 0
_0807FE88: .4byte gUnknown_823EAC8 _0807FE88: .4byte gTrainers
_0807FE8C: _0807FE8C:
cmp r0, 0x2 cmp r0, 0x2
beq _0807FEE2 beq _0807FEE2
@@ -1129,7 +1129,7 @@ GetWildBattleTransition: @ 807FF34
bl GetBattleTransitionTypeByMap bl GetBattleTransitionTypeByMap
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, _0807FF64 @ =gUnknown_202402C ldr r0, _0807FF64 @ =gEnemyParty
movs r1, 0x38 movs r1, 0x38
bl GetMonData bl GetMonData
adds r4, r0, 0 adds r4, r0, 0
@@ -1146,7 +1146,7 @@ GetWildBattleTransition: @ 807FF34
adds r0, 0x1 adds r0, 0x1
b _0807FF70 b _0807FF70
.align 2, 0 .align 2, 0
_0807FF64: .4byte gUnknown_202402C _0807FF64: .4byte gEnemyParty
_0807FF68: .4byte gUnknown_83C68F0 _0807FF68: .4byte gUnknown_83C68F0
_0807FF6C: _0807FF6C:
ldr r0, _0807FF7C @ =gUnknown_83C68F0 ldr r0, _0807FF7C @ =gUnknown_83C68F0
@@ -1164,13 +1164,13 @@ _0807FF7C: .4byte gUnknown_83C68F0
thumb_func_start sub_807FF80 thumb_func_start sub_807FF80
sub_807FF80: @ 807FF80 sub_807FF80: @ 807FF80
push {r4-r6,lr} push {r4-r6,lr}
ldr r4, _0807FFB4 @ =gUnknown_20386AE ldr r4, _0807FFB4 @ =gTrainerBattleOpponent_A
ldrh r1, [r4] ldrh r1, [r4]
movs r0, 0x80 movs r0, 0x80
lsls r0, 3 lsls r0, 3
cmp r1, r0 cmp r1, r0
beq _0808000C beq _0808000C
ldr r1, _0807FFB8 @ =gUnknown_823EAC8 ldr r1, _0807FFB8 @ =gTrainers
ldrh r2, [r4] ldrh r2, [r4]
lsls r0, r2, 2 lsls r0, r2, 2
adds r0, r2 adds r0, r2
@@ -1191,8 +1191,8 @@ _0807FFB0:
movs r0, 0xC movs r0, 0xC
b _08080054 b _08080054
.align 2, 0 .align 2, 0
_0807FFB4: .4byte gUnknown_20386AE _0807FFB4: .4byte gTrainerBattleOpponent_A
_0807FFB8: .4byte gUnknown_823EAC8 _0807FFB8: .4byte gTrainers
_0807FFBC: .4byte 0x000002df _0807FFBC: .4byte 0x000002df
_0807FFC0: _0807FFC0:
ldr r0, _0807FFD4 @ =0x0000019b ldr r0, _0807FFD4 @ =0x0000019b
@@ -1284,7 +1284,7 @@ _0808005C: .4byte gUnknown_83C68F8
thumb_func_start sub_8080060 thumb_func_start sub_8080060
sub_8080060: @ 8080060 sub_8080060: @ 8080060
push {r4,lr} push {r4,lr}
ldr r0, _08080084 @ =gUnknown_202402C ldr r0, _08080084 @ =gEnemyParty
movs r1, 0x38 movs r1, 0x38
bl GetMonData bl GetMonData
adds r4, r0, 0 adds r4, r0, 0
@@ -1299,7 +1299,7 @@ sub_8080060: @ 8080060
movs r0, 0x3 movs r0, 0x3
b _0808008A b _0808008A
.align 2, 0 .align 2, 0
_08080084: .4byte gUnknown_202402C _08080084: .4byte gEnemyParty
_08080088: _08080088:
movs r0, 0x4 movs r0, 0x4
_0808008A: _0808008A:
@@ -1342,7 +1342,7 @@ TrainerBattleLoadArg8: @ 80800B4
thumb_func_start trainerflag_opponent thumb_func_start trainerflag_opponent
trainerflag_opponent: @ 80800B8 trainerflag_opponent: @ 80800B8
ldr r1, _080800CC @ =gUnknown_20386AE ldr r1, _080800CC @ =gTrainerBattleOpponent_A
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 3 lsls r2, 3
adds r0, r2, 0 adds r0, r2, 0
@@ -1352,7 +1352,7 @@ trainerflag_opponent: @ 80800B8
lsrs r0, 16 lsrs r0, 16
bx lr bx lr
.align 2, 0 .align 2, 0
_080800CC: .4byte gUnknown_20386AE _080800CC: .4byte gTrainerBattleOpponent_A
thumb_func_end trainerflag_opponent thumb_func_end trainerflag_opponent
thumb_func_start IsPlayerDefeated thumb_func_start IsPlayerDefeated
@@ -1392,7 +1392,7 @@ sub_8080110: @ 8080110
ldr r0, _08080140 @ =gUnknown_20386AC ldr r0, _08080140 @ =gUnknown_20386AC
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, _08080144 @ =gUnknown_20386AE ldr r0, _08080144 @ =gTrainerBattleOpponent_A
strh r1, [r0] strh r1, [r0]
ldr r0, _08080148 @ =gUnknown_20386B0 ldr r0, _08080148 @ =gUnknown_20386B0
strh r1, [r0] strh r1, [r0]
@@ -1414,7 +1414,7 @@ sub_8080110: @ 8080110
bx lr bx lr
.align 2, 0 .align 2, 0
_08080140: .4byte gUnknown_20386AC _08080140: .4byte gUnknown_20386AC
_08080144: .4byte gUnknown_20386AE _08080144: .4byte gTrainerBattleOpponent_A
_08080148: .4byte gUnknown_20386B0 _08080148: .4byte gUnknown_20386B0
_0808014C: .4byte gUnknown_20386B4 _0808014C: .4byte gUnknown_20386B4
_08080150: .4byte gUnknown_20386B8 _08080150: .4byte gUnknown_20386B8
@@ -1590,7 +1590,7 @@ _080802AC:
adds r1, r5, 0 adds r1, r5, 0
bl TrainerBattleLoadArgs bl TrainerBattleLoadArgs
bl battle_80801F0 bl battle_80801F0
ldr r4, _080802D0 @ =gUnknown_20386AE ldr r4, _080802D0 @ =gTrainerBattleOpponent_A
ldrh r0, [r4] ldrh r0, [r4]
bl sub_810CE64 bl sub_810CE64
strh r0, [r4] strh r0, [r4]
@@ -1598,7 +1598,7 @@ _080802AC:
b _08080326 b _08080326
.align 2, 0 .align 2, 0
_080802CC: .4byte gUnknown_83C6990 _080802CC: .4byte gUnknown_83C6990
_080802D0: .4byte gUnknown_20386AE _080802D0: .4byte gTrainerBattleOpponent_A
_080802D4: .4byte gUnknown_81A4F73 _080802D4: .4byte gUnknown_81A4F73
_080802D8: _080802D8:
bl sub_811231C bl sub_811231C
@@ -1606,7 +1606,7 @@ _080802D8:
adds r1, r5, 0 adds r1, r5, 0
bl TrainerBattleLoadArgs bl TrainerBattleLoadArgs
bl battle_80801F0 bl battle_80801F0
ldr r4, _080802FC @ =gUnknown_20386AE ldr r4, _080802FC @ =gTrainerBattleOpponent_A
ldrh r0, [r4] ldrh r0, [r4]
bl sub_810CE64 bl sub_810CE64
strh r0, [r4] strh r0, [r4]
@@ -1614,7 +1614,7 @@ _080802D8:
b _08080326 b _08080326
.align 2, 0 .align 2, 0
_080802F8: .4byte gUnknown_83C6900 _080802F8: .4byte gUnknown_83C6900
_080802FC: .4byte gUnknown_20386AE _080802FC: .4byte gTrainerBattleOpponent_A
_08080300: .4byte gUnknown_81A4F3E _08080300: .4byte gUnknown_81A4F3E
_08080304: _08080304:
ldr r0, _08080310 @ =gUnknown_83C6A20 ldr r0, _08080310 @ =gUnknown_83C6A20
@@ -1814,7 +1814,7 @@ trainer_flag_clear: @ 8080450
thumb_func_start sub_8080464 thumb_func_start sub_8080464
sub_8080464: @ 8080464 sub_8080464: @ 8080464
push {r4,lr} push {r4,lr}
ldr r4, _080804A0 @ =gUnknown_2022B4C ldr r4, _080804A0 @ =gBattleTypeFlags
movs r0, 0x8 movs r0, 0x8
str r0, [r4] str r0, [r4]
bl sub_80803CC bl sub_80803CC
@@ -1841,7 +1841,7 @@ _0808048C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080804A0: .4byte gUnknown_2022B4C _080804A0: .4byte gBattleTypeFlags
_080804A4: .4byte gMain _080804A4: .4byte gMain
_080804A8: .4byte sub_80804AC _080804A8: .4byte sub_80804AC
thumb_func_end sub_8080464 thumb_func_end sub_8080464
@@ -1887,7 +1887,7 @@ _080804EE:
_08080500: .4byte gUnknown_20370D0 _08080500: .4byte gUnknown_20370D0
_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080508: _08080508:
ldr r0, _0808051C @ =gUnknown_20386AE ldr r0, _0808051C @ =gTrainerBattleOpponent_A
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x80 movs r0, 0x80
lsls r0, 3 lsls r0, 3
@@ -1897,7 +1897,7 @@ _08080508:
bl SetMainCallback2 bl SetMainCallback2
b _0808054E b _0808054E
.align 2, 0 .align 2, 0
_0808051C: .4byte gUnknown_20386AE _0808051C: .4byte gTrainerBattleOpponent_A
_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080524: _08080524:
ldr r0, _08080538 @ =gUnknown_2023E8A ldr r0, _08080538 @ =gUnknown_2023E8A
@@ -1927,7 +1927,7 @@ _08080554: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_start sub_8080558 thumb_func_start sub_8080558
sub_8080558: @ 8080558 sub_8080558: @ 8080558
push {lr} push {lr}
ldr r0, _08080570 @ =gUnknown_20386AE ldr r0, _08080570 @ =gTrainerBattleOpponent_A
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x80 movs r0, 0x80
lsls r0, 3 lsls r0, 3
@@ -1937,7 +1937,7 @@ sub_8080558: @ 8080558
bl SetMainCallback2 bl SetMainCallback2
b _080805A6 b _080805A6
.align 2, 0 .align 2, 0
_08080570: .4byte gUnknown_20386AE _08080570: .4byte gTrainerBattleOpponent_A
_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080578: _08080578:
ldr r0, _0808058C @ =gUnknown_2023E8A ldr r0, _0808058C @ =gUnknown_2023E8A
@@ -1967,7 +1967,7 @@ _080805AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_start sub_80805B0 thumb_func_start sub_80805B0
sub_80805B0: @ 80805B0 sub_80805B0: @ 80805B0
push {lr} push {lr}
ldr r1, _080805CC @ =gUnknown_2022B4C ldr r1, _080805CC @ =gBattleTypeFlags
movs r0, 0x8 movs r0, 0x8
str r0, [r1] str r0, [r1]
ldr r1, _080805D0 @ =gMain ldr r1, _080805D0 @ =gMain
@@ -1978,7 +1978,7 @@ sub_80805B0: @ 80805B0
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080805CC: .4byte gUnknown_2022B4C _080805CC: .4byte gBattleTypeFlags
_080805D0: .4byte gMain _080805D0: .4byte gMain
_080805D4: .4byte sub_8080558 _080805D4: .4byte sub_8080558
thumb_func_end sub_80805B0 thumb_func_end sub_80805B0
@@ -2049,7 +2049,7 @@ sub_8080628: @ 8080628
beq _080806BE beq _080806BE
cmp r0, 0x8 cmp r0, 0x8
beq _080806BE beq _080806BE
ldr r0, _08080668 @ =gUnknown_20386AE ldr r0, _08080668 @ =gTrainerBattleOpponent_A
ldrh r0, [r0] ldrh r0, [r0]
bl sub_804367C bl sub_804367C
lsls r0, 24 lsls r0, 24
@@ -2064,7 +2064,7 @@ sub_8080628: @ 8080628
.align 2, 0 .align 2, 0
_08080660: .4byte gUnknown_203ADFA _08080660: .4byte gUnknown_203ADFA
_08080664: .4byte gUnknown_20386AC _08080664: .4byte gUnknown_20386AC
_08080668: .4byte gUnknown_20386AE _08080668: .4byte gTrainerBattleOpponent_A
_0808066C: .4byte _08080670 _0808066C: .4byte _08080670
.align 2, 0 .align 2, 0
_08080670: _08080670:
+38 -38
View File
@@ -1213,7 +1213,7 @@ _080E627E:
_080E6286: _080E6286:
movs r0, 0x64 movs r0, 0x64
muls r0, r6 muls r0, r6
ldr r1, _080E62A8 @ =gUnknown_202402C ldr r1, _080E62A8 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x2C movs r1, 0x2C
adds r2, r6, 0 adds r2, r6, 0
@@ -1228,14 +1228,14 @@ _080E6286:
ble _080E6286 ble _080E6286
b _080E64A6 b _080E64A6
.align 2, 0 .align 2, 0
_080E62A8: .4byte gUnknown_202402C _080E62A8: .4byte gEnemyParty
_080E62AC: .4byte 0x000004d4 _080E62AC: .4byte 0x000004d4
_080E62B0: _080E62B0:
movs r6, 0 movs r6, 0
_080E62B2: _080E62B2:
movs r0, 0x64 movs r0, 0x64
muls r0, r6 muls r0, r6
ldr r1, _080E62E4 @ =gUnknown_202402C ldr r1, _080E62E4 @ =gEnemyParty
adds r0, r1 adds r0, r1
ldr r1, _080E62E8 @ =gSaveBlock2Ptr ldr r1, _080E62E8 @ =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
@@ -1257,7 +1257,7 @@ _080E62B2:
ble _080E62B2 ble _080E62B2
b _080E64A6 b _080E64A6
.align 2, 0 .align 2, 0
_080E62E4: .4byte gUnknown_202402C _080E62E4: .4byte gEnemyParty
_080E62E8: .4byte gSaveBlock2Ptr _080E62E8: .4byte gSaveBlock2Ptr
_080E62EC: .4byte 0x0000056c _080E62EC: .4byte 0x0000056c
_080E62F0: .4byte 0xffffc144 _080E62F0: .4byte 0xffffc144
@@ -1337,7 +1337,7 @@ _080E6384:
_080E6388: _080E6388:
cmp r5, r6 cmp r5, r6
bge _080E63A2 bge _080E63A2
ldr r1, _080E64B8 @ =gUnknown_202402C ldr r1, _080E64B8 @ =gEnemyParty
adds r0, r4, r1 adds r0, r4, r1
movs r1, 0xB movs r1, 0xB
movs r2, 0 movs r2, 0
@@ -1360,7 +1360,7 @@ _080E63A2:
mov r8, r0 mov r8, r0
movs r3, 0 movs r3, 0
_080E63B8: _080E63B8:
ldr r0, _080E64B8 @ =gUnknown_202402C ldr r0, _080E64B8 @ =gEnemyParty
adds r4, r3, r0 adds r4, r3, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xC movs r1, 0xC
@@ -1416,7 +1416,7 @@ _080E6412:
movs r3, 0x64 movs r3, 0x64
adds r0, r6, 0 adds r0, r6, 0
muls r0, r3 muls r0, r3
ldr r1, _080E64B8 @ =gUnknown_202402C ldr r1, _080E64B8 @ =gEnemyParty
adds r0, r1 adds r0, r1
lsls r4, r7, 4 lsls r4, r7, 4
mov r3, r10 mov r3, r10
@@ -1437,7 +1437,7 @@ _080E6412:
mov r0, r10 mov r0, r10
adds r0, 0x4 adds r0, 0x4
adds r4, r0 adds r4, r0
ldr r3, _080E64B8 @ =gUnknown_202402C ldr r3, _080E64B8 @ =gEnemyParty
_080E6452: _080E6452:
ldrh r1, [r4] ldrh r1, [r4]
lsls r2, r5, 24 lsls r2, r5, 24
@@ -1460,7 +1460,7 @@ _080E646E:
movs r2, 0x64 movs r2, 0x64
adds r4, r6, 0 adds r4, r6, 0
muls r4, r2 muls r4, r2
ldr r3, _080E64B8 @ =gUnknown_202402C ldr r3, _080E64B8 @ =gEnemyParty
adds r4, r3 adds r4, r3
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x20 movs r1, 0x20
@@ -1490,7 +1490,7 @@ _080E64A6:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E64B8: .4byte gUnknown_202402C _080E64B8: .4byte gEnemyParty
_080E64BC: .4byte gUnknown_83FFAC4 _080E64BC: .4byte gUnknown_83FFAC4
thumb_func_end sub_80E61DC thumb_func_end sub_80E61DC
@@ -1719,7 +1719,7 @@ _080E6662:
movs r0, 0x64 movs r0, 0x64
adds r5, r7, 0 adds r5, r7, 0
muls r5, r0 muls r5, r0
ldr r0, _080E6724 @ =gUnknown_2024284 ldr r0, _080E6724 @ =gPlayerParty
adds r5, r0 adds r5, r0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x41 movs r1, 0x41
@@ -1809,7 +1809,7 @@ _080E6704:
ldr r1, _080E673C @ =gUnknown_83FE860 ldr r1, _080E673C @ =gUnknown_83FE860
b _080E6742 b _080E6742
.align 2, 0 .align 2, 0
_080E6724: .4byte gUnknown_2024284 _080E6724: .4byte gPlayerParty
_080E6728: .4byte gUnknown_20370D0 _080E6728: .4byte gUnknown_20370D0
_080E672C: .4byte gStringVar1 _080E672C: .4byte gStringVar1
_080E6730: .4byte gUnknown_20370C0 _080E6730: .4byte gUnknown_20370C0
@@ -1994,7 +1994,7 @@ _080E6874:
bl GetMonData bl GetMonData
mov r1, sp mov r1, sp
strh r0, [r1] strh r0, [r1]
ldr r0, _080E68A8 @ =gUnknown_2024284 ldr r0, _080E68A8 @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xC movs r1, 0xC
@@ -2006,7 +2006,7 @@ _080E6874:
b _080E68B0 b _080E68B0
.align 2, 0 .align 2, 0
_080E68A4: .4byte gSaveBlock1Ptr _080E68A4: .4byte gSaveBlock1Ptr
_080E68A8: .4byte gUnknown_2024284 _080E68A8: .4byte gPlayerParty
_080E68AC: _080E68AC:
bl sub_80E7550 bl sub_80E7550
_080E68B0: _080E68B0:
@@ -2072,17 +2072,17 @@ _080E6924:
beq _080E6998 beq _080E6998
b _080E69E6 b _080E69E6
_080E692A: _080E692A:
ldr r1, _080E693C @ =gUnknown_2022B4C ldr r1, _080E693C @ =gBattleTypeFlags
movs r0, 0x84 movs r0, 0x84
lsls r0, 1 lsls r0, 1
str r0, [r1] str r0, [r1]
ldr r0, _080E6940 @ =gUnknown_20386AE ldr r0, _080E6940 @ =gTrainerBattleOpponent_A
strh r2, [r0] strh r2, [r0]
bl sub_80E61DC bl sub_80E61DC
b _080E6970 b _080E6970
.align 2, 0 .align 2, 0
_080E693C: .4byte gUnknown_2022B4C _080E693C: .4byte gBattleTypeFlags
_080E6940: .4byte gUnknown_20386AE _080E6940: .4byte gTrainerBattleOpponent_A
_080E6944: _080E6944:
movs r5, 0 movs r5, 0
ldr r6, _080E698C @ =gSaveBlock1Ptr ldr r6, _080E698C @ =gSaveBlock1Ptr
@@ -2090,7 +2090,7 @@ _080E6948:
movs r0, 0x64 movs r0, 0x64
adds r4, r5, 0 adds r4, r5, 0
muls r4, r0 muls r4, r0
ldr r0, _080E6990 @ =gUnknown_2024284 ldr r0, _080E6990 @ =gPlayerParty
adds r0, r4, r0 adds r0, r4, r0
movs r1, 0xC movs r1, 0xC
bl GetMonData bl GetMonData
@@ -2118,7 +2118,7 @@ _080E6970:
b _080E69E6 b _080E69E6
.align 2, 0 .align 2, 0
_080E698C: .4byte gSaveBlock1Ptr _080E698C: .4byte gSaveBlock1Ptr
_080E6990: .4byte gUnknown_2024284 _080E6990: .4byte gPlayerParty
_080E6994: .4byte sub_80E68C4 _080E6994: .4byte sub_80E68C4
_080E6998: _080E6998:
bl ZeroEnemyPartyMons bl ZeroEnemyPartyMons
@@ -2127,7 +2127,7 @@ _080E6998:
_080E69A0: _080E69A0:
movs r0, 0x64 movs r0, 0x64
muls r0, r5 muls r0, r5
ldr r1, _080E69F4 @ =gUnknown_202402C ldr r1, _080E69F4 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x2C movs r1, 0x2C
adds r2, r5, 0 adds r2, r5, 0
@@ -2140,10 +2140,10 @@ _080E69A0:
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x2 cmp r5, 0x2
ble _080E69A0 ble _080E69A0
ldr r1, _080E69FC @ =gUnknown_2022B4C ldr r1, _080E69FC @ =gBattleTypeFlags
ldr r0, _080E6A00 @ =0x00000808 ldr r0, _080E6A00 @ =0x00000808
str r0, [r1] str r0, [r1]
ldr r1, _080E6A04 @ =gUnknown_20386AE ldr r1, _080E6A04 @ =gTrainerBattleOpponent_A
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r0, _080E6A08 @ =sub_80E68C4 ldr r0, _080E6A08 @ =sub_80E68C4
@@ -2162,11 +2162,11 @@ _080E69E6:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E69F0: .4byte gSaveBlock2Ptr _080E69F0: .4byte gSaveBlock2Ptr
_080E69F4: .4byte gUnknown_202402C _080E69F4: .4byte gEnemyParty
_080E69F8: .4byte 0x000004d4 _080E69F8: .4byte 0x000004d4
_080E69FC: .4byte gUnknown_2022B4C _080E69FC: .4byte gBattleTypeFlags
_080E6A00: .4byte 0x00000808 _080E6A00: .4byte 0x00000808
_080E6A04: .4byte gUnknown_20386AE _080E6A04: .4byte gTrainerBattleOpponent_A
_080E6A08: .4byte sub_80E68C4 _080E6A08: .4byte sub_80E68C4
thumb_func_end sub_80E6900 thumb_func_end sub_80E6900
@@ -2215,7 +2215,7 @@ _080E6A44:
.4byte _080E6C4C .4byte _080E6C4C
.4byte _080E6C6C .4byte _080E6C6C
_080E6A80: _080E6A80:
ldr r0, _080E6AA0 @ =gUnknown_2023FE8 ldr r0, _080E6AA0 @ =gBattleStruct
ldr r1, [r0] ldr r1, [r0]
adds r1, 0xDA adds r1, 0xDA
ldr r0, [r6] ldr r0, [r6]
@@ -2232,7 +2232,7 @@ _080E6A80:
strb r1, [r0] strb r1, [r0]
b _080E6C80 b _080E6C80
.align 2, 0 .align 2, 0
_080E6AA0: .4byte gUnknown_2023FE8 _080E6AA0: .4byte gBattleStruct
_080E6AA4: .4byte 0x0000055e _080E6AA4: .4byte 0x0000055e
_080E6AA8: .4byte gUnknown_20370C2 _080E6AA8: .4byte gUnknown_20370C2
_080E6AAC: _080E6AAC:
@@ -2429,14 +2429,14 @@ _080E6C30:
ldr r0, _080E6C44 @ =0x0000055e ldr r0, _080E6C44 @ =0x0000055e
adds r1, r0 adds r1, r0
adds r1, r5 adds r1, r5
ldr r0, _080E6C48 @ =gUnknown_2023FE8 ldr r0, _080E6C48 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xDA adds r0, 0xDA
ldrb r0, [r0] ldrb r0, [r0]
b _080E6C7E b _080E6C7E
.align 2, 0 .align 2, 0
_080E6C44: .4byte 0x0000055e _080E6C44: .4byte 0x0000055e
_080E6C48: .4byte gUnknown_2023FE8 _080E6C48: .4byte gBattleStruct
_080E6C4C: _080E6C4C:
adds r0, r5, 0 adds r0, r5, 0
bl sub_80E7188 bl sub_80E7188
@@ -2612,14 +2612,14 @@ _080E6DB8:
ldr r2, _080E6DCC @ =0x0000055e ldr r2, _080E6DCC @ =0x0000055e
adds r1, r2 adds r1, r2
adds r1, r4 adds r1, r4
ldr r0, _080E6DD0 @ =gUnknown_2023FE8 ldr r0, _080E6DD0 @ =gBattleStruct
ldr r0, [r0] ldr r0, [r0]
adds r0, 0xDA adds r0, 0xDA
ldrb r0, [r0] ldrb r0, [r0]
b _080E6E06 b _080E6E06
.align 2, 0 .align 2, 0
_080E6DCC: .4byte 0x0000055e _080E6DCC: .4byte 0x0000055e
_080E6DD0: .4byte gUnknown_2023FE8 _080E6DD0: .4byte gBattleStruct
_080E6DD4: _080E6DD4:
adds r0, r4, 0 adds r0, r4, 0
bl sub_80E7188 bl sub_80E7188
@@ -3067,7 +3067,7 @@ sub_80E712C: @ 80E712C
adds r0, r1 adds r0, r1
bl sub_80E6150 bl sub_80E6150
ldr r1, [r4] ldr r1, [r4]
ldr r3, _080E717C @ =gUnknown_2023BE4 ldr r3, _080E717C @ =gBattleMons
adds r0, r3, 0 adds r0, r3, 0
adds r0, 0x58 adds r0, 0x58
ldrh r2, [r0] ldrh r2, [r0]
@@ -3099,7 +3099,7 @@ _080E715C:
.align 2, 0 .align 2, 0
_080E7174: .4byte gSaveBlock2Ptr _080E7174: .4byte gSaveBlock2Ptr
_080E7178: .4byte 0x0000048c _080E7178: .4byte 0x0000048c
_080E717C: .4byte gUnknown_2023BE4 _080E717C: .4byte gBattleMons
_080E7180: .4byte 0x0000048a _080E7180: .4byte 0x0000048a
_080E7184: .4byte 0x00000494 _080E7184: .4byte 0x00000494
thumb_func_end sub_80E712C thumb_func_end sub_80E712C
@@ -3294,7 +3294,7 @@ _080E72EA:
subs r0, 0x1 subs r0, 0x1
movs r1, 0x64 movs r1, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080E7344 @ =gUnknown_2024284 ldr r0, _080E7344 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
@@ -3327,7 +3327,7 @@ _080E7334: .4byte gSaveBlock2Ptr
_080E7338: .4byte 0x0000055c _080E7338: .4byte 0x0000055c
_080E733C: .4byte gUnknown_20370D0 _080E733C: .4byte gUnknown_20370D0
_080E7340: .4byte 0x0000056d _080E7340: .4byte 0x0000056d
_080E7344: .4byte gUnknown_2024284 _080E7344: .4byte gPlayerParty
thumb_func_end sub_80E72B8 thumb_func_end sub_80E72B8
thumb_func_start sub_80E7348 thumb_func_start sub_80E7348
@@ -3410,7 +3410,7 @@ _080E73BC:
_080E73E2: _080E73E2:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _080E741C @ =gUnknown_2024284 ldr r1, _080E741C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x2C movs r1, 0x2C
muls r1, r4 muls r1, r4
@@ -3432,7 +3432,7 @@ _080E73E2:
_080E7410: .4byte gUnknown_84020C4 _080E7410: .4byte gUnknown_84020C4
_080E7414: .4byte gSaveBlock1Ptr _080E7414: .4byte gSaveBlock1Ptr
_080E7418: .4byte 0x00002cac _080E7418: .4byte 0x00002cac
_080E741C: .4byte gUnknown_2024284 _080E741C: .4byte gPlayerParty
thumb_func_end sub_80E7348 thumb_func_end sub_80E7348
thumb_func_start GetEreaderTrainerFrontSpriteId thumb_func_start GetEreaderTrainerFrontSpriteId
+980 -980
View File
File diff suppressed because it is too large Load Diff
+30 -30
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_802E03C thumb_func_start sub_802E03C
sub_802E03C: @ 802E03C sub_802E03C: @ 802E03C
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, _0802E118 @ =gUnknown_2022B4C ldr r4, _0802E118 @ =gBattleTypeFlags
ldr r0, [r4] ldr r0, [r4]
movs r1, 0x80 movs r1, 0x80
lsls r1, 12 lsls r1, 12
@@ -33,12 +33,12 @@ _0802E060:
cmp r4, 0 cmp r4, 0
bge _0802E060 bge _0802E060
_0802E06E: _0802E06E:
ldr r4, _0802E120 @ =gUnknown_2023FE8 ldr r4, _0802E120 @ =gBattleStruct
movs r0, 0x80 movs r0, 0x80
lsls r0, 2 lsls r0, 2
bl AllocZeroed bl AllocZeroed
str r0, [r4] str r0, [r4]
ldr r4, _0802E124 @ =gUnknown_2023FF4 ldr r4, _0802E124 @ =gBattleResources
movs r0, 0x20 movs r0, 0x20
bl AllocZeroed bl AllocZeroed
str r0, [r4] str r0, [r4]
@@ -103,10 +103,10 @@ _0802E06E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0802E118: .4byte gUnknown_2022B4C _0802E118: .4byte gBattleTypeFlags
_0802E11C: .4byte gUnknown_3005EE0 _0802E11C: .4byte gUnknown_3005EE0
_0802E120: .4byte gUnknown_2023FE8 _0802E120: .4byte gBattleStruct
_0802E124: .4byte gUnknown_2023FF4 _0802E124: .4byte gBattleResources
_0802E128: .4byte gUnknown_2023FEC _0802E128: .4byte gUnknown_2023FEC
_0802E12C: .4byte gUnknown_2023FF0 _0802E12C: .4byte gUnknown_2023FF0
_0802E130: .4byte gUnknown_2022BB8 _0802E130: .4byte gUnknown_2022BB8
@@ -116,7 +116,7 @@ _0802E134: .4byte gUnknown_2022BBC
thumb_func_start sub_802E138 thumb_func_start sub_802E138
sub_802E138: @ 802E138 sub_802E138: @ 802E138
push {r4-r6,lr} push {r4-r6,lr}
ldr r4, _0802E208 @ =gUnknown_2022B4C ldr r4, _0802E208 @ =gBattleTypeFlags
ldr r0, [r4] ldr r0, [r4]
movs r1, 0x80 movs r1, 0x80
lsls r1, 12 lsls r1, 12
@@ -142,11 +142,11 @@ _0802E15E:
cmp r4, 0 cmp r4, 0
bge _0802E15E bge _0802E15E
_0802E16C: _0802E16C:
ldr r6, _0802E210 @ =gUnknown_2023FF4 ldr r6, _0802E210 @ =gBattleResources
ldr r0, [r6] ldr r0, [r6]
cmp r0, 0 cmp r0, 0
beq _0802E200 beq _0802E200
ldr r4, _0802E214 @ =gUnknown_2023FE8 ldr r4, _0802E214 @ =gBattleStruct
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
movs r5, 0 movs r5, 0
@@ -207,10 +207,10 @@ _0802E200:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0802E208: .4byte gUnknown_2022B4C _0802E208: .4byte gBattleTypeFlags
_0802E20C: .4byte gUnknown_3005EE0 _0802E20C: .4byte gUnknown_3005EE0
_0802E210: .4byte gUnknown_2023FF4 _0802E210: .4byte gBattleResources
_0802E214: .4byte gUnknown_2023FE8 _0802E214: .4byte gBattleStruct
_0802E218: .4byte gUnknown_2023FEC _0802E218: .4byte gUnknown_2023FEC
_0802E21C: .4byte gUnknown_2023FF0 _0802E21C: .4byte gUnknown_2023FF0
_0802E220: .4byte gUnknown_2022BB8 _0802E220: .4byte gUnknown_2022BB8
@@ -222,7 +222,7 @@ sub_802E228: @ 802E228
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, _0802E26C @ =gUnknown_2022B4C ldr r0, _0802E26C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x1 movs r1, 0x1
ands r0, r1 ands r0, r1
@@ -236,7 +236,7 @@ sub_802E228: @ 802E228
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r2, _0802E270 @ =gUnknown_2023BE4 ldr r2, _0802E270 @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
adds r1, r3, 0 adds r1, r3, 0
muls r1, r0 muls r1, r0
@@ -252,15 +252,15 @@ sub_802E228: @ 802E228
adds r4, r3, 0 adds r4, r3, 0
b _0802E27E b _0802E27E
.align 2, 0 .align 2, 0
_0802E26C: .4byte gUnknown_2022B4C _0802E26C: .4byte gBattleTypeFlags
_0802E270: .4byte gUnknown_2023BE4 _0802E270: .4byte gBattleMons
_0802E274: _0802E274:
movs r0, 0x1 movs r0, 0x1
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
_0802E27E: _0802E27E:
ldr r2, _0802E2C0 @ =gUnknown_2023BE4 ldr r2, _0802E2C0 @ =gBattleMons
movs r1, 0x58 movs r1, 0x58
adds r0, r4, 0 adds r0, r4, 0
muls r0, r1 muls r0, r1
@@ -280,44 +280,44 @@ _0802E27E:
subs r0, r1 subs r0, r1
cmp r0, 0x1D cmp r0, 0x1D
ble _0802E2CC ble _0802E2CC
ldr r1, _0802E2C4 @ =gUnknown_2023BCE ldr r1, _0802E2C4 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0802E2C8 @ =gUnknown_2024284 ldr r1, _0802E2C8 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x9 movs r1, 0x9
bl sub_80436F8 bl sub_80436F8
b _0802E302 b _0802E302
.align 2, 0 .align 2, 0
_0802E2C0: .4byte gUnknown_2023BE4 _0802E2C0: .4byte gBattleMons
_0802E2C4: .4byte gUnknown_2023BCE _0802E2C4: .4byte gBattlerPartyIndexes
_0802E2C8: .4byte gUnknown_2024284 _0802E2C8: .4byte gPlayerParty
_0802E2CC: _0802E2CC:
ldr r1, _0802E2E4 @ =gUnknown_2023BCE ldr r1, _0802E2E4 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0802E2E8 @ =gUnknown_2024284 ldr r1, _0802E2E8 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x7 movs r1, 0x7
bl sub_80436F8 bl sub_80436F8
b _0802E302 b _0802E302
.align 2, 0 .align 2, 0
_0802E2E4: .4byte gUnknown_2023BCE _0802E2E4: .4byte gBattlerPartyIndexes
_0802E2E8: .4byte gUnknown_2024284 _0802E2E8: .4byte gPlayerParty
_0802E2EC: _0802E2EC:
ldr r1, _0802E308 @ =gUnknown_2023BCE ldr r1, _0802E308 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0802E30C @ =gUnknown_2024284 ldr r1, _0802E30C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x7 movs r1, 0x7
bl sub_80436F8 bl sub_80436F8
@@ -326,8 +326,8 @@ _0802E302:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0802E308: .4byte gUnknown_2023BCE _0802E308: .4byte gBattlerPartyIndexes
_0802E30C: .4byte gUnknown_2024284 _0802E30C: .4byte gPlayerParty
thumb_func_end sub_802E228 thumb_func_end sub_802E228
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+24 -24
View File
@@ -1211,7 +1211,7 @@ sub_80810CC: @ 80810CC
ldr r2, _080810EC @ =0x00001133 ldr r2, _080810EC @ =0x00001133
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _080810F0 @ =gUnknown_2022B4C ldr r1, _080810F0 @ =gBattleTypeFlags
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
movs r0, 0x2 movs r0, 0x2
@@ -1222,7 +1222,7 @@ sub_80810CC: @ 80810CC
.align 2, 0 .align 2, 0
_080810E8: .4byte gUnknown_202271A _080810E8: .4byte gUnknown_202271A
_080810EC: .4byte 0x00001133 _080810EC: .4byte 0x00001133
_080810F0: .4byte gUnknown_2022B4C _080810F0: .4byte gBattleTypeFlags
thumb_func_end sub_80810CC thumb_func_end sub_80810CC
thumb_func_start sub_80810F4 thumb_func_start sub_80810F4
@@ -1235,7 +1235,7 @@ sub_80810F4: @ 80810F4
ldr r2, _08081120 @ =0x00003311 ldr r2, _08081120 @ =0x00003311
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _08081124 @ =gUnknown_2022B4C ldr r1, _08081124 @ =gBattleTypeFlags
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
movs r0, 0x2 movs r0, 0x2
@@ -1247,7 +1247,7 @@ sub_80810F4: @ 80810F4
_08081118: .4byte gUnknown_20370D0 _08081118: .4byte gUnknown_20370D0
_0808111C: .4byte gUnknown_202271A _0808111C: .4byte gUnknown_202271A
_08081120: .4byte 0x00003311 _08081120: .4byte 0x00003311
_08081124: .4byte gUnknown_2022B4C _08081124: .4byte gBattleTypeFlags
thumb_func_end sub_80810F4 thumb_func_end sub_80810F4
thumb_func_start sub_8081128 thumb_func_start sub_8081128
@@ -1257,7 +1257,7 @@ sub_8081128: @ 8081128
ldr r2, _08081148 @ =0x00006601 ldr r2, _08081148 @ =0x00006601
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _0808114C @ =gUnknown_2022B4C ldr r1, _0808114C @ =gBattleTypeFlags
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
movs r0, 0x4 movs r0, 0x4
@@ -1268,7 +1268,7 @@ sub_8081128: @ 8081128
.align 2, 0 .align 2, 0
_08081144: .4byte gUnknown_202271A _08081144: .4byte gUnknown_202271A
_08081148: .4byte 0x00006601 _08081148: .4byte 0x00006601
_0808114C: .4byte gUnknown_2022B4C _0808114C: .4byte gBattleTypeFlags
thumb_func_end sub_8081128 thumb_func_end sub_8081128
thumb_func_start sub_8081150 thumb_func_start sub_8081150
@@ -1613,26 +1613,26 @@ _080813F4:
beq _08081410 beq _08081410
b _0808141A b _0808141A
_080813FA: _080813FA:
ldr r1, _08081400 @ =gUnknown_2022B4C ldr r1, _08081400 @ =gBattleTypeFlags
movs r0, 0xA movs r0, 0xA
b _08081418 b _08081418
.align 2, 0 .align 2, 0
_08081400: .4byte gUnknown_2022B4C _08081400: .4byte gBattleTypeFlags
_08081404: _08081404:
ldr r1, _0808140C @ =gUnknown_2022B4C ldr r1, _0808140C @ =gBattleTypeFlags
movs r0, 0xB movs r0, 0xB
b _08081418 b _08081418
.align 2, 0 .align 2, 0
_0808140C: .4byte gUnknown_2022B4C _0808140C: .4byte gBattleTypeFlags
_08081410: _08081410:
bl sub_80A03D8 bl sub_80A03D8
ldr r1, _08081440 @ =gUnknown_2022B4C ldr r1, _08081440 @ =gBattleTypeFlags
movs r0, 0x4B movs r0, 0x4B
_08081418: _08081418:
str r0, [r1] str r0, [r1]
_0808141A: _0808141A:
bl sub_80563F0 bl sub_80563F0
ldr r1, _08081444 @ =gUnknown_20386AE ldr r1, _08081444 @ =gTrainerBattleOpponent_A
movs r2, 0x80 movs r2, 0x80
lsls r2, 4 lsls r2, 4
adds r0, r2, 0 adds r0, r2, 0
@@ -1649,8 +1649,8 @@ _0808143A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08081440: .4byte gUnknown_2022B4C _08081440: .4byte gBattleTypeFlags
_08081444: .4byte gUnknown_20386AE _08081444: .4byte gTrainerBattleOpponent_A
_08081448: .4byte sub_800FD9C _08081448: .4byte sub_800FD9C
_0808144C: .4byte gMain _0808144C: .4byte gMain
_08081450: .4byte sub_8081668 _08081450: .4byte sub_8081668
@@ -1836,26 +1836,26 @@ _080815C4:
beq _080815E0 beq _080815E0
b _080815EA b _080815EA
_080815CA: _080815CA:
ldr r1, _080815D0 @ =gUnknown_2022B4C ldr r1, _080815D0 @ =gBattleTypeFlags
movs r0, 0xA movs r0, 0xA
b _080815E8 b _080815E8
.align 2, 0 .align 2, 0
_080815D0: .4byte gUnknown_2022B4C _080815D0: .4byte gBattleTypeFlags
_080815D4: _080815D4:
ldr r1, _080815DC @ =gUnknown_2022B4C ldr r1, _080815DC @ =gBattleTypeFlags
movs r0, 0xB movs r0, 0xB
b _080815E8 b _080815E8
.align 2, 0 .align 2, 0
_080815DC: .4byte gUnknown_2022B4C _080815DC: .4byte gBattleTypeFlags
_080815E0: _080815E0:
bl sub_80A03D8 bl sub_80A03D8
ldr r1, _08081610 @ =gUnknown_2022B4C ldr r1, _08081610 @ =gBattleTypeFlags
movs r0, 0x4B movs r0, 0x4B
_080815E8: _080815E8:
str r0, [r1] str r0, [r1]
_080815EA: _080815EA:
bl sub_80563F0 bl sub_80563F0
ldr r1, _08081614 @ =gUnknown_20386AE ldr r1, _08081614 @ =gTrainerBattleOpponent_A
movs r3, 0x80 movs r3, 0x80
lsls r3, 4 lsls r3, 4
adds r0, r3, 0 adds r0, r3, 0
@@ -1872,8 +1872,8 @@ _0808160A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08081610: .4byte gUnknown_2022B4C _08081610: .4byte gBattleTypeFlags
_08081614: .4byte gUnknown_20386AE _08081614: .4byte gTrainerBattleOpponent_A
_08081618: .4byte sub_800FD9C _08081618: .4byte sub_800FD9C
_0808161C: .4byte gMain _0808161C: .4byte gMain
_08081620: .4byte sub_8081668 _08081620: .4byte sub_8081668
@@ -1918,7 +1918,7 @@ _08081664: .4byte c2_exit_to_overworld_2_switch
thumb_func_start sub_8081668 thumb_func_start sub_8081668
sub_8081668: @ 8081668 sub_8081668: @ 8081668
push {r4,r5,lr} push {r4,r5,lr}
ldr r2, _080816B0 @ =gUnknown_2022B4C ldr r2, _080816B0 @ =gBattleTypeFlags
ldr r0, [r2] ldr r0, [r2]
ldr r1, _080816B4 @ =0x0000ffdf ldr r1, _080816B4 @ =0x0000ffdf
ands r0, r1 ands r0, r1
@@ -1948,7 +1948,7 @@ sub_8081668: @ 8081668
beq _080816EC beq _080816EC
b _0808170A b _0808170A
.align 2, 0 .align 2, 0
_080816B0: .4byte gUnknown_2022B4C _080816B0: .4byte gBattleTypeFlags
_080816B4: .4byte 0x0000ffdf _080816B4: .4byte 0x0000ffdf
_080816B8: .4byte gUnknown_20370C0 _080816B8: .4byte gUnknown_20370C0
_080816BC: .4byte gUnknown_300502C _080816BC: .4byte gUnknown_300502C
+38 -38
View File
@@ -36,7 +36,7 @@ sub_803ECEC: @ 803ECEC
cmp r3, 0 cmp r3, 0
bne _0803ED40 bne _0803ED40
ldr r2, _0803ED38 @ =gUnknown_2024020 ldr r2, _0803ED38 @ =gUnknown_2024020
ldr r1, _0803ED3C @ =gUnknown_8250C04 ldr r1, _0803ED3C @ =gBattleMoves
ldr r3, [sp, 0x8] ldr r3, [sp, 0x8]
lsls r0, r3, 1 lsls r0, r3, 1
adds r0, r3 adds r0, r3
@@ -47,14 +47,14 @@ sub_803ECEC: @ 803ECEC
b _0803ED44 b _0803ED44
.align 2, 0 .align 2, 0
_0803ED38: .4byte gUnknown_2024020 _0803ED38: .4byte gUnknown_2024020
_0803ED3C: .4byte gUnknown_8250C04 _0803ED3C: .4byte gBattleMoves
_0803ED40: _0803ED40:
ldr r0, _0803ED5C @ =gUnknown_2024020 ldr r0, _0803ED5C @ =gUnknown_2024020
strh r3, [r0] strh r3, [r0]
_0803ED44: _0803ED44:
cmp r7, 0 cmp r7, 0
bne _0803ED64 bne _0803ED64
ldr r1, _0803ED60 @ =gUnknown_8250C04 ldr r1, _0803ED60 @ =gBattleMoves
ldr r7, [sp, 0x8] ldr r7, [sp, 0x8]
lsls r0, r7, 1 lsls r0, r7, 1
adds r0, r7 adds r0, r7
@@ -65,7 +65,7 @@ _0803ED44:
b _0803ED6E b _0803ED6E
.align 2, 0 .align 2, 0
_0803ED5C: .4byte gUnknown_2024020 _0803ED5C: .4byte gUnknown_2024020
_0803ED60: .4byte gUnknown_8250C04 _0803ED60: .4byte gBattleMoves
_0803ED64: _0803ED64:
movs r0, 0x3F movs r0, 0x3F
mov r9, r0 mov r9, r0
@@ -155,7 +155,7 @@ _0803EE0C:
lsls r0, r7, 17 lsls r0, r7, 17
lsrs r7, r0, 16 lsrs r7, r0, 16
_0803EE10: _0803EE10:
ldr r0, _0803EF28 @ =gUnknown_2022B4C ldr r0, _0803EF28 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ldr r1, _0803EF2C @ =0x00000802 ldr r1, _0803EF2C @ =0x00000802
ands r0, r1 ands r0, r1
@@ -179,7 +179,7 @@ _0803EE10:
lsls r0, 16 lsls r0, 16
lsrs r7, r0, 16 lsrs r7, r0, 16
_0803EE44: _0803EE44:
ldr r0, _0803EF28 @ =gUnknown_2022B4C ldr r0, _0803EF28 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ldr r1, _0803EF2C @ =0x00000802 ldr r1, _0803EF2C @ =0x00000802
ands r0, r1 ands r0, r1
@@ -204,7 +204,7 @@ _0803EE44:
lsrs r0, 16 lsrs r0, 16
str r0, [sp, 0x14] str r0, [sp, 0x14]
_0803EE7A: _0803EE7A:
ldr r0, _0803EF28 @ =gUnknown_2022B4C ldr r0, _0803EF28 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ldr r1, _0803EF2C @ =0x00000802 ldr r1, _0803EF2C @ =0x00000802
ands r0, r1 ands r0, r1
@@ -230,7 +230,7 @@ _0803EE7A:
lsrs r0, 16 lsrs r0, 16
mov r8, r0 mov r8, r0
_0803EEB2: _0803EEB2:
ldr r0, _0803EF28 @ =gUnknown_2022B4C ldr r0, _0803EF28 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ldr r1, _0803EF2C @ =0x00000802 ldr r1, _0803EF2C @ =0x00000802
ands r0, r1 ands r0, r1
@@ -288,7 +288,7 @@ _0803EF0E:
mov r8, r0 mov r8, r0
b _0803EF44 b _0803EF44
.align 2, 0 .align 2, 0
_0803EF28: .4byte gUnknown_2022B4C _0803EF28: .4byte gBattleTypeFlags
_0803EF2C: .4byte 0x00000802 _0803EF2C: .4byte 0x00000802
_0803EF30: .4byte 0x00000824 _0803EF30: .4byte 0x00000824
_0803EF34: .4byte 0x00000826 _0803EF34: .4byte 0x00000826
@@ -312,7 +312,7 @@ _0803EF58:
mov r0, r10 mov r0, r10
cmp r0, 0x22 cmp r0, 0x22
bne _0803EF90 bne _0803EF90
ldr r0, _0803F244 @ =gUnknown_2022B4C ldr r0, _0803F244 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
@@ -340,7 +340,7 @@ _0803EF90:
ldr r0, [sp, 0x1C] ldr r0, [sp, 0x1C]
cmp r0, 0x22 cmp r0, 0x22
bne _0803EFC8 bne _0803EFC8
ldr r0, _0803F244 @ =gUnknown_2022B4C ldr r0, _0803F244 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
@@ -655,8 +655,8 @@ _0803F1DA:
bl __divsi3 bl __divsi3
strh r0, [r4] strh r0, [r4]
_0803F20A: _0803F20A:
ldr r2, _0803F254 @ =gUnknown_8250C04 ldr r2, _0803F254 @ =gBattleMoves
ldr r0, _0803F258 @ =gUnknown_2023D4A ldr r0, _0803F258 @ =gCurrentMove
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r1 adds r0, r1
@@ -674,7 +674,7 @@ _0803F224:
bls _0803F22C bls _0803F22C
b _0803F38A b _0803F38A
_0803F22C: _0803F22C:
ldr r0, _0803F25C @ =gUnknown_2023D71 ldr r0, _0803F25C @ =gCritMultiplier
ldrb r1, [r0] ldrb r1, [r0]
adds r4, r0, 0 adds r4, r0, 0
cmp r1, 0x2 cmp r1, 0x2
@@ -686,13 +686,13 @@ _0803F22C:
ldr r2, _0803F260 @ =gUnknown_825DEAD ldr r2, _0803F260 @ =gUnknown_825DEAD
b _0803F26E b _0803F26E
.align 2, 0 .align 2, 0
_0803F244: .4byte gUnknown_2022B4C _0803F244: .4byte gBattleTypeFlags
_0803F248: .4byte 0xfffffe69 _0803F248: .4byte 0xfffffe69
_0803F24C: .4byte 0x00000175 _0803F24C: .4byte 0x00000175
_0803F250: .4byte gUnknown_2024020 _0803F250: .4byte gUnknown_2024020
_0803F254: .4byte gUnknown_8250C04 _0803F254: .4byte gBattleMoves
_0803F258: .4byte gUnknown_2023D4A _0803F258: .4byte gCurrentMove
_0803F25C: .4byte gUnknown_2023D71 _0803F25C: .4byte gCritMultiplier
_0803F260: .4byte gUnknown_825DEAD _0803F260: .4byte gUnknown_825DEAD
_0803F264: _0803F264:
adds r5, r7, 0 adds r5, r7, 0
@@ -791,7 +791,7 @@ _0803F310:
ldrb r1, [r4] ldrb r1, [r4]
cmp r1, 0x1 cmp r1, 0x1
bne _0803F352 bne _0803F352
ldr r0, _0803F348 @ =gUnknown_2022B4C ldr r0, _0803F348 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
@@ -809,19 +809,19 @@ _0803F310:
b _0803F352 b _0803F352
.align 2, 0 .align 2, 0
_0803F344: .4byte gUnknown_825DEAD _0803F344: .4byte gUnknown_825DEAD
_0803F348: .4byte gUnknown_2022B4C _0803F348: .4byte gBattleTypeFlags
_0803F34C: _0803F34C:
lsrs r0, r5, 31 lsrs r0, r5, 31
adds r0, r5, r0 adds r0, r5, r0
asrs r5, r0, 1 asrs r5, r0, 1
_0803F352: _0803F352:
ldr r0, _0803F3B0 @ =gUnknown_2022B4C ldr r0, _0803F3B0 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x1 movs r1, 0x1
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0803F384 beq _0803F384
ldr r0, _0803F3B4 @ =gUnknown_8250C04 ldr r0, _0803F3B4 @ =gBattleMoves
ldr r3, [sp, 0x8] ldr r3, [sp, 0x8]
lsls r1, r3, 1 lsls r1, r3, 1
adds r1, r3 adds r1, r3
@@ -854,7 +854,7 @@ _0803F392:
bhi _0803F39A bhi _0803F39A
b _0803F59C b _0803F59C
_0803F39A: _0803F39A:
ldr r0, _0803F3B8 @ =gUnknown_2023D71 ldr r0, _0803F3B8 @ =gCritMultiplier
ldrb r1, [r0] ldrb r1, [r0]
adds r4, r0, 0 adds r4, r0, 0
cmp r1, 0x2 cmp r1, 0x2
@@ -866,9 +866,9 @@ _0803F39A:
ldr r2, _0803F3BC @ =gUnknown_825DEAD ldr r2, _0803F3BC @ =gUnknown_825DEAD
b _0803F3CA b _0803F3CA
.align 2, 0 .align 2, 0
_0803F3B0: .4byte gUnknown_2022B4C _0803F3B0: .4byte gBattleTypeFlags
_0803F3B4: .4byte gUnknown_8250C04 _0803F3B4: .4byte gBattleMoves
_0803F3B8: .4byte gUnknown_2023D71 _0803F3B8: .4byte gCritMultiplier
_0803F3BC: .4byte gUnknown_825DEAD _0803F3BC: .4byte gUnknown_825DEAD
_0803F3C0: _0803F3C0:
mov r5, r8 mov r5, r8
@@ -951,7 +951,7 @@ _0803F43E:
ldrb r1, [r4] ldrb r1, [r4]
cmp r1, 0x1 cmp r1, 0x1
bne _0803F492 bne _0803F492
ldr r0, _0803F488 @ =gUnknown_2022B4C ldr r0, _0803F488 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
@@ -969,19 +969,19 @@ _0803F43E:
b _0803F492 b _0803F492
.align 2, 0 .align 2, 0
_0803F484: .4byte gUnknown_825DEAD _0803F484: .4byte gUnknown_825DEAD
_0803F488: .4byte gUnknown_2022B4C _0803F488: .4byte gBattleTypeFlags
_0803F48C: _0803F48C:
lsrs r0, r5, 31 lsrs r0, r5, 31
adds r0, r5, r0 adds r0, r5, r0
asrs r5, r0, 1 asrs r5, r0, 1
_0803F492: _0803F492:
ldr r0, _0803F50C @ =gUnknown_2022B4C ldr r0, _0803F50C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x1 movs r1, 0x1
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0803F4C4 beq _0803F4C4
ldr r0, _0803F510 @ =gUnknown_8250C04 ldr r0, _0803F510 @ =gBattleMoves
ldr r2, [sp, 0x8] ldr r2, [sp, 0x8]
lsls r1, r2, 1 lsls r1, r2, 1
adds r1, r2 adds r1, r2
@@ -1020,7 +1020,7 @@ _0803F4C4:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0803F574 bne _0803F574
ldr r2, _0803F514 @ =gUnknown_2023F1C ldr r2, _0803F514 @ =gBattleWeather
ldrh r1, [r2] ldrh r1, [r2]
movs r0, 0x1 movs r0, 0x1
ands r0, r1 ands r0, r1
@@ -1034,9 +1034,9 @@ _0803F4C4:
beq _0803F520 beq _0803F520
b _0803F52C b _0803F52C
.align 2, 0 .align 2, 0
_0803F50C: .4byte gUnknown_2022B4C _0803F50C: .4byte gBattleTypeFlags
_0803F510: .4byte gUnknown_8250C04 _0803F510: .4byte gBattleMoves
_0803F514: .4byte gUnknown_2023F1C _0803F514: .4byte gBattleWeather
_0803F518: _0803F518:
lsrs r0, r5, 31 lsrs r0, r5, 31
adds r0, r5, r0 adds r0, r5, r0
@@ -1054,7 +1054,7 @@ _0803F52C:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0803F544 beq _0803F544
ldr r0, _0803F55C @ =gUnknown_2023D4A ldr r0, _0803F55C @ =gCurrentMove
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4C cmp r0, 0x4C
bne _0803F544 bne _0803F544
@@ -1074,7 +1074,7 @@ _0803F544:
beq _0803F56E beq _0803F56E
b _0803F574 b _0803F574
.align 2, 0 .align 2, 0
_0803F55C: .4byte gUnknown_2023D4A _0803F55C: .4byte gCurrentMove
_0803F560: _0803F560:
lsls r0, r5, 4 lsls r0, r5, 4
subs r0, r5 subs r0, r5
@@ -1087,7 +1087,7 @@ _0803F56E:
adds r0, r5, r0 adds r0, r5, r0
asrs r5, r0, 1 asrs r5, r0, 1
_0803F574: _0803F574:
ldr r0, _0803F5B0 @ =gUnknown_2023FF4 ldr r0, _0803F5B0 @ =gBattleResources
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
ldr r7, [sp, 0x10] ldr r7, [sp, 0x10]
@@ -1117,7 +1117,7 @@ _0803F59C:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0803F5B0: .4byte gUnknown_2023FF4 _0803F5B0: .4byte gBattleResources
thumb_func_end sub_803ECEC thumb_func_end sub_803ECEC
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+14 -14
View File
@@ -250,7 +250,7 @@ StoreSelectedPokemonInDaycare: @ 8045580
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080455A4 @ =gUnknown_2024284 ldr r1, _080455A4 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _080455A8 @ =gSaveBlock1Ptr ldr r1, _080455A8 @ =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
@@ -261,7 +261,7 @@ StoreSelectedPokemonInDaycare: @ 8045580
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080455A4: .4byte gUnknown_2024284 _080455A4: .4byte gPlayerParty
_080455A8: .4byte gSaveBlock1Ptr _080455A8: .4byte gSaveBlock1Ptr
thumb_func_end StoreSelectedPokemonInDaycare thumb_func_end StoreSelectedPokemonInDaycare
@@ -390,7 +390,7 @@ TakeSelectedPokemonFromDaycare: @ 804565C
mov r0, sp mov r0, sp
bl ApplyDaycareExperience bl ApplyDaycareExperience
_080456AA: _080456AA:
ldr r0, _080456FC @ =gUnknown_2024284 ldr r0, _080456FC @ =gPlayerParty
movs r1, 0xFA movs r1, 0xFA
lsls r1, 1 lsls r1, 1
adds r6, r0, r1 adds r6, r0, r1
@@ -426,7 +426,7 @@ _080456D8:
bx r1 bx r1
.align 2, 0 .align 2, 0
_080456F8: .4byte gStringVar1 _080456F8: .4byte gStringVar1
_080456FC: .4byte gUnknown_2024284 _080456FC: .4byte gPlayerParty
thumb_func_end TakeSelectedPokemonFromDaycare thumb_func_end TakeSelectedPokemonFromDaycare
thumb_func_start TakeSelectedPokemonMonFromDaycareShiftSlots thumb_func_start TakeSelectedPokemonMonFromDaycareShiftSlots
@@ -1784,7 +1784,7 @@ sub_80460D4: @ 80460D4
mov r0, sp mov r0, sp
movs r1, 0x2D movs r1, 0x2D
bl sub_804037C bl sub_804037C
ldr r0, _0804614C @ =gUnknown_2024284 ldr r0, _0804614C @ =gPlayerParty
movs r1, 0xFA movs r1, 0xFA
lsls r1, 1 lsls r1, 1
adds r0, r1 adds r0, r1
@@ -1800,7 +1800,7 @@ sub_80460D4: @ 80460D4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0804614C: .4byte gUnknown_2024284 _0804614C: .4byte gPlayerParty
thumb_func_end sub_80460D4 thumb_func_end sub_80460D4
thumb_func_start CreateEgg thumb_func_start CreateEgg
@@ -2058,7 +2058,7 @@ _08046350:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _08046388 @ =gUnknown_2024284 ldr r0, _08046388 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2D movs r1, 0x2D
@@ -2081,7 +2081,7 @@ _08046350:
movs r0, 0x1 movs r0, 0x1
b _080463AA b _080463AA
.align 2, 0 .align 2, 0
_08046388: .4byte gUnknown_2024284 _08046388: .4byte gPlayerParty
_0804638C: .4byte gUnknown_20370C0 _0804638C: .4byte gUnknown_20370C0
_08046390: _08046390:
subs r0, 0x1 subs r0, 0x1
@@ -2202,7 +2202,7 @@ GetSelectedMonNickAndSpecies: @ 8046460
lsrs r0, 24 lsrs r0, 24
movs r5, 0x64 movs r5, 0x64
muls r0, r5 muls r0, r5
ldr r4, _08046494 @ =gUnknown_2024284 ldr r4, _08046494 @ =gPlayerParty
adds r0, r4 adds r0, r4
ldr r1, _08046498 @ =gStringVar1 ldr r1, _08046498 @ =gStringVar1
bl GetBoxMonNick bl GetBoxMonNick
@@ -2219,7 +2219,7 @@ GetSelectedMonNickAndSpecies: @ 8046460
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08046494: .4byte gUnknown_2024284 _08046494: .4byte gPlayerParty
_08046498: .4byte gStringVar1 _08046498: .4byte gStringVar1
thumb_func_end GetSelectedMonNickAndSpecies thumb_func_end GetSelectedMonNickAndSpecies
@@ -2348,7 +2348,7 @@ GetDaycareCompatibilityScore: @ 804654C
adds r2, 0x14 adds r2, 0x14
str r2, [sp, 0x24] str r2, [sp, 0x24]
subs r0, 0x6 subs r0, 0x6
ldr r1, _08046600 @ =gUnknown_8254784 ldr r1, _08046600 @ =gBaseStats
mov r10, r1 mov r10, r1
ldr r5, [sp, 0x20] ldr r5, [sp, 0x20]
mov r8, r0 mov r8, r0
@@ -2420,7 +2420,7 @@ _080465FC:
movs r0, 0 movs r0, 0
b _0804665C b _0804665C
.align 2, 0 .align 2, 0
_08046600: .4byte gUnknown_8254784 _08046600: .4byte gBaseStats
_08046604: _08046604:
cmp r0, 0xD cmp r0, 0xD
bne _08046614 bne _08046614
@@ -3123,7 +3123,7 @@ sub_8046B40: @ 8046B40
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08046B64 @ =gUnknown_2024284 ldr r1, _08046B64 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _08046B68 @ =gSaveBlock1Ptr ldr r1, _08046B68 @ =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
@@ -3133,7 +3133,7 @@ sub_8046B40: @ 8046B40
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08046B64: .4byte gUnknown_2024284 _08046B64: .4byte gPlayerParty
_08046B68: .4byte gSaveBlock1Ptr _08046B68: .4byte gSaveBlock1Ptr
_08046B6C: .4byte 0x00003c98 _08046B6C: .4byte 0x00003c98
thumb_func_end sub_8046B40 thumb_func_end sub_8046B40
+17 -17
View File
@@ -185,9 +185,9 @@ AddHatchedMonToParty: @ 8046D60
movs r1, 0x64 movs r1, 0x64
adds r5, r0, 0 adds r5, r0, 0
muls r5, r1 muls r5, r1
ldr r0, _08046E14 @ =gUnknown_2024284 ldr r0, _08046E14 @ =gPlayerParty
adds r5, r0 adds r5, r0
ldr r1, _08046E18 @ =gUnknown_202402C ldr r1, _08046E18 @ =gEnemyParty
adds r0, r5, 0 adds r0, r5, 0
bl sub_8046BFC bl sub_8046BFC
adds r0, r5, 0 adds r0, r5, 0
@@ -250,8 +250,8 @@ AddHatchedMonToParty: @ 8046D60
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08046E14: .4byte gUnknown_2024284 _08046E14: .4byte gPlayerParty
_08046E18: .4byte gUnknown_202402C _08046E18: .4byte gEnemyParty
_08046E1C: .4byte gStringVar1 _08046E1C: .4byte gStringVar1
thumb_func_end AddHatchedMonToParty thumb_func_end AddHatchedMonToParty
@@ -366,7 +366,7 @@ sub_8046ED0: @ 8046ED0
bne _08046EFE bne _08046EFE
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _08046F18 @ =gUnknown_2024284 ldr r0, _08046F18 @ =gPlayerParty
adds r5, r1, r0 adds r5, r1, r0
movs r4, 0x1 movs r4, 0x1
_08046EFE: _08046EFE:
@@ -375,7 +375,7 @@ _08046EFE:
movs r0, 0x64 movs r0, 0x64
adds r1, r2, 0 adds r1, r2, 0
muls r1, r0 muls r1, r0
ldr r0, _08046F18 @ =gUnknown_2024284 ldr r0, _08046F18 @ =gPlayerParty
adds r5, r1, r0 adds r5, r1, r0
movs r4, 0x3 movs r4, 0x3
_08046F0E: _08046F0E:
@@ -385,7 +385,7 @@ _08046F0E:
beq _08046F6C beq _08046F6C
b _08046FA6 b _08046FA6
.align 2, 0 .align 2, 0
_08046F18: .4byte gUnknown_2024284 _08046F18: .4byte gPlayerParty
_08046F1C: _08046F1C:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0xB movs r1, 0xB
@@ -774,7 +774,7 @@ EggHatchSetMonNickname: @ 80472A0
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080472D4 @ =gUnknown_2024284 ldr r1, _080472D4 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r2, _080472D8 @ =gStringVar3 ldr r2, _080472D8 @ =gStringVar3
movs r1, 0x2 movs r1, 0x2
@@ -790,7 +790,7 @@ EggHatchSetMonNickname: @ 80472A0
bx r0 bx r0
.align 2, 0 .align 2, 0
_080472D0: .4byte gUnknown_20370C0 _080472D0: .4byte gUnknown_20370C0
_080472D4: .4byte gUnknown_2024284 _080472D4: .4byte gPlayerParty
_080472D8: .4byte gStringVar3 _080472D8: .4byte gStringVar3
_080472DC: .4byte gUnknown_3000E74 _080472DC: .4byte gUnknown_3000E74
_080472E0: .4byte c2_exit_to_overworld_2_switch _080472E0: .4byte c2_exit_to_overworld_2_switch
@@ -997,7 +997,7 @@ _08047482:
ldrb r1, [r0, 0x4] ldrb r1, [r0, 0x4]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080474D4 @ =gUnknown_2024284 ldr r1, _080474D4 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _080474D8 @ =gStringVar1 ldr r1, _080474D8 @ =gStringVar1
bl GetMonNick bl GetMonNick
@@ -1028,7 +1028,7 @@ _08047482:
bl CopyWindowToVram bl CopyWindowToVram
b _08047684 b _08047684
.align 2, 0 .align 2, 0
_080474D4: .4byte gUnknown_2024284 _080474D4: .4byte gPlayerParty
_080474D8: .4byte gStringVar1 _080474D8: .4byte gStringVar1
_080474DC: .4byte gStringVar4 _080474DC: .4byte gStringVar4
_080474E0: .4byte gUnknown_841B6FD _080474E0: .4byte gUnknown_841B6FD
@@ -1054,7 +1054,7 @@ _08047504:
ldrb r1, [r0, 0x4] ldrb r1, [r0, 0x4]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08047538 @ =gUnknown_2024284 ldr r1, _08047538 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _0804753C @ =gStringVar1 ldr r1, _0804753C @ =gStringVar1
bl GetMonNick bl GetMonNick
@@ -1073,7 +1073,7 @@ _08047504:
ldr r1, [r5] ldr r1, [r5]
b _08047648 b _08047648
.align 2, 0 .align 2, 0
_08047538: .4byte gUnknown_2024284 _08047538: .4byte gPlayerParty
_0804753C: .4byte gStringVar1 _0804753C: .4byte gStringVar1
_08047540: .4byte gStringVar4 _08047540: .4byte gStringVar4
_08047544: .4byte gUnknown_841B716 _08047544: .4byte gUnknown_841B716
@@ -1134,7 +1134,7 @@ _080475A8:
mov r1, r8 mov r1, r8
muls r1, r0 muls r1, r0
adds r0, r1, 0 adds r0, r1, 0
ldr r6, _08047628 @ =gUnknown_2024284 ldr r6, _08047628 @ =gPlayerParty
adds r0, r6 adds r0, r6
ldr r1, _0804762C @ =gStringVar3 ldr r1, _0804762C @ =gStringVar3
mov r10, r1 mov r10, r1
@@ -1183,7 +1183,7 @@ _080475A8:
b _08047684 b _08047684
.align 2, 0 .align 2, 0
_08047624: .4byte gUnknown_3000E74 _08047624: .4byte gUnknown_3000E74
_08047628: .4byte gUnknown_2024284 _08047628: .4byte gPlayerParty
_0804762C: .4byte gStringVar3 _0804762C: .4byte gStringVar3
_08047630: .4byte EggHatchSetMonNickname _08047630: .4byte EggHatchSetMonNickname
_08047634: _08047634:
@@ -1366,7 +1366,7 @@ SpriteCB_Egg_2: @ 804776C
ldrb r1, [r0, 0x4] ldrb r1, [r0, 0x4]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080477D8 @ =gUnknown_2024284 ldr r1, _080477D8 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -1393,7 +1393,7 @@ SpriteCB_Egg_2: @ 804776C
.align 2, 0 .align 2, 0
_080477D0: .4byte SpriteCB_Egg_3 _080477D0: .4byte SpriteCB_Egg_3
_080477D4: .4byte gUnknown_3000E74 _080477D4: .4byte gUnknown_3000E74
_080477D8: .4byte gUnknown_2024284 _080477D8: .4byte gPlayerParty
_080477DC: .4byte gSprites _080477DC: .4byte gSprites
_080477E0: .4byte gUnknown_82349CC _080477E0: .4byte gUnknown_82349CC
_080477E4: _080477E4:
+18 -18
View File
@@ -58,7 +58,7 @@ _080CDD68:
ldrsh r1, [r6, r0] ldrsh r1, [r6, r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080CDDA4 @ =gUnknown_2024284 ldr r0, _080CDDA4 @ =gPlayerParty
adds r7, r1, r0 adds r7, r1, r0
ldrh r4, [r6, 0xC] ldrh r4, [r6, 0xC]
ldrb r5, [r6, 0xE] ldrb r5, [r6, 0xE]
@@ -77,7 +77,7 @@ _080CDD98:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CDDA0: .4byte gUnknown_2037AB8 _080CDDA0: .4byte gUnknown_2037AB8
_080CDDA4: .4byte gUnknown_2024284 _080CDDA4: .4byte gPlayerParty
thumb_func_end Task_BeginEvolutionScene thumb_func_end Task_BeginEvolutionScene
thumb_func_start BeginEvolutionScene thumb_func_start BeginEvolutionScene
@@ -450,7 +450,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
movs r1, 0x64 movs r1, 0x64
adds r4, r2, 0 adds r4, r2, 0
muls r4, r1 muls r4, r1
ldr r1, _080CE288 @ =gUnknown_2024284 ldr r1, _080CE288 @ =gPlayerParty
adds r4, r1 adds r4, r1
ldrh r5, [r0, 0xC] ldrh r5, [r0, 0xC]
adds r0, r4, 0 adds r0, r4, 0
@@ -606,7 +606,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
.align 2, 0 .align 2, 0
_080CE280: .4byte gUnknown_3005090 _080CE280: .4byte gUnknown_3005090
_080CE284: .4byte gUnknown_2039A20 _080CE284: .4byte gUnknown_2039A20
_080CE288: .4byte gUnknown_2024284 _080CE288: .4byte gPlayerParty
_080CE28C: .4byte 0x05006000 _080CE28C: .4byte 0x05006000
_080CE290: .4byte gUnknown_2022974 _080CE290: .4byte gUnknown_2022974
_080CE294: .4byte gUnknown_2022976 _080CE294: .4byte gUnknown_2022976
@@ -645,7 +645,7 @@ CB2_TradeEvolutionSceneLoadGraphics: @ 80CE2DC
ldrsh r2, [r0, r1] ldrsh r2, [r0, r1]
movs r1, 0x64 movs r1, 0x64
muls r2, r1 muls r2, r1
ldr r1, _080CE320 @ =gUnknown_2024284 ldr r1, _080CE320 @ =gPlayerParty
adds r4, r2, r1 adds r4, r2, r1
ldrh r6, [r0, 0xC] ldrh r6, [r0, 0xC]
ldr r0, _080CE324 @ =gMain ldr r0, _080CE324 @ =gMain
@@ -665,7 +665,7 @@ _080CE30E:
.align 2, 0 .align 2, 0
_080CE318: .4byte gUnknown_3005090 _080CE318: .4byte gUnknown_3005090
_080CE31C: .4byte gUnknown_2039A20 _080CE31C: .4byte gUnknown_2039A20
_080CE320: .4byte gUnknown_2024284 _080CE320: .4byte gPlayerParty
_080CE324: .4byte gMain _080CE324: .4byte gMain
_080CE328: .4byte _080CE32C _080CE328: .4byte _080CE32C
.align 2, 0 .align 2, 0
@@ -1149,7 +1149,7 @@ _080CE778:
_080CE782: _080CE782:
movs r5, 0x64 movs r5, 0x64
muls r0, r5 muls r0, r5
ldr r4, _080CE8CC @ =gUnknown_2024284 ldr r4, _080CE8CC @ =gPlayerParty
adds r0, r4 adds r0, r4
mov r9, r0 mov r9, r0
ldr r1, [sp, 0x4] ldr r1, [sp, 0x4]
@@ -1200,7 +1200,7 @@ _080CE7F0:
ldrb r1, [r5] ldrb r1, [r5]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CE8CC @ =gUnknown_2024284 ldr r1, _080CE8CC @ =gPlayerParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
mov r2, sp mov r2, sp
@@ -1214,7 +1214,7 @@ _080CE80C:
ldrb r0, [r7] ldrb r0, [r7]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _080CE8CC @ =gUnknown_2024284 ldr r5, _080CE8CC @ =gPlayerParty
adds r0, r5 adds r0, r5
adds r1, r4, 0 adds r1, r4, 0
mov r2, sp mov r2, sp
@@ -1293,7 +1293,7 @@ _080CE8B2:
.align 2, 0 .align 2, 0
_080CE8C4: .4byte gUnknown_8259754 _080CE8C4: .4byte gUnknown_8259754
_080CE8C8: .4byte gUnknown_2024029 _080CE8C8: .4byte gUnknown_2024029
_080CE8CC: .4byte gUnknown_2024284 _080CE8CC: .4byte gPlayerParty
_080CE8D0: .4byte gUnknown_8245EE0 _080CE8D0: .4byte gUnknown_8245EE0
_080CE8D4: .4byte 0x0000012f _080CE8D4: .4byte 0x0000012f
_080CE8D8: .4byte gUnknown_83F8440 _080CE8D8: .4byte gUnknown_83F8440
@@ -1318,7 +1318,7 @@ sub_80CE8DC: @ 80CE8DC
ldrsh r1, [r5, r0] ldrsh r1, [r5, r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080CE940 @ =gUnknown_2024284 ldr r0, _080CE940 @ =gPlayerParty
adds r1, r0 adds r1, r0
mov r9, r1 mov r9, r1
bl sub_806E25C bl sub_806E25C
@@ -1348,7 +1348,7 @@ sub_80CE8DC: @ 80CE8DC
bl _080CF528 bl _080CF528
.align 2, 0 .align 2, 0
_080CE93C: .4byte gUnknown_3005090 _080CE93C: .4byte gUnknown_3005090
_080CE940: .4byte gUnknown_2024284 _080CE940: .4byte gPlayerParty
_080CE944: .4byte gUnknown_2023E82 _080CE944: .4byte gUnknown_2023E82
_080CE948: _080CE948:
ldr r0, _080CE9A0 @ =gMain ldr r0, _080CE9A0 @ =gMain
@@ -2433,7 +2433,7 @@ _080CF2B4:
b _080CF528 b _080CF528
_080CF2C2: _080CF2C2:
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
ldr r0, _080CF2F8 @ =gUnknown_2024284 ldr r0, _080CF2F8 @ =gPlayerParty
ldr r1, _080CF2FC @ =gUnknown_3005090 ldr r1, _080CF2FC @ =gUnknown_3005090
mov r3, r8 mov r3, r8
adds r5, r3, r7 adds r5, r3, r7
@@ -2456,7 +2456,7 @@ _080CF2C2:
b _080CF528 b _080CF528
.align 2, 0 .align 2, 0
_080CF2F4: .4byte gUnknown_2037AB8 _080CF2F4: .4byte gUnknown_2037AB8
_080CF2F8: .4byte gUnknown_2024284 _080CF2F8: .4byte gPlayerParty
_080CF2FC: .4byte gUnknown_3005090 _080CF2FC: .4byte gUnknown_3005090
_080CF300: .4byte gUnknown_2024029 _080CF300: .4byte gUnknown_2024029
_080CF304: .4byte CB2_EvolutionSceneLoadGraphics _080CF304: .4byte CB2_EvolutionSceneLoadGraphics
@@ -2733,7 +2733,7 @@ sub_80CF53C: @ 80CF53C
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080CF5C0 @ =gUnknown_2024284 ldr r0, _080CF5C0 @ =gPlayerParty
adds r1, r0 adds r1, r0
mov r8, r1 mov r8, r1
bl sub_806E25C bl sub_806E25C
@@ -2783,7 +2783,7 @@ _080CF5B2:
mov pc, r0 mov pc, r0
.align 2, 0 .align 2, 0
_080CF5BC: .4byte gUnknown_3005090 _080CF5BC: .4byte gUnknown_3005090
_080CF5C0: .4byte gUnknown_2024284 _080CF5C0: .4byte gPlayerParty
_080CF5C4: .4byte gUnknown_2023E82 _080CF5C4: .4byte gUnknown_2023E82
_080CF5C8: .4byte _080CF5CC _080CF5C8: .4byte _080CF5CC
.align 2, 0 .align 2, 0
@@ -3703,7 +3703,7 @@ _080CFDC6:
bl GetBgTilemapBuffer bl GetBgTilemapBuffer
bl Free bl Free
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
ldr r0, _080CFE1C @ =gUnknown_2024284 ldr r0, _080CFE1C @ =gPlayerParty
ldr r1, _080CFE20 @ =gUnknown_3005090 ldr r1, _080CFE20 @ =gUnknown_3005090
adds r5, r7, r6 adds r5, r7, r6
lsls r5, 3 lsls r5, 3
@@ -3726,7 +3726,7 @@ _080CFDC6:
.align 2, 0 .align 2, 0
_080CFE14: .4byte gUnknown_2037AB8 _080CFE14: .4byte gUnknown_2037AB8
_080CFE18: .4byte gUnknown_3003F3C _080CFE18: .4byte gUnknown_3003F3C
_080CFE1C: .4byte gUnknown_2024284 _080CFE1C: .4byte gPlayerParty
_080CFE20: .4byte gUnknown_3005090 _080CFE20: .4byte gUnknown_3005090
_080CFE24: .4byte gUnknown_2024029 _080CFE24: .4byte gUnknown_2024029
_080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics _080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics
+2 -2
View File
@@ -3434,7 +3434,7 @@ _0812DF00:
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
lsls r0, 3 lsls r0, 3
ldr r1, _0812DF5C @ =gUnknown_823EACC ldr r1, _0812DF5C @ =gTrainers+0x4
adds r0, r1 adds r0, r1
str r0, [r2] str r0, [r2]
str r4, [r2, 0x4] str r4, [r2, 0x4]
@@ -3446,7 +3446,7 @@ _0812DF4C: .4byte gSaveBlock1Ptr
_0812DF50: .4byte 0x00003a54 _0812DF50: .4byte 0x00003a54
_0812DF54: .4byte gUnknown_845F5EA _0812DF54: .4byte gUnknown_845F5EA
_0812DF58: .4byte gUnknown_203B100 _0812DF58: .4byte gUnknown_203B100
_0812DF5C: .4byte gUnknown_823EACC _0812DF5C: .4byte gTrainers+0x4
_0812DF60: _0812DF60:
ldr r0, _0812DFC0 @ =gUnknown_203B100 ldr r0, _0812DFC0 @ =gUnknown_203B100
ldr r0, [r0] ldr r0, [r0]
+2 -2
View File
@@ -1882,7 +1882,7 @@ AdjustFriendship_step: @ 806D74C
strh r1, [r0] strh r1, [r0]
cmp r1, 0 cmp r1, 0
bne _0806D77A bne _0806D77A
ldr r5, _0806D784 @ =gUnknown_2024284 ldr r5, _0806D784 @ =gPlayerParty
movs r4, 0x5 movs r4, 0x5
_0806D76A: _0806D76A:
adds r0, r5, 0 adds r0, r5, 0
@@ -1898,7 +1898,7 @@ _0806D77A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0806D780: .4byte 0x00004021 _0806D780: .4byte 0x00004021
_0806D784: .4byte gUnknown_2024284 _0806D784: .4byte gPlayerParty
thumb_func_end AdjustFriendship_step thumb_func_end AdjustFriendship_step
thumb_func_start overworld_poison_timer_set thumb_func_start overworld_poison_timer_set
+2 -2
View File
@@ -5813,7 +5813,7 @@ FldEff_FieldMoveShowMonInit: @ 8086084
movs r1, 0x64 movs r1, 0x64
adds r4, r0, 0 adds r4, r0, 0
muls r4, r1 muls r4, r1
ldr r0, _080860DC @ =gUnknown_2024284 ldr r0, _080860DC @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -5840,7 +5840,7 @@ FldEff_FieldMoveShowMonInit: @ 8086084
bx r1 bx r1
.align 2, 0 .align 2, 0
_080860D8: .4byte gUnknown_20386E0 _080860D8: .4byte gUnknown_20386E0
_080860DC: .4byte gUnknown_2024284 _080860DC: .4byte gPlayerParty
thumb_func_end FldEff_FieldMoveShowMonInit thumb_func_end FldEff_FieldMoveShowMonInit
thumb_func_start sub_80860E0 thumb_func_start sub_80860E0
+2 -2
View File
@@ -2834,7 +2834,7 @@ _0805C866:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _0805C888 @ =gUnknown_2024284 ldr r0, _0805C888 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -2848,7 +2848,7 @@ _0805C882:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0805C888: .4byte gUnknown_2024284 _0805C888: .4byte gPlayerParty
thumb_func_end PartyHasMonWithSurf thumb_func_end PartyHasMonWithSurf
thumb_func_start IsPlayerSurfingNorth thumb_func_start IsPlayerSurfingNorth
+8 -8
View File
@@ -31,7 +31,7 @@ _080A047E:
thumb_func_start AllMonsFainted thumb_func_start AllMonsFainted
AllMonsFainted: @ 80A0484 AllMonsFainted: @ 80A0484
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, _080A04A4 @ =gUnknown_2024284 ldr r4, _080A04A4 @ =gPlayerParty
movs r5, 0 movs r5, 0
_080A048A: _080A048A:
adds r0, r4, 0 adds r0, r4, 0
@@ -46,7 +46,7 @@ _080A048A:
movs r0, 0 movs r0, 0
b _080A04B2 b _080A04B2
.align 2, 0 .align 2, 0
_080A04A4: .4byte gUnknown_2024284 _080A04A4: .4byte gPlayerParty
_080A04A8: _080A04A8:
adds r5, 0x1 adds r5, 0x1
adds r4, 0x64 adds r4, 0x64
@@ -68,7 +68,7 @@ MonFaintFromPoisonOnField: @ 80A04B8
movs r1, 0x64 movs r1, 0x64
adds r4, r0, 0 adds r4, r0, 0
muls r4, r1 muls r4, r1
ldr r0, _080A04FC @ =gUnknown_2024284 ldr r0, _080A04FC @ =gPlayerParty
adds r4, r0 adds r4, r0
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
@@ -91,7 +91,7 @@ MonFaintFromPoisonOnField: @ 80A04B8
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A04FC: .4byte gUnknown_2024284 _080A04FC: .4byte gPlayerParty
_080A0500: .4byte gStringVar1 _080A0500: .4byte gStringVar1
thumb_func_end MonFaintFromPoisonOnField thumb_func_end MonFaintFromPoisonOnField
@@ -102,7 +102,7 @@ CheckMonFaintedFromPoison: @ 80A0504
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080A0540 @ =gUnknown_2024284 ldr r0, _080A0540 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl CheckMonIsValid bl CheckMonIsValid
@@ -124,7 +124,7 @@ CheckMonFaintedFromPoison: @ 80A0504
movs r0, 0x1 movs r0, 0x1
b _080A0546 b _080A0546
.align 2, 0 .align 2, 0
_080A0540: .4byte gUnknown_2024284 _080A0540: .4byte gPlayerParty
_080A0544: _080A0544:
movs r0, 0 movs r0, 0
_080A0546: _080A0546:
@@ -245,7 +245,7 @@ _080A0614: .4byte Task_WhiteOut
overworld_poison: @ 80A0618 overworld_poison: @ 80A0618
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
ldr r4, _080A0684 @ =gUnknown_2024284 ldr r4, _080A0684 @ =gPlayerParty
movs r7, 0 movs r7, 0
movs r6, 0 movs r6, 0
movs r5, 0x5 movs r5, 0x5
@@ -298,7 +298,7 @@ _080A067C:
movs r0, 0x2 movs r0, 0x2
b _080A0692 b _080A0692
.align 2, 0 .align 2, 0
_080A0684: .4byte gUnknown_2024284 _080A0684: .4byte gPlayerParty
_080A0688: _080A0688:
cmp r7, 0 cmp r7, 0
bne _080A0690 bne _080A0690
+50 -50
View File
@@ -205,7 +205,7 @@ sub_80CA76C: @ 80CA76C
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080CA790 @ =gUnknown_2024284 ldr r0, _080CA790 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x20 movs r1, 0x20
@@ -215,7 +215,7 @@ sub_80CA76C: @ 80CA76C
movs r0, 0x6 movs r0, 0x6
b _080CA7E6 b _080CA7E6
.align 2, 0 .align 2, 0
_080CA790: .4byte gUnknown_2024284 _080CA790: .4byte gPlayerParty
_080CA794: _080CA794:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x20 movs r1, 0x20
@@ -281,12 +281,12 @@ _080CA800: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
sub_80CA804: @ 80CA804 sub_80CA804: @ 80CA804
push {r4-r6,lr} push {r4-r6,lr}
movs r5, 0 movs r5, 0
ldr r6, _080CA850 @ =gUnknown_8254784 ldr r6, _080CA850 @ =gBaseStats
_080CA80A: _080CA80A:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _080CA854 @ =gUnknown_2024284 ldr r0, _080CA854 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x5 movs r1, 0x5
@@ -317,8 +317,8 @@ _080CA84C:
movs r0, 0x1 movs r0, 0x1
b _080CA864 b _080CA864
.align 2, 0 .align 2, 0
_080CA850: .4byte gUnknown_8254784 _080CA850: .4byte gBaseStats
_080CA854: .4byte gUnknown_2024284 _080CA854: .4byte gPlayerParty
_080CA858: _080CA858:
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
@@ -680,7 +680,7 @@ LeadMonHasEffortRibbon: @ 80CAAE0
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CAB04 @ =gUnknown_2024284 ldr r1, _080CAB04 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x47 movs r1, 0x47
movs r2, 0 movs r2, 0
@@ -690,7 +690,7 @@ LeadMonHasEffortRibbon: @ 80CAAE0
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_080CAB04: .4byte gUnknown_2024284 _080CAB04: .4byte gPlayerParty
thumb_func_end LeadMonHasEffortRibbon thumb_func_end LeadMonHasEffortRibbon
thumb_func_start GivLeadMonEffortRibbon thumb_func_start GivLeadMonEffortRibbon
@@ -709,7 +709,7 @@ GivLeadMonEffortRibbon: @ 80CAB08
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CAB40 @ =gUnknown_2024284 ldr r1, _080CAB40 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x47 movs r1, 0x47
mov r2, sp mov r2, sp
@@ -719,7 +719,7 @@ GivLeadMonEffortRibbon: @ 80CAB08
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CAB3C: .4byte 0x0000083b _080CAB3C: .4byte 0x0000083b
_080CAB40: .4byte gUnknown_2024284 _080CAB40: .4byte gPlayerParty
thumb_func_end GivLeadMonEffortRibbon thumb_func_end GivLeadMonEffortRibbon
thumb_func_start ScrSpecial_AreLeadMonEVsMaxedOut thumb_func_start ScrSpecial_AreLeadMonEVsMaxedOut
@@ -730,7 +730,7 @@ ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CAB68 @ =gUnknown_2024284 ldr r1, _080CAB68 @ =gPlayerParty
adds r0, r1 adds r0, r1
bl GetMonEVCount bl GetMonEVCount
lsls r0, 16 lsls r0, 16
@@ -740,7 +740,7 @@ ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44
movs r0, 0 movs r0, 0
b _080CAB72 b _080CAB72
.align 2, 0 .align 2, 0
_080CAB68: .4byte gUnknown_2024284 _080CAB68: .4byte gPlayerParty
_080CAB6C: .4byte 0x01fd0000 _080CAB6C: .4byte 0x01fd0000
_080CAB70: _080CAB70:
movs r0, 0x1 movs r0, 0x1
@@ -768,7 +768,7 @@ sub_80CAB78: @ 80CAB78
_080CAB9A: _080CAB9A:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _080CABB8 @ =gUnknown_2024284 ldr r1, _080CABB8 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
movs r2, 0 movs r2, 0
@@ -779,7 +779,7 @@ _080CAB9A:
b _080CABC8 b _080CABC8
.align 2, 0 .align 2, 0
_080CABB4: .4byte 0x00004031 _080CABB4: .4byte 0x00004031
_080CABB8: .4byte gUnknown_2024284 _080CABB8: .4byte gPlayerParty
_080CABBC: _080CABBC:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
@@ -832,7 +832,7 @@ _080CAC02:
thumb_func_start sub_80CAC08 thumb_func_start sub_80CAC08
sub_80CAC08: @ 80CAC08 sub_80CAC08: @ 80CAC08
push {lr} push {lr}
ldr r0, _080CAC1C @ =gUnknown_2024284 ldr r0, _080CAC1C @ =gPlayerParty
movs r1, 0x3F movs r1, 0x3F
bl CheckPartyPokerus bl CheckPartyPokerus
lsls r0, 24 lsls r0, 24
@@ -841,7 +841,7 @@ sub_80CAC08: @ 80CAC08
movs r0, 0x1 movs r0, 0x1
b _080CAC22 b _080CAC22
.align 2, 0 .align 2, 0
_080CAC1C: .4byte gUnknown_2024284 _080CAC1C: .4byte gPlayerParty
_080CAC20: _080CAC20:
movs r0, 0 movs r0, 0
_080CAC22: _080CAC22:
@@ -965,7 +965,7 @@ _080CAD0C:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _080CAD3C @ =gUnknown_2024284 ldr r0, _080CAD3C @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -984,7 +984,7 @@ _080CAD0C:
adds r0, r5, 0 adds r0, r5, 0
b _080CAD4C b _080CAD4C
.align 2, 0 .align 2, 0
_080CAD3C: .4byte gUnknown_2024284 _080CAD3C: .4byte gPlayerParty
_080CAD40: _080CAD40:
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
@@ -1006,7 +1006,7 @@ sub_80CAD54: @ 80CAD54
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CAD78 @ =gUnknown_2024284 ldr r1, _080CAD78 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
movs r2, 0 movs r2, 0
@@ -1017,7 +1017,7 @@ sub_80CAD54: @ 80CAD54
bx r1 bx r1
.align 2, 0 .align 2, 0
_080CAD74: .4byte gUnknown_20370C0 _080CAD74: .4byte gUnknown_20370C0
_080CAD78: .4byte gUnknown_2024284 _080CAD78: .4byte gPlayerParty
thumb_func_end sub_80CAD54 thumb_func_end sub_80CAD54
thumb_func_start sub_80CAD7C thumb_func_start sub_80CAD7C
@@ -1027,7 +1027,7 @@ sub_80CAD7C: @ 80CAD7C
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CADAC @ =gUnknown_2024284 ldr r1, _080CADAC @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r4, _080CADB0 @ =gStringVar1 ldr r4, _080CADB0 @ =gStringVar1
movs r1, 0x7 movs r1, 0x7
@@ -1043,7 +1043,7 @@ sub_80CAD7C: @ 80CAD7C
b _080CADBA b _080CADBA
.align 2, 0 .align 2, 0
_080CADA8: .4byte gUnknown_20370C0 _080CADA8: .4byte gUnknown_20370C0
_080CADAC: .4byte gUnknown_2024284 _080CADAC: .4byte gPlayerParty
_080CADB0: .4byte gStringVar1 _080CADB0: .4byte gStringVar1
_080CADB4: .4byte gSaveBlock2Ptr _080CADB4: .4byte gSaveBlock2Ptr
_080CADB8: _080CADB8:
@@ -3202,7 +3202,7 @@ sub_80CBE50: @ 80CBE50
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080CBEA4 @ =gUnknown_2024284 ldr r0, _080CBEA4 @ =gPlayerParty
adds r5, r1, r0 adds r5, r1, r0
ldr r6, _080CBEA8 @ =gStringVar1 ldr r6, _080CBEA8 @ =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
@@ -3234,7 +3234,7 @@ sub_80CBE50: @ 80CBE50
movs r0, 0 movs r0, 0
b _080CBEB2 b _080CBEB2
.align 2, 0 .align 2, 0
_080CBEA4: .4byte gUnknown_2024284 _080CBEA4: .4byte gPlayerParty
_080CBEA8: .4byte gStringVar1 _080CBEA8: .4byte gStringVar1
_080CBEAC: .4byte gUnknown_8245EE0 _080CBEAC: .4byte gUnknown_8245EE0
_080CBEB0: _080CBEB0:
@@ -3375,7 +3375,7 @@ sub_80CBFA0: @ 80CBFA0
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CBFCC @ =gUnknown_2024284 ldr r1, _080CBFCC @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r4, _080CBFD0 @ =gStringVar1 ldr r4, _080CBFD0 @ =gStringVar1
movs r1, 0x2 movs r1, 0x2
@@ -3390,7 +3390,7 @@ sub_80CBFA0: @ 80CBFA0
b _080CBFDA b _080CBFDA
.align 2, 0 .align 2, 0
_080CBFC8: .4byte gUnknown_20370C0 _080CBFC8: .4byte gUnknown_20370C0
_080CBFCC: .4byte gUnknown_2024284 _080CBFCC: .4byte gPlayerParty
_080CBFD0: .4byte gStringVar1 _080CBFD0: .4byte gStringVar1
_080CBFD4: .4byte gStringVar3 _080CBFD4: .4byte gStringVar3
_080CBFD8: _080CBFD8:
@@ -3494,7 +3494,7 @@ ChangePokemonNickname: @ 80CC088
mov r1, r8 mov r1, r8
muls r1, r0 muls r1, r0
adds r0, r1, 0 adds r0, r1, 0
ldr r6, _080CC134 @ =gUnknown_2024284 ldr r6, _080CC134 @ =gPlayerParty
adds r0, r6 adds r0, r6
ldr r2, _080CC138 @ =gStringVar3 ldr r2, _080CC138 @ =gStringVar3
movs r1, 0x2 movs r1, 0x2
@@ -3559,7 +3559,7 @@ ChangePokemonNickname: @ 80CC088
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CC130: .4byte gUnknown_20370C0 _080CC130: .4byte gUnknown_20370C0
_080CC134: .4byte gUnknown_2024284 _080CC134: .4byte gPlayerParty
_080CC138: .4byte gStringVar3 _080CC138: .4byte gStringVar3
_080CC13C: .4byte gStringVar2 _080CC13C: .4byte gStringVar2
_080CC140: .4byte ChangePokemonNickname_CB _080CC140: .4byte ChangePokemonNickname_CB
@@ -3572,7 +3572,7 @@ ChangePokemonNickname_CB: @ 80CC144
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CC168 @ =gUnknown_2024284 ldr r1, _080CC168 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r2, _080CC16C @ =gStringVar2 ldr r2, _080CC16C @ =gStringVar2
movs r1, 0x2 movs r1, 0x2
@@ -3582,7 +3582,7 @@ ChangePokemonNickname_CB: @ 80CC144
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CC164: .4byte gUnknown_20370C0 _080CC164: .4byte gUnknown_20370C0
_080CC168: .4byte gUnknown_2024284 _080CC168: .4byte gPlayerParty
_080CC16C: .4byte gStringVar2 _080CC16C: .4byte gStringVar2
thumb_func_end ChangePokemonNickname_CB thumb_func_end ChangePokemonNickname_CB
@@ -3593,7 +3593,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CC198 @ =gUnknown_2024284 ldr r1, _080CC198 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r4, _080CC19C @ =gStringVar1 ldr r4, _080CC19C @ =gStringVar1
movs r1, 0x2 movs r1, 0x2
@@ -3606,7 +3606,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CC194: .4byte gUnknown_20370C0 _080CC194: .4byte gUnknown_20370C0
_080CC198: .4byte gUnknown_2024284 _080CC198: .4byte gPlayerParty
_080CC19C: .4byte gStringVar1 _080CC19C: .4byte gStringVar1
thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated
@@ -3619,7 +3619,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CC1CC @ =gUnknown_2024284 ldr r1, _080CC1CC @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
@@ -3631,7 +3631,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0
b _080CC1D8 b _080CC1D8
.align 2, 0 .align 2, 0
_080CC1C8: .4byte gUnknown_20370C0 _080CC1C8: .4byte gUnknown_20370C0
_080CC1CC: .4byte gUnknown_2024284 _080CC1CC: .4byte gPlayerParty
_080CC1D0: .4byte gUnknown_20370D0 _080CC1D0: .4byte gUnknown_20370D0
_080CC1D4: _080CC1D4:
ldr r1, _080CC1E0 @ =gUnknown_20370D0 ldr r1, _080CC1E0 @ =gUnknown_20370D0
@@ -3780,7 +3780,7 @@ _080CC2E4:
movs r0, 0x64 movs r0, 0x64
adds r4, r5, 0 adds r4, r5, 0
muls r4, r0 muls r4, r0
ldr r0, _080CC3BC @ =gUnknown_2024284 ldr r0, _080CC3BC @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -3871,7 +3871,7 @@ _080CC318:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CC3BC: .4byte gUnknown_2024284 _080CC3BC: .4byte gPlayerParty
_080CC3C0: .4byte 0x00004043 _080CC3C0: .4byte 0x00004043
_080CC3C4: .4byte 0x00004042 _080CC3C4: .4byte 0x00004042
_080CC3C8: .4byte gUnknown_20370C0 _080CC3C8: .4byte gUnknown_20370C0
@@ -3994,7 +3994,7 @@ sub_80CC48C: @ 80CC48C
_080CC49C: _080CC49C:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _080CC4B8 @ =gUnknown_2024284 ldr r1, _080CC4B8 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
movs r2, 0 movs r2, 0
@@ -4006,7 +4006,7 @@ _080CC49C:
movs r0, 0x1 movs r0, 0x1
b _080CC4CC b _080CC4CC
.align 2, 0 .align 2, 0
_080CC4B8: .4byte gUnknown_2024284 _080CC4B8: .4byte gPlayerParty
_080CC4BC: .4byte gUnknown_20370C0 _080CC4BC: .4byte gUnknown_20370C0
_080CC4C0: _080CC4C0:
adds r0, r4, 0x1 adds r0, r4, 0x1
@@ -4616,7 +4616,7 @@ sub_80CC948: @ 80CC948
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080CC96C @ =gUnknown_2024284 ldr r1, _080CC96C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x6 movs r1, 0x6
bl sub_80436F8 bl sub_80436F8
@@ -4627,7 +4627,7 @@ sub_80CC948: @ 80CC948
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CC968: .4byte gUnknown_20370C0 _080CC968: .4byte gUnknown_20370C0
_080CC96C: .4byte gUnknown_2024284 _080CC96C: .4byte gPlayerParty
_080CC970: .4byte 0x00004025 _080CC970: .4byte 0x00004025
thumb_func_end sub_80CC948 thumb_func_end sub_80CC948
@@ -4911,12 +4911,12 @@ sub_80CCB94: @ 80CCB94
movs r0, 0x64 movs r0, 0x64
mov r5, r8 mov r5, r8
muls r5, r0 muls r5, r0
ldr r0, _080CCBC4 @ =gUnknown_2024284 ldr r0, _080CCBC4 @ =gPlayerParty
mov r9, r0 mov r9, r0
b _080CCBCE b _080CCBCE
.align 2, 0 .align 2, 0
_080CCBC0: .4byte gUnknown_20370C6 _080CCBC0: .4byte gUnknown_20370C6
_080CCBC4: .4byte gUnknown_2024284 _080CCBC4: .4byte gPlayerParty
_080CCBC8: _080CCBC8:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
@@ -4942,7 +4942,7 @@ _080CCBEA:
mov r1, r8 mov r1, r8
muls r1, r0 muls r1, r0
adds r0, r1, 0 adds r0, r1, 0
ldr r1, _080CCC20 @ =gUnknown_2024284 ldr r1, _080CCC20 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x20 movs r1, 0x20
bl GetMonData bl GetMonData
@@ -4960,7 +4960,7 @@ _080CCBEA:
b _080CCC6E b _080CCC6E
.align 2, 0 .align 2, 0
_080CCC1C: .4byte gUnknown_83F6203 _080CCC1C: .4byte gUnknown_83F6203
_080CCC20: .4byte gUnknown_2024284 _080CCC20: .4byte gPlayerParty
_080CCC24: .4byte gStringVar2 _080CCC24: .4byte gStringVar2
_080CCC28: .4byte gUnknown_82481BE _080CCC28: .4byte gUnknown_82481BE
_080CCC2C: .4byte gUnknown_20370C2 _080CCC2C: .4byte gUnknown_20370C2
@@ -5007,7 +5007,7 @@ _080CCC8C:
movs r0, 0x64 movs r0, 0x64
mov r1, r8 mov r1, r8
muls r1, r0 muls r1, r0
ldr r0, _080CCCF0 @ =gUnknown_2024284 ldr r0, _080CCCF0 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xD movs r1, 0xD
@@ -5056,7 +5056,7 @@ _080CCCE4:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_080CCCF0: .4byte gUnknown_2024284 _080CCCF0: .4byte gPlayerParty
_080CCCF4: .4byte gUnknown_20370C4 _080CCCF4: .4byte gUnknown_20370C4
thumb_func_end sub_80CCB94 thumb_func_end sub_80CCB94
@@ -5475,7 +5475,7 @@ sub_80CD034: @ 80CD034
_080CD044: _080CD044:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _080CD05C @ =gUnknown_2024284 ldr r1, _080CD05C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x4 movs r1, 0x4
bl GetMonData bl GetMonData
@@ -5484,7 +5484,7 @@ _080CD044:
movs r0, 0x1 movs r0, 0x1
b _080CD06C b _080CD06C
.align 2, 0 .align 2, 0
_080CD05C: .4byte gUnknown_2024284 _080CD05C: .4byte gPlayerParty
_080CD060: _080CD060:
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 24 lsls r0, 24
@@ -5577,7 +5577,7 @@ _080CD104:
movs r0, 0x64 movs r0, 0x64
adds r1, r6, 0 adds r1, r6, 0
muls r1, r0 muls r1, r0
ldr r0, _080CD138 @ =gUnknown_2024284 ldr r0, _080CD138 @ =gPlayerParty
adds r5, r1, r0 adds r5, r1, r0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x41 movs r1, 0x41
@@ -5598,7 +5598,7 @@ _080CD104:
movs r0, 0x1 movs r0, 0x1
b _080CD14C b _080CD14C
.align 2, 0 .align 2, 0
_080CD138: .4byte gUnknown_2024284 _080CD138: .4byte gPlayerParty
_080CD13C: .4byte gUnknown_20370C0 _080CD13C: .4byte gUnknown_20370C0
_080CD140: _080CD140:
adds r0, r6, 0x1 adds r0, r6, 0x1
+8 -8
View File
@@ -13,7 +13,7 @@ hm_prepare_dive_probably: @ 80E5684
lsrs r0, 24 lsrs r0, 24
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r4, _080E56D0 @ =gUnknown_2024284 ldr r4, _080E56D0 @ =gPlayerParty
adds r0, r4 adds r0, r4
movs r1, 0x3A movs r1, 0x3A
bl GetMonData bl GetMonData
@@ -40,7 +40,7 @@ hm_prepare_dive_probably: @ 80E5684
movs r0, 0 movs r0, 0
b _080E56D6 b _080E56D6
.align 2, 0 .align 2, 0
_080E56D0: .4byte gUnknown_2024284 _080E56D0: .4byte gPlayerParty
_080E56D4: _080E56D4:
movs r0, 0x1 movs r0, 0x1
_080E56D6: _080E56D6:
@@ -121,7 +121,7 @@ _080E5768:
mov r10, r0 mov r10, r0
mov r0, r10 mov r0, r10
muls r0, r5 muls r0, r5
ldr r1, _080E57A0 @ =gUnknown_2024284 ldr r1, _080E57A0 @ =gPlayerParty
mov r9, r1 mov r9, r1
adds r6, r0, r1 adds r6, r0, r1
adds r0, r6, 0 adds r0, r6, 0
@@ -143,7 +143,7 @@ _080E5796:
bl sub_80E5934 bl sub_80E5934
b _080E57D4 b _080E57D4
.align 2, 0 .align 2, 0
_080E57A0: .4byte gUnknown_2024284 _080E57A0: .4byte gPlayerParty
_080E57A4: _080E57A4:
movs r0, 0x1 movs r0, 0x1
bl PlaySE bl PlaySE
@@ -192,7 +192,7 @@ sub_80E57E8: @ 80E57E8
ldrsb r1, [r5, r1] ldrsb r1, [r5, r1]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080E5834 @ =gUnknown_2024284 ldr r1, _080E5834 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x3A movs r1, 0x3A
bl GetMonData bl GetMonData
@@ -213,7 +213,7 @@ sub_80E57E8: @ 80E57E8
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E5830: .4byte gUnknown_203B0A0 _080E5830: .4byte gUnknown_203B0A0
_080E5834: .4byte gUnknown_2024284 _080E5834: .4byte gPlayerParty
_080E5838: .4byte sub_80E583C _080E5838: .4byte sub_80E583C
thumb_func_end sub_80E57E8 thumb_func_end sub_80E57E8
@@ -228,7 +228,7 @@ sub_80E583C: @ 80E583C
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080E5888 @ =gUnknown_2024284 ldr r1, _080E5888 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _080E588C @ =gStringVar1 ldr r1, _080E588C @ =gStringVar1
bl GetMonNickname bl GetMonNickname
@@ -253,7 +253,7 @@ sub_80E583C: @ 80E583C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E5884: .4byte gUnknown_203B0A0 _080E5884: .4byte gUnknown_203B0A0
_080E5888: .4byte gUnknown_2024284 _080E5888: .4byte gPlayerParty
_080E588C: .4byte gStringVar1 _080E588C: .4byte gStringVar1
_080E5890: .4byte gStringVar4 _080E5890: .4byte gStringVar4
_080E5894: .4byte gUnknown_8416F27 _080E5894: .4byte gUnknown_8416F27
+2 -2
View File
@@ -83,7 +83,7 @@ sub_80D0860: @ 80D0860
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080D08A0 @ =gUnknown_2024284 ldr r1, _080D08A0 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _080D08A4 @ =gStringVar1 ldr r1, _080D08A4 @ =gStringVar1
bl GetMonNickname bl GetMonNickname
@@ -94,7 +94,7 @@ sub_80D0860: @ 80D0860
_080D0894: .4byte gUnknown_3005090 _080D0894: .4byte gUnknown_3005090
_080D0898: .4byte sub_80D08A8 _080D0898: .4byte sub_80D08A8
_080D089C: .4byte gUnknown_20386E0 _080D089C: .4byte gUnknown_20386E0
_080D08A0: .4byte gUnknown_2024284 _080D08A0: .4byte gPlayerParty
_080D08A4: .4byte gStringVar1 _080D08A4: .4byte gStringVar1
thumb_func_end sub_80D0860 thumb_func_end sub_80D0860
+2 -2
View File
@@ -239,7 +239,7 @@ _080F1F98:
movs r0, 0x64 movs r0, 0x64
adds r1, r7, 0 adds r1, r7, 0
muls r1, r0 muls r1, r0
ldr r0, _080F2058 @ =gUnknown_2024284 ldr r0, _080F2058 @ =gPlayerParty
adds r6, r1, r0 adds r6, r1, r0
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0xB movs r1, 0xB
@@ -325,7 +325,7 @@ _080F2022:
.align 2, 0 .align 2, 0
_080F2050: .4byte gUnknown_3005090 _080F2050: .4byte gUnknown_3005090
_080F2054: .4byte gUnknown_203AB38 _080F2054: .4byte gUnknown_203AB38
_080F2058: .4byte gUnknown_2024284 _080F2058: .4byte gPlayerParty
_080F205C: .4byte 0x000001ff _080F205C: .4byte 0x000001ff
_080F2060: .4byte 0xfffffe00 _080F2060: .4byte 0xfffffe00
_080F2064: _080F2064:
+8 -8
View File
@@ -738,7 +738,7 @@ sub_80A156C: @ 80A156C
_080A1578: _080A1578:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _080A15D0 @ =gUnknown_2024284 ldr r1, _080A15D0 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x11 movs r1, 0x11
adds r2, r4, 0 adds r2, r4, 0
@@ -779,7 +779,7 @@ _080A1598:
ldr r3, _080A15E4 @ =sub_80A1648 ldr r3, _080A15E4 @ =sub_80A1648
b _080A1616 b _080A1616
.align 2, 0 .align 2, 0
_080A15D0: .4byte gUnknown_2024284 _080A15D0: .4byte gPlayerParty
_080A15D4: .4byte gUnknown_203AD30 _080A15D4: .4byte gUnknown_203AD30
_080A15D8: .4byte 0x0000ffff _080A15D8: .4byte 0x0000ffff
_080A15DC: .4byte gUnknown_3005090 _080A15DC: .4byte gUnknown_3005090
@@ -1885,7 +1885,7 @@ sub_80A1E7C: @ 80A1E7C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r1, _080A1EBC @ =gUnknown_2023BCE ldr r1, _080A1EBC @ =gBattlerPartyIndexes
ldr r0, _080A1EC0 @ =gUnknown_2024004 ldr r0, _080A1EC0 @ =gUnknown_2024004
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 1 lsls r0, 1
@@ -1893,7 +1893,7 @@ sub_80A1E7C: @ 80A1E7C
ldrh r2, [r0] ldrh r2, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r2 muls r0, r2
ldr r1, _080A1EC4 @ =gUnknown_2024284 ldr r1, _080A1EC4 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _080A1EC8 @ =gUnknown_203AD30 ldr r1, _080A1EC8 @ =gUnknown_203AD30
ldrh r1, [r1] ldrh r1, [r1]
@@ -1912,9 +1912,9 @@ sub_80A1E7C: @ 80A1E7C
bl sub_8108E70 bl sub_8108E70
b _080A1EE4 b _080A1EE4
.align 2, 0 .align 2, 0
_080A1EBC: .4byte gUnknown_2023BCE _080A1EBC: .4byte gBattlerPartyIndexes
_080A1EC0: .4byte gUnknown_2024004 _080A1EC0: .4byte gUnknown_2024004
_080A1EC4: .4byte gUnknown_2024284 _080A1EC4: .4byte gPlayerParty
_080A1EC8: .4byte gUnknown_203AD30 _080A1EC8: .4byte gUnknown_203AD30
_080A1ECC: .4byte gUnknown_84169DC _080A1ECC: .4byte gUnknown_84169DC
_080A1ED0: .4byte sub_810A1F8 _080A1ED0: .4byte sub_810A1F8
@@ -2090,7 +2090,7 @@ sub_80A2010: @ 80A2010
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, _080A2044 @ =gUnknown_2022B4C ldr r0, _080A2044 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x8 movs r1, 0x8
ands r0, r1 ands r0, r1
@@ -2110,7 +2110,7 @@ sub_80A2010: @ 80A2010
bl sub_8108E70 bl sub_8108E70
b _080A2060 b _080A2060
.align 2, 0 .align 2, 0
_080A2044: .4byte gUnknown_2022B4C _080A2044: .4byte gBattleTypeFlags
_080A2048: .4byte gUnknown_203AD30 _080A2048: .4byte gUnknown_203AD30
_080A204C: .4byte 0x0000ffff _080A204C: .4byte 0x0000ffff
_080A2050: .4byte gStringVar4 _080A2050: .4byte gStringVar4
+15 -15
View File
@@ -489,7 +489,7 @@ _080E4A88:
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080E4ACC @ =gUnknown_2024284 ldr r1, _080E4ACC @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r3, _080E4AD0 @ =0x00000a67 ldr r3, _080E4AD0 @ =0x00000a67
adds r1, r2, r3 adds r1, r2, r3
@@ -513,7 +513,7 @@ _080E4A88:
b _080E4ED8 b _080E4ED8
.align 2, 0 .align 2, 0
_080E4AC8: .4byte gUnknown_203AAB4 _080E4AC8: .4byte gUnknown_203AAB4
_080E4ACC: .4byte gUnknown_2024284 _080E4ACC: .4byte gPlayerParty
_080E4AD0: .4byte 0x00000a67 _080E4AD0: .4byte 0x00000a67
_080E4AD4: .4byte 0xffff0000 _080E4AD4: .4byte 0xffff0000
_080E4AD8: .4byte gUnknown_841E405 _080E4AD8: .4byte gUnknown_841E405
@@ -738,7 +738,7 @@ _080E4C7E:
adds r2, r6 adds r2, r6
bl get_coro_args_x18_x1A bl get_coro_args_x18_x1A
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
ldr r0, _080E4CD8 @ =gUnknown_2024284 ldr r0, _080E4CD8 @ =gPlayerParty
ldr r5, [r7] ldr r5, [r7]
movs r2, 0x98 movs r2, 0x98
lsls r2, 2 lsls r2, 2
@@ -767,7 +767,7 @@ _080E4CC8: .4byte gUnknown_2037AB8
_080E4CCC: .4byte 0x00000263 _080E4CCC: .4byte 0x00000263
_080E4CD0: .4byte 0x00000a68 _080E4CD0: .4byte 0x00000a68
_080E4CD4: .4byte 0x00000a6a _080E4CD4: .4byte 0x00000a6a
_080E4CD8: .4byte gUnknown_2024284 _080E4CD8: .4byte gPlayerParty
_080E4CDC: .4byte gUnknown_2024029 _080E4CDC: .4byte gUnknown_2024029
_080E4CE0: .4byte sub_80E4800 _080E4CE0: .4byte sub_80E4800
_080E4CE4: _080E4CE4:
@@ -870,7 +870,7 @@ _080E4DB4:
ldrb r0, [r0] ldrb r0, [r0]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _080E4E50 @ =gUnknown_2024284 ldr r5, _080E4E50 @ =gPlayerParty
adds r0, r5 adds r0, r5
ldrb r1, [r2] ldrb r1, [r2]
adds r1, 0xD adds r1, 0xD
@@ -936,7 +936,7 @@ _080E4DB4:
strh r0, [r1] strh r0, [r1]
b _080E4EDA b _080E4EDA
.align 2, 0 .align 2, 0
_080E4E50: .4byte gUnknown_2024284 _080E4E50: .4byte gPlayerParty
_080E4E54: .4byte gStringVar3 _080E4E54: .4byte gStringVar3
_080E4E58: .4byte gUnknown_8247094 _080E4E58: .4byte gUnknown_8247094
_080E4E5C: .4byte 0x00000261 _080E4E5C: .4byte 0x00000261
@@ -1264,7 +1264,7 @@ sub_80E50CC: @ 80E50CC
ldrb r0, [r0] ldrb r0, [r0]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _080E51EC @ =gUnknown_2024284 ldr r5, _080E51EC @ =gPlayerParty
adds r0, r5 adds r0, r5
adds r1, 0xE8 adds r1, 0xE8
bl GetMoveRelearnerMoves bl GetMoveRelearnerMoves
@@ -1315,7 +1315,7 @@ _080E513C:
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080E51EC @ =gUnknown_2024284 ldr r1, _080E51EC @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
@@ -1393,7 +1393,7 @@ _080E51AA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E51E8: .4byte gUnknown_203AAB4 _080E51E8: .4byte gUnknown_203AAB4
_080E51EC: .4byte gUnknown_2024284 _080E51EC: .4byte gPlayerParty
_080E51F0: .4byte gUnknown_8247094 _080E51F0: .4byte gUnknown_8247094
_080E51F4: .4byte gStringVar1 _080E51F4: .4byte gStringVar1
_080E51F8: .4byte gUnknown_84161C1 _080E51F8: .4byte gUnknown_84161C1
@@ -1556,7 +1556,7 @@ sub_80E5340: @ 80E5340
sub sp, 0x3C sub sp, 0x3C
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
ldr r1, _080E5380 @ =gUnknown_8250C04 ldr r1, _080E5380 @ =gBattleMoves
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r5 adds r0, r5
lsls r0, 2 lsls r0, 2
@@ -1582,7 +1582,7 @@ sub_80E5340: @ 80E5340
bl sub_80E559C bl sub_80E559C
b _080E53A6 b _080E53A6
.align 2, 0 .align 2, 0
_080E5380: .4byte gUnknown_8250C04 _080E5380: .4byte gBattleMoves
_080E5384: .4byte gUnknown_8416213 _080E5384: .4byte gUnknown_8416213
_080E5388: _080E5388:
ldrb r1, [r4, 0x1] ldrb r1, [r4, 0x1]
@@ -1599,7 +1599,7 @@ _080E5388:
movs r3, 0x4 movs r3, 0x4
bl sub_80E559C bl sub_80E559C
_080E53A6: _080E53A6:
ldr r2, _080E53CC @ =gUnknown_8250C04 ldr r2, _080E53CC @ =gBattleMoves
lsls r1, r5, 1 lsls r1, r5, 1
adds r0, r1, r5 adds r0, r1, r5
lsls r0, 2 lsls r0, 2
@@ -1618,7 +1618,7 @@ _080E53A6:
bl sub_80E559C bl sub_80E559C
b _080E53F4 b _080E53F4
.align 2, 0 .align 2, 0
_080E53CC: .4byte gUnknown_8250C04 _080E53CC: .4byte gBattleMoves
_080E53D0: .4byte gUnknown_8416213 _080E53D0: .4byte gUnknown_8416213
_080E53D4: _080E53D4:
ldrb r1, [r0, 0x3] ldrb r1, [r0, 0x3]
@@ -1636,7 +1636,7 @@ _080E53D4:
movs r3, 0x12 movs r3, 0x12
bl sub_80E559C bl sub_80E559C
_080E53F4: _080E53F4:
ldr r1, _080E543C @ =gUnknown_8250C04 ldr r1, _080E543C @ =gBattleMoves
adds r0, r4, r5 adds r0, r4, r5
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -1669,7 +1669,7 @@ _080E53F4:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E543C: .4byte gUnknown_8250C04 _080E543C: .4byte gBattleMoves
_080E5440: .4byte gUnknown_84886E8 _080E5440: .4byte gUnknown_84886E8
thumb_func_end sub_80E5340 thumb_func_end sub_80E5340
+2 -2
View File
@@ -3037,7 +3037,7 @@ _0800AB56:
_0800AB5C: _0800AB5C:
cmp r3, r2 cmp r3, r2
bne _0800AB7E bne _0800AB7E
ldr r2, _0800AB88 @ =gUnknown_2022B4C ldr r2, _0800AB88 @ =gBattleTypeFlags
ldr r0, [r2] ldr r0, [r2]
ldr r1, _0800AB8C @ =0x0000ffdf ldr r1, _0800AB8C @ =0x0000ffdf
ands r0, r1 ands r0, r1
@@ -3057,7 +3057,7 @@ _0800AB7E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800AB84: .4byte gUnknown_3003F30 _0800AB84: .4byte gUnknown_3003F30
_0800AB88: .4byte gUnknown_2022B4C _0800AB88: .4byte gBattleTypeFlags
_0800AB8C: .4byte 0x0000ffdf _0800AB8C: .4byte 0x0000ffdf
_0800AB90: .4byte gLinkVSyncDisabled _0800AB90: .4byte gLinkVSyncDisabled
_0800AB94: .4byte gUnknown_3003F80 _0800AB94: .4byte gUnknown_3003F80
+2 -2
View File
@@ -3591,7 +3591,7 @@ _080FA1DE:
ble _080FA1D4 ble _080FA1D4
cmp r2, r5 cmp r2, r5
bne _080FA218 bne _080FA218
ldr r2, _080FA20C @ =gUnknown_2022B4C ldr r2, _080FA20C @ =gBattleTypeFlags
ldr r0, [r2] ldr r0, [r2]
ldr r1, _080FA210 @ =0x0000ffdf ldr r1, _080FA210 @ =0x0000ffdf
ands r0, r1 ands r0, r1
@@ -3608,7 +3608,7 @@ _080FA1DE:
b _080FA218 b _080FA218
.align 2, 0 .align 2, 0
_080FA208: .4byte gUnknown_3005450 _080FA208: .4byte gUnknown_3005450
_080FA20C: .4byte gUnknown_2022B4C _080FA20C: .4byte gBattleTypeFlags
_080FA210: .4byte 0x0000ffdf _080FA210: .4byte 0x0000ffdf
_080FA214: _080FA214:
ldr r0, _080FA220 @ =sub_80FA160 ldr r0, _080FA220 @ =sub_80FA160
+29 -29
View File
@@ -3007,14 +3007,14 @@ _0811717E:
movs r0, 0x64 movs r0, 0x64
adds r1, r7, 0 adds r1, r7, 0
muls r1, r0 muls r1, r0
ldr r0, _08117198 @ =gUnknown_2024284 ldr r0, _08117198 @ =gPlayerParty
adds r1, r0 adds r1, r0
movs r0, 0 movs r0, 0
movs r2, 0x64 movs r2, 0x64
bl SendBlock bl SendBlock
b _0811725C b _0811725C
.align 2, 0 .align 2, 0
_08117198: .4byte gUnknown_2024284 _08117198: .4byte gPlayerParty
_0811719C: _0811719C:
bl GetBlockReceivedStatus bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
@@ -3023,7 +3023,7 @@ _0811719C:
bne _0811725C bne _0811725C
bl GetMultiplayerId bl GetMultiplayerId
adds r1, r0, 0 adds r1, r0, 0
ldr r0, _081171D0 @ =gUnknown_202402C ldr r0, _081171D0 @ =gEnemyParty
movs r2, 0x1 movs r2, 0x1
eors r1, r2 eors r1, r2
lsls r1, 24 lsls r1, 24
@@ -3037,7 +3037,7 @@ _0811719C:
bl ResetBlockReceivedFlags bl ResetBlockReceivedFlags
b _081171FA b _081171FA
.align 2, 0 .align 2, 0
_081171D0: .4byte gUnknown_202402C _081171D0: .4byte gEnemyParty
_081171D4: .4byte gUnknown_2022118 _081171D4: .4byte gUnknown_2022118
_081171D8: _081171D8:
ldr r4, _08117204 @ =gUnknown_2022618 ldr r4, _08117204 @ =gUnknown_2022618
@@ -3308,7 +3308,7 @@ sub_81173C0: @ 81173C0
ldr r1, _08117434 @ =gMain ldr r1, _08117434 @ =gMain
ldr r0, _08117438 @ =sub_8081668 ldr r0, _08117438 @ =sub_8081668
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r0, _0811743C @ =gUnknown_2022B4C ldr r0, _0811743C @ =gBattleTypeFlags
str r6, [r0] str r6, [r0]
bl PlayBattleBGM bl PlayBattleBGM
pop {r4-r6} pop {r4-r6}
@@ -3319,7 +3319,7 @@ _0811742C: .4byte gUnknown_202273C
_08117430: .4byte 0x00002211 _08117430: .4byte 0x00002211
_08117434: .4byte gMain _08117434: .4byte gMain
_08117438: .4byte sub_8081668 _08117438: .4byte sub_8081668
_0811743C: .4byte gUnknown_2022B4C _0811743C: .4byte gBattleTypeFlags
thumb_func_end sub_81173C0 thumb_func_end sub_81173C0
thumb_func_start sub_8117440 thumb_func_start sub_8117440
@@ -10216,7 +10216,7 @@ sub_811ADD0: @ 811ADD0
_0811ADE0: _0811ADE0:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _0811AE08 @ =gUnknown_2024284 ldr r1, _0811AE08 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
bl GetMonData bl GetMonData
@@ -10234,7 +10234,7 @@ _0811ADFA:
movs r0, 0x2 movs r0, 0x2
b _0811AE5C b _0811AE5C
.align 2, 0 .align 2, 0
_0811AE08: .4byte gUnknown_2024284 _0811AE08: .4byte gPlayerParty
_0811AE0C: .4byte gUnknown_2024029 _0811AE0C: .4byte gUnknown_2024029
_0811AE10: _0811AE10:
movs r4, 0 movs r4, 0
@@ -10242,11 +10242,11 @@ _0811AE10:
ldrb r0, [r0] ldrb r0, [r0]
cmp r4, r0 cmp r4, r0
bge _0811AE5A bge _0811AE5A
ldr r6, _0811AE48 @ =gUnknown_8254784 ldr r6, _0811AE48 @ =gBaseStats
_0811AE1C: _0811AE1C:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _0811AE4C @ =gUnknown_2024284 ldr r1, _0811AE4C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
bl GetMonData bl GetMonData
@@ -10266,8 +10266,8 @@ _0811AE40:
b _0811AE5C b _0811AE5C
.align 2, 0 .align 2, 0
_0811AE44: .4byte gUnknown_2024029 _0811AE44: .4byte gUnknown_2024029
_0811AE48: .4byte gUnknown_8254784 _0811AE48: .4byte gBaseStats
_0811AE4C: .4byte gUnknown_2024284 _0811AE4C: .4byte gPlayerParty
_0811AE50: _0811AE50:
adds r4, 0x1 adds r4, 0x1
ldr r0, _0811AE64 @ =gUnknown_2024029 ldr r0, _0811AE64 @ =gUnknown_2024029
@@ -10634,7 +10634,7 @@ _0811B0FE:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _0811B13C @ =gUnknown_2024284 ldr r0, _0811B13C @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x38 movs r1, 0x38
@@ -10662,7 +10662,7 @@ _0811B130:
b _0811B142 b _0811B142
.align 2, 0 .align 2, 0
_0811B138: .4byte gUnknown_2024029 _0811B138: .4byte gUnknown_2024029
_0811B13C: .4byte gUnknown_2024284 _0811B13C: .4byte gPlayerParty
_0811B140: _0811B140:
movs r0, 0x1 movs r0, 0x1
_0811B142: _0811B142:
@@ -10703,7 +10703,7 @@ sub_811B16C: @ 811B16C
movs r1, 0x64 movs r1, 0x64
adds r4, r0, 0 adds r4, r0, 0
muls r4, r1 muls r4, r1
ldr r0, _0811B1A8 @ =gUnknown_2024284 ldr r0, _0811B1A8 @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -10725,7 +10725,7 @@ sub_811B16C: @ 811B16C
movs r0, 0 movs r0, 0
b _0811B1AE b _0811B1AE
.align 2, 0 .align 2, 0
_0811B1A8: .4byte gUnknown_2024284 _0811B1A8: .4byte gPlayerParty
_0811B1AC: _0811B1AC:
movs r0, 0x1 movs r0, 0x1
_0811B1AE: _0811B1AE:
@@ -10741,7 +10741,7 @@ sub_811B1B4: @ 811B1B4
movs r1, 0x64 movs r1, 0x64
adds r4, r0, 0 adds r4, r0, 0
muls r4, r1 muls r4, r1
ldr r0, _0811B1E8 @ =gUnknown_2024284 ldr r0, _0811B1E8 @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -10759,7 +10759,7 @@ sub_811B1B4: @ 811B1B4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0811B1E8: .4byte gUnknown_2024284 _0811B1E8: .4byte gPlayerParty
thumb_func_end sub_811B1B4 thumb_func_end sub_811B1B4
thumb_func_start sub_811B1EC thumb_func_start sub_811B1EC
@@ -10790,7 +10790,7 @@ _0811B212:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _0811B250 @ =gUnknown_2024284 ldr r0, _0811B250 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
@@ -10819,7 +10819,7 @@ _0811B242:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0811B250: .4byte gUnknown_2024284 _0811B250: .4byte gPlayerParty
_0811B254: .4byte gUnknown_2024029 _0811B254: .4byte gUnknown_2024029
thumb_func_end sub_811B1EC thumb_func_end sub_811B1EC
@@ -12660,8 +12660,8 @@ sub_811C04C: @ 811C04C
bl sub_81173C0 bl sub_81173C0
movs r4, 0 movs r4, 0
movs r7, 0x64 movs r7, 0x64
ldr r6, _0811C0CC @ =gUnknown_2024284 ldr r6, _0811C0CC @ =gPlayerParty
ldr r5, _0811C0D0 @ =gUnknown_202402C ldr r5, _0811C0D0 @ =gEnemyParty
_0811C05C: _0811C05C:
ldr r0, _0811C0D4 @ =gUnknown_203B0D4 ldr r0, _0811C0D4 @ =gUnknown_203B0D4
adds r0, r4, r0 adds r0, r4, r0
@@ -12677,7 +12677,7 @@ _0811C05C:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x1 cmp r4, 0x1
ble _0811C05C ble _0811C05C
ldr r4, _0811C0CC @ =gUnknown_2024284 ldr r4, _0811C0CC @ =gPlayerParty
movs r0, 0xFA movs r0, 0xFA
lsls r0, 1 lsls r0, 1
adds r5, r4, r0 adds r5, r4, r0
@@ -12687,12 +12687,12 @@ _0811C082:
adds r4, 0x64 adds r4, 0x64
cmp r4, r5 cmp r4, r5
ble _0811C082 ble _0811C082
ldr r4, _0811C0CC @ =gUnknown_2024284 ldr r4, _0811C0CC @ =gPlayerParty
movs r5, 0 movs r5, 0
adds r6, r4, 0 adds r6, r4, 0
adds r6, 0x64 adds r6, 0x64
_0811C096: _0811C096:
ldr r1, _0811C0D0 @ =gUnknown_202402C ldr r1, _0811C0D0 @ =gEnemyParty
adds r1, r5, r1 adds r1, r5, r1
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x64 movs r2, 0x64
@@ -12704,7 +12704,7 @@ _0811C096:
movs r0, 0x32 movs r0, 0x32
bl IncrementGameStat bl IncrementGameStat
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount
ldr r0, _0811C0D8 @ =gUnknown_20386AE ldr r0, _0811C0D8 @ =gTrainerBattleOpponent_A
movs r2, 0xC0 movs r2, 0xC0
lsls r2, 4 lsls r2, 4
adds r1, r2, 0 adds r1, r2, 0
@@ -12715,10 +12715,10 @@ _0811C096:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0811C0CC: .4byte gUnknown_2024284 _0811C0CC: .4byte gPlayerParty
_0811C0D0: .4byte gUnknown_202402C _0811C0D0: .4byte gEnemyParty
_0811C0D4: .4byte gUnknown_203B0D4 _0811C0D4: .4byte gUnknown_203B0D4
_0811C0D8: .4byte gUnknown_20386AE _0811C0D8: .4byte gTrainerBattleOpponent_A
_0811C0DC: .4byte sub_800FD9C _0811C0DC: .4byte sub_800FD9C
thumb_func_end sub_811C04C thumb_func_end sub_811C04C
+4 -4
View File
@@ -284,7 +284,7 @@ _0804C200:
movs r1, 0x64 movs r1, 0x64
muls r1, r4 muls r1, r4
adds r0, r1 adds r0, r1
ldr r2, _0804C22C @ =gUnknown_2024284 ldr r2, _0804C22C @ =gPlayerParty
adds r1, r2 adds r1, r2
adds r0, 0x38 adds r0, 0x38
movs r2, 0x64 movs r2, 0x64
@@ -298,7 +298,7 @@ _0804C200:
.align 2, 0 .align 2, 0
_0804C224: .4byte gSaveBlock1Ptr _0804C224: .4byte gSaveBlock1Ptr
_0804C228: .4byte gUnknown_2024029 _0804C228: .4byte gUnknown_2024029
_0804C22C: .4byte gUnknown_2024284 _0804C22C: .4byte gPlayerParty
thumb_func_end copy_player_party_to_sav1 thumb_func_end copy_player_party_to_sav1
thumb_func_start sub_804C230 thumb_func_start sub_804C230
@@ -311,7 +311,7 @@ sub_804C230: @ 804C230
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1] strb r0, [r1]
movs r4, 0 movs r4, 0
ldr r5, _0804C26C @ =gUnknown_2024284 ldr r5, _0804C26C @ =gPlayerParty
_0804C242: _0804C242:
movs r0, 0x64 movs r0, 0x64
adds r2, r4, 0 adds r2, r4, 0
@@ -332,7 +332,7 @@ _0804C242:
.align 2, 0 .align 2, 0
_0804C264: .4byte gUnknown_2024029 _0804C264: .4byte gUnknown_2024029
_0804C268: .4byte gSaveBlock1Ptr _0804C268: .4byte gSaveBlock1Ptr
_0804C26C: .4byte gUnknown_2024284 _0804C26C: .4byte gPlayerParty
thumb_func_end sub_804C230 thumb_func_end sub_804C230
thumb_func_start save_serialize_npcs thumb_func_start save_serialize_npcs
+220 -220
View File
File diff suppressed because it is too large Load Diff
+39 -39
View File
@@ -19,7 +19,7 @@ DoPokeballSendOutAnimation: @ 804A938
strb r0, [r1] strb r0, [r1]
ldr r0, _0804A990 @ =gUnknown_2024018 ldr r0, _0804A990 @ =gUnknown_2024018
ldr r0, [r0] ldr r0, [r0]
ldr r6, _0804A994 @ =gUnknown_2023BC4 ldr r6, _0804A994 @ =gActiveBattler
ldrb r1, [r6] ldrb r1, [r6]
ldr r2, [r0, 0x4] ldr r2, [r0, 0x4]
lsls r0, r1, 1 lsls r0, r1, 1
@@ -51,7 +51,7 @@ DoPokeballSendOutAnimation: @ 804A938
.align 2, 0 .align 2, 0
_0804A98C: .4byte gUnknown_2024005 _0804A98C: .4byte gUnknown_2024005
_0804A990: .4byte gUnknown_2024018 _0804A990: .4byte gUnknown_2024018
_0804A994: .4byte gUnknown_2023BC4 _0804A994: .4byte gActiveBattler
_0804A998: .4byte sub_804A9A0 _0804A998: .4byte sub_804A9A0
_0804A99C: .4byte gUnknown_3005090 _0804A99C: .4byte gUnknown_3005090
thumb_func_end DoPokeballSendOutAnimation thumb_func_end DoPokeballSendOutAnimation
@@ -94,25 +94,25 @@ _0804A9D8:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0804AA04 beq _0804AA04
ldr r1, _0804A9FC @ =gUnknown_2023BCE ldr r1, _0804A9FC @ =gBattlerPartyIndexes
lsls r0, r6, 1 lsls r0, r6, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0804AA00 @ =gUnknown_202402C ldr r1, _0804AA00 @ =gEnemyParty
b _0804AA12 b _0804AA12
.align 2, 0 .align 2, 0
_0804A9FC: .4byte gUnknown_2023BCE _0804A9FC: .4byte gBattlerPartyIndexes
_0804AA00: .4byte gUnknown_202402C _0804AA00: .4byte gEnemyParty
_0804AA04: _0804AA04:
ldr r1, _0804AA50 @ =gUnknown_2023BCE ldr r1, _0804AA50 @ =gBattlerPartyIndexes
lsls r0, r6, 1 lsls r0, r6, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0804AA54 @ =gUnknown_2024284 ldr r1, _0804AA54 @ =gPlayerParty
_0804AA12: _0804AA12:
adds r0, r1 adds r0, r1
movs r1, 0x26 movs r1, 0x26
@@ -124,7 +124,7 @@ _0804AA12:
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r0, r5, 0 adds r0, r5, 0
bl LoadBallGfx bl LoadBallGfx
ldr r0, _0804AA58 @ =gUnknown_2022B4C ldr r0, _0804AA58 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -141,9 +141,9 @@ _0804AA12:
mov r10, r1 mov r10, r1
b _0804AA68 b _0804AA68
.align 2, 0 .align 2, 0
_0804AA50: .4byte gUnknown_2023BCE _0804AA50: .4byte gBattlerPartyIndexes
_0804AA54: .4byte gUnknown_2024284 _0804AA54: .4byte gPlayerParty
_0804AA58: .4byte gUnknown_2022B4C _0804AA58: .4byte gBattleTypeFlags
_0804AA5C: .4byte gUnknown_202273C _0804AA5C: .4byte gUnknown_202273C
_0804AA60: _0804AA60:
ldr r0, _0804AAB8 @ =gSaveBlock2Ptr ldr r0, _0804AAB8 @ =gSaveBlock2Ptr
@@ -179,7 +179,7 @@ _0804AA68:
beq _0804AAF8 beq _0804AAF8
cmp r3, 0xFF cmp r3, 0xFF
bne _0804AB38 bne _0804AB38
ldr r0, _0804AAC4 @ =gUnknown_2022B4C ldr r0, _0804AAC4 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
lsls r1, 9 lsls r1, 9
@@ -193,13 +193,13 @@ _0804AA68:
_0804AAB8: .4byte gSaveBlock2Ptr _0804AAB8: .4byte gSaveBlock2Ptr
_0804AABC: .4byte gUnknown_82606F4 _0804AABC: .4byte gUnknown_82606F4
_0804AAC0: .4byte gSprites _0804AAC0: .4byte gSprites
_0804AAC4: .4byte gUnknown_2022B4C _0804AAC4: .4byte gBattleTypeFlags
_0804AAC8: _0804AAC8:
mov r0, r10 mov r0, r10
movs r5, 0x30 movs r5, 0x30
movs r4, 0x46 movs r4, 0x46
_0804AACE: _0804AACE:
ldr r0, _0804AAEC @ =gUnknown_2023D6C ldr r0, _0804AAEC @ =gBattlerTarget
strb r6, [r0] strb r6, [r0]
ldr r2, _0804AAF0 @ =gSprites ldr r2, _0804AAF0 @ =gSprites
lsls r3, r7, 4 lsls r3, r7, 4
@@ -214,7 +214,7 @@ _0804AACE:
str r0, [r1] str r0, [r1]
b _0804AB48 b _0804AB48
.align 2, 0 .align 2, 0
_0804AAEC: .4byte gUnknown_2023D6C _0804AAEC: .4byte gBattlerTarget
_0804AAF0: .4byte gSprites _0804AAF0: .4byte gSprites
_0804AAF4: .4byte SpriteCB_PlayerMonSendOut_1 _0804AAF4: .4byte SpriteCB_PlayerMonSendOut_1
_0804AAF8: _0804AAF8:
@@ -231,7 +231,7 @@ _0804AAF8:
lsrs r0, 24 lsrs r0, 24
adds r0, 0x18 adds r0, 0x18
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
ldr r0, _0804AB2C @ =gUnknown_2023D6C ldr r0, _0804AB2C @ =gBattlerTarget
strb r6, [r0] strb r6, [r0]
movs r1, 0 movs r1, 0
strh r1, [r4, 0x2E] strh r1, [r4, 0x2E]
@@ -242,13 +242,13 @@ _0804AAF8:
str r1, [r0] str r1, [r0]
b _0804AB46 b _0804AB46
.align 2, 0 .align 2, 0
_0804AB2C: .4byte gUnknown_2023D6C _0804AB2C: .4byte gBattlerTarget
_0804AB30: .4byte gSprites _0804AB30: .4byte gSprites
_0804AB34: .4byte SpriteCB_OpponentMonSendOut _0804AB34: .4byte SpriteCB_OpponentMonSendOut
_0804AB38: _0804AB38:
movs r0, 0x1 movs r0, 0x1
bl GetBankByIdentity bl GetBankByIdentity
ldr r1, _0804AB64 @ =gUnknown_2023D6C ldr r1, _0804AB64 @ =gBattlerTarget
strb r0, [r1] strb r0, [r1]
movs r2, 0x1 movs r2, 0x1
str r2, [sp, 0x4] str r2, [sp, 0x4]
@@ -259,7 +259,7 @@ _0804AB48:
adds r1, r3, r7 adds r1, r3, r7
lsls r1, 2 lsls r1, 2
adds r4, r1, r0 adds r4, r1, r0
ldr r5, _0804AB64 @ =gUnknown_2023D6C ldr r5, _0804AB64 @ =gBattlerTarget
ldrb r0, [r5] ldrb r0, [r5]
strh r0, [r4, 0x3A] strh r0, [r4, 0x3A]
ldr r3, [sp, 0x4] ldr r3, [sp, 0x4]
@@ -269,7 +269,7 @@ _0804AB48:
bl DestroyTask bl DestroyTask
b _0804ABB8 b _0804ABB8
.align 2, 0 .align 2, 0
_0804AB64: .4byte gUnknown_2023D6C _0804AB64: .4byte gBattlerTarget
_0804AB68: .4byte gSprites _0804AB68: .4byte gSprites
_0804AB6C: _0804AB6C:
movs r0, 0x22 movs r0, 0x22
@@ -1217,13 +1217,13 @@ _0804B2DA:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0804B310 beq _0804B310
ldr r1, _0804B308 @ =gUnknown_2023BCE ldr r1, _0804B308 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _0804B30C @ =gUnknown_202402C ldr r0, _0804B30C @ =gEnemyParty
adds r7, r1, r0 adds r7, r1, r0
movs r3, 0x19 movs r3, 0x19
mov r9, r3 mov r9, r3
@@ -1232,16 +1232,16 @@ _0804B2DA:
_0804B2FC: .4byte HandleBallAnimEnd _0804B2FC: .4byte HandleBallAnimEnd
_0804B300: .4byte gMain _0804B300: .4byte gMain
_0804B304: .4byte 0x00000439 _0804B304: .4byte 0x00000439
_0804B308: .4byte gUnknown_2023BCE _0804B308: .4byte gBattlerPartyIndexes
_0804B30C: .4byte gUnknown_202402C _0804B30C: .4byte gEnemyParty
_0804B310: _0804B310:
ldr r1, _0804B388 @ =gUnknown_2023BCE ldr r1, _0804B388 @ =gBattlerPartyIndexes
lsls r0, r5, 1 lsls r0, r5, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _0804B38C @ =gUnknown_2024284 ldr r0, _0804B38C @ =gPlayerParty
adds r7, r1, r0 adds r7, r1, r0
movs r0, 0xE7 movs r0, 0xE7
mov r9, r0 mov r9, r0
@@ -1277,7 +1277,7 @@ _0804B34E:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0804B3A6 beq _0804B3A6
ldr r0, _0804B394 @ =gUnknown_2022B4C ldr r0, _0804B394 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -1291,10 +1291,10 @@ _0804B34E:
bl m4aMPlayStop bl m4aMPlayStop
b _0804B3A6 b _0804B3A6
.align 2, 0 .align 2, 0
_0804B388: .4byte gUnknown_2023BCE _0804B388: .4byte gBattlerPartyIndexes
_0804B38C: .4byte gUnknown_2024284 _0804B38C: .4byte gPlayerParty
_0804B390: .4byte gUnknown_2024018 _0804B390: .4byte gUnknown_2024018
_0804B394: .4byte gUnknown_2022B4C _0804B394: .4byte gBattleTypeFlags
_0804B398: .4byte gMPlay_BGM _0804B398: .4byte gMPlay_BGM
_0804B39C: _0804B39C:
ldr r0, _0804B3C4 @ =gMPlay_BGM ldr r0, _0804B3C4 @ =gMPlay_BGM
@@ -2860,25 +2860,25 @@ GetBankPokeballItemId: @ 804BF90
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0804BFBC beq _0804BFBC
ldr r1, _0804BFB4 @ =gUnknown_2023BCE ldr r1, _0804BFB4 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0804BFB8 @ =gUnknown_202402C ldr r1, _0804BFB8 @ =gEnemyParty
b _0804BFCA b _0804BFCA
.align 2, 0 .align 2, 0
_0804BFB4: .4byte gUnknown_2023BCE _0804BFB4: .4byte gBattlerPartyIndexes
_0804BFB8: .4byte gUnknown_202402C _0804BFB8: .4byte gEnemyParty
_0804BFBC: _0804BFBC:
ldr r1, _0804BFDC @ =gUnknown_2023BCE ldr r1, _0804BFDC @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0804BFE0 @ =gUnknown_2024284 ldr r1, _0804BFE0 @ =gPlayerParty
_0804BFCA: _0804BFCA:
adds r0, r1 adds r0, r1
movs r1, 0x26 movs r1, 0x26
@@ -2889,8 +2889,8 @@ _0804BFCA:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0804BFDC: .4byte gUnknown_2023BCE _0804BFDC: .4byte gBattlerPartyIndexes
_0804BFE0: .4byte gUnknown_2024284 _0804BFE0: .4byte gPlayerParty
thumb_func_end GetBankPokeballItemId thumb_func_end GetBankPokeballItemId
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+4 -4
View File
@@ -2573,7 +2573,7 @@ sub_8103A40: @ 8103A40
movs r2, 0x28 movs r2, 0x28
adds r3, r6, 0 adds r3, r6, 0
bl sub_8107D68 bl sub_8107D68
ldr r0, _08103AC4 @ =gUnknown_8254784 ldr r0, _08103AC4 @ =gBaseStats
lsls r4, r5, 3 lsls r4, r5, 3
subs r4, r5 subs r4, r5
lsls r4, 2 lsls r4, 2
@@ -2607,7 +2607,7 @@ _08103AB6:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08103AC0: .4byte gUnknown_203ACF0 _08103AC0: .4byte gUnknown_203ACF0
_08103AC4: .4byte gUnknown_8254784 _08103AC4: .4byte gBaseStats
thumb_func_end sub_8103A40 thumb_func_end sub_8103A40
thumb_func_start sub_8103AC8 thumb_func_start sub_8103AC8
@@ -7741,7 +7741,7 @@ _08106478:
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x56 adds r0, 0x56
ldrb r0, [r0] ldrb r0, [r0]
ldr r1, _081066B4 @ =gUnknown_8254784 ldr r1, _081066B4 @ =gBaseStats
ldr r2, [sp, 0x1C] ldr r2, [sp, 0x1C]
lsls r4, r2, 3 lsls r4, r2, 3
subs r4, r2 subs r4, r2
@@ -7974,7 +7974,7 @@ _08106534:
b _081066E2 b _081066E2
.align 2, 0 .align 2, 0
_081066B0: .4byte gUnknown_8245EE0 _081066B0: .4byte gUnknown_8245EE0
_081066B4: .4byte gUnknown_8254784 _081066B4: .4byte gBaseStats
_081066B8: .4byte gUnknown_203ACF0 _081066B8: .4byte gUnknown_203ACF0
_081066BC: .4byte gUnknown_8452368 _081066BC: .4byte gUnknown_8452368
_081066C0: .4byte 0x0000ffff _081066C0: .4byte 0x0000ffff
+25 -25
View File
@@ -80,7 +80,7 @@ ZeroMonData: @ 803D994
thumb_func_start ZeroPlayerPartyMons thumb_func_start ZeroPlayerPartyMons
ZeroPlayerPartyMons: @ 803DA14 ZeroPlayerPartyMons: @ 803DA14
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, _0803DA30 @ =gUnknown_2024284 ldr r4, _0803DA30 @ =gPlayerParty
movs r0, 0xFA movs r0, 0xFA
lsls r0, 1 lsls r0, 1
adds r5, r4, r0 adds r5, r4, r0
@@ -94,13 +94,13 @@ _0803DA1E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803DA30: .4byte gUnknown_2024284 _0803DA30: .4byte gPlayerParty
thumb_func_end ZeroPlayerPartyMons thumb_func_end ZeroPlayerPartyMons
thumb_func_start ZeroEnemyPartyMons thumb_func_start ZeroEnemyPartyMons
ZeroEnemyPartyMons: @ 803DA34 ZeroEnemyPartyMons: @ 803DA34
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, _0803DA50 @ =gUnknown_202402C ldr r4, _0803DA50 @ =gEnemyParty
movs r0, 0xFA movs r0, 0xFA
lsls r0, 1 lsls r0, 1
adds r5, r4, r0 adds r5, r4, r0
@@ -114,7 +114,7 @@ _0803DA3E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803DA50: .4byte gUnknown_202402C _0803DA50: .4byte gEnemyParty
thumb_func_end ZeroEnemyPartyMons thumb_func_end ZeroEnemyPartyMons
thumb_func_start CreateMon thumb_func_start CreateMon
@@ -310,7 +310,7 @@ _0803DB92:
mov r2, sp mov r2, sp
adds r2, 0xE adds r2, 0xE
bl sub_80404D0 bl sub_80404D0
ldr r4, _0803DCC4 @ =gUnknown_8254784 ldr r4, _0803DCC4 @ =gBaseStats
mov r2, sp mov r2, sp
ldrh r1, [r2, 0xE] ldrh r1, [r2, 0xE]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -405,7 +405,7 @@ _0803DB92:
.align 2, 0 .align 2, 0
_0803DCBC: .4byte gSaveBlock2Ptr _0803DCBC: .4byte gSaveBlock2Ptr
_0803DCC0: .4byte gGameLanguage _0803DCC0: .4byte gGameLanguage
_0803DCC4: .4byte gUnknown_8254784 _0803DCC4: .4byte gBaseStats
_0803DCC8: .4byte gUnknown_8253AE4 _0803DCC8: .4byte gUnknown_8253AE4
_0803DCCC: .4byte gGameVersion _0803DCCC: .4byte gGameVersion
_0803DCD0: _0803DCD0:
@@ -470,7 +470,7 @@ _0803DCD0:
adds r2, r4, 0 adds r2, r4, 0
bl sub_80404D0 bl sub_80404D0
_0803DD58: _0803DD58:
ldr r2, _0803DD94 @ =gUnknown_8254784 ldr r2, _0803DD94 @ =gBaseStats
mov r3, sp mov r3, sp
ldrh r1, [r3, 0xE] ldrh r1, [r3, 0xE]
lsls r0, r1, 3 lsls r0, r1, 3
@@ -500,7 +500,7 @@ _0803DD7E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803DD94: .4byte gUnknown_8254784 _0803DD94: .4byte gBaseStats
thumb_func_end CreateBoxMon thumb_func_end CreateBoxMon
thumb_func_start CreateMonWithNature thumb_func_start CreateMonWithNature
@@ -1451,7 +1451,7 @@ CalculateMonStats: @ 803E47C
.align 2, 0 .align 2, 0
_0803E564: .4byte 0x0000012f _0803E564: .4byte 0x0000012f
_0803E568: _0803E568:
ldr r1, _0803E734 @ =gUnknown_8254784 ldr r1, _0803E734 @ =gBaseStats
lsls r2, r7, 3 lsls r2, r7, 3
subs r0, r2, r7 subs r0, r2, r7
lsls r0, 2 lsls r0, 2
@@ -1475,7 +1475,7 @@ _0803E582:
adds r0, 0xA adds r0, 0xA
str r0, [sp, 0x4] str r0, [sp, 0x4]
_0803E596: _0803E596:
ldr r1, _0803E738 @ =gUnknown_2023FC4 ldr r1, _0803E738 @ =gBattleScripting
add r2, sp, 0x4 add r2, sp, 0x4
ldrb r0, [r2] ldrb r0, [r2]
mov r3, r8 mov r3, r8
@@ -1491,7 +1491,7 @@ _0803E5AE:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x3A movs r1, 0x3A
bl sub_804037C bl sub_804037C
ldr r0, _0803E734 @ =gUnknown_8254784 ldr r0, _0803E734 @ =gBaseStats
subs r1, r6, r7 subs r1, r6, r7
lsls r1, 2 lsls r1, 2
adds r6, r1, r0 adds r6, r1, r0
@@ -1668,8 +1668,8 @@ _0803E72E:
movs r0, 0x1 movs r0, 0x1
b _0803E758 b _0803E758
.align 2, 0 .align 2, 0
_0803E734: .4byte gUnknown_8254784 _0803E734: .4byte gBaseStats
_0803E738: .4byte gUnknown_2023FC4 _0803E738: .4byte gBattleScripting
_0803E73C: .4byte 0x0000012f _0803E73C: .4byte 0x0000012f
_0803E740: _0803E740:
ldr r1, [sp, 0x1C] ldr r1, [sp, 0x1C]
@@ -1757,7 +1757,7 @@ GetLevelFromMonExp: @ 803E7C4
adds r3, r0, 0 adds r3, r0, 0
movs r2, 0x1 movs r2, 0x1
ldr r6, _0803E828 @ =gUnknown_8253AE4 ldr r6, _0803E828 @ =gUnknown_8253AE4
ldr r1, _0803E82C @ =gUnknown_8254784 ldr r1, _0803E82C @ =gBaseStats
lsls r0, r4, 3 lsls r0, r4, 3
subs r0, r4 subs r0, r4
lsls r0, 2 lsls r0, 2
@@ -1793,7 +1793,7 @@ _0803E81A:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0803E828: .4byte gUnknown_8253AE4 _0803E828: .4byte gUnknown_8253AE4
_0803E82C: .4byte gUnknown_8254784 _0803E82C: .4byte gBaseStats
thumb_func_end GetLevelFromMonExp thumb_func_end GetLevelFromMonExp
thumb_func_start GetLevelFromBoxMonExp thumb_func_start GetLevelFromBoxMonExp
@@ -1813,7 +1813,7 @@ GetLevelFromBoxMonExp: @ 803E830
adds r3, r0, 0 adds r3, r0, 0
movs r2, 0x1 movs r2, 0x1
ldr r6, _0803E894 @ =gUnknown_8253AE4 ldr r6, _0803E894 @ =gUnknown_8253AE4
ldr r1, _0803E898 @ =gUnknown_8254784 ldr r1, _0803E898 @ =gBaseStats
lsls r0, r4, 3 lsls r0, r4, 3
subs r0, r4 subs r0, r4
lsls r0, 2 lsls r0, 2
@@ -1849,7 +1849,7 @@ _0803E886:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0803E894: .4byte gUnknown_8253AE4 _0803E894: .4byte gUnknown_8253AE4
_0803E898: .4byte gUnknown_8254784 _0803E898: .4byte gBaseStats
thumb_func_end GetLevelFromBoxMonExp thumb_func_end GetLevelFromBoxMonExp
thumb_func_start GiveMoveToMon thumb_func_start GiveMoveToMon
@@ -1932,7 +1932,7 @@ GiveMoveToBattleMon: @ 803E920
movs r3, 0 movs r3, 0
adds r5, r0, 0 adds r5, r0, 0
adds r5, 0x24 adds r5, 0x24
ldr r2, _0803E94C @ =gUnknown_8250C04 ldr r2, _0803E94C @ =gBattleMoves
lsls r1, r4, 1 lsls r1, r4, 1
adds r1, r4 adds r1, r4
lsls r1, 2 lsls r1, 2
@@ -1950,7 +1950,7 @@ _0803E93A:
adds r0, r4, 0 adds r0, r4, 0
b _0803E95A b _0803E95A
.align 2, 0 .align 2, 0
_0803E94C: .4byte gUnknown_8250C04 _0803E94C: .4byte gBattleMoves
_0803E950: _0803E950:
adds r1, 0x2 adds r1, 0x2
adds r3, 0x1 adds r3, 0x1
@@ -2013,7 +2013,7 @@ SetBattleMonMoveSlot: @ 803E9A4
strh r1, [r3] strh r1, [r3]
adds r0, 0x24 adds r0, 0x24
adds r0, r2 adds r0, r2
ldr r3, _0803E9D0 @ =gUnknown_8250C04 ldr r3, _0803E9D0 @ =gBattleMoves
lsls r2, r1, 1 lsls r2, r1, 1
adds r2, r1 adds r2, r1
lsls r2, 2 lsls r2, 2
@@ -2024,7 +2024,7 @@ SetBattleMonMoveSlot: @ 803E9A4
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803E9D0: .4byte gUnknown_8250C04 _0803E9D0: .4byte gBattleMoves
thumb_func_end SetBattleMonMoveSlot thumb_func_end SetBattleMonMoveSlot
thumb_func_start GiveMonInitialMoveset thumb_func_start GiveMonInitialMoveset
@@ -2302,7 +2302,7 @@ _0803EBB0:
mov r0, sp mov r0, sp
mov r2, r8 mov r2, r8
strh r2, [r0, 0x6] strh r2, [r0, 0x6]
ldr r1, _0803EC3C @ =gUnknown_8250C04 ldr r1, _0803EC3C @ =gBattleMoves
mov r2, r8 mov r2, r8
lsls r0, r2, 1 lsls r0, r2, 1
add r0, r8 add r0, r8
@@ -2339,7 +2339,7 @@ _0803EC04:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803EC3C: .4byte gUnknown_8250C04 _0803EC3C: .4byte gBattleMoves
thumb_func_end DeleteFirstMoveAndGiveMoveToMon thumb_func_end DeleteFirstMoveAndGiveMoveToMon
thumb_func_start DeleteFirstMoveAndGiveMoveToBoxMon thumb_func_start DeleteFirstMoveAndGiveMoveToBoxMon
@@ -2388,7 +2388,7 @@ _0803EC5C:
mov r0, sp mov r0, sp
mov r2, r8 mov r2, r8
strh r2, [r0, 0x6] strh r2, [r0, 0x6]
ldr r1, _0803ECE8 @ =gUnknown_8250C04 ldr r1, _0803ECE8 @ =gBattleMoves
mov r2, r8 mov r2, r8
lsls r0, r2, 1 lsls r0, r2, 1
add r0, r8 add r0, r8
@@ -2425,7 +2425,7 @@ _0803ECB0:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803ECE8: .4byte gUnknown_8250C04 _0803ECE8: .4byte gBattleMoves
thumb_func_end DeleteFirstMoveAndGiveMoveToBoxMon thumb_func_end DeleteFirstMoveAndGiveMoveToBoxMon
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+74 -74
View File
@@ -25,10 +25,10 @@ _0803F5CC:
b _0803F68A b _0803F68A
_0803F5D2: _0803F5D2:
movs r5, 0 movs r5, 0
ldr r0, _0803F5FC @ =gUnknown_2023BC4 ldr r0, _0803F5FC @ =gActiveBattler
ldrb r3, [r0] ldrb r3, [r0]
ldr r4, _0803F600 @ =gUnknown_2023D70 ldr r4, _0803F600 @ =gAbsentBattlerFlags
ldr r2, _0803F604 @ =gUnknown_825E45C ldr r2, _0803F604 @ =gBitTable
_0803F5DC: _0803F5DC:
cmp r5, r3 cmp r5, r3
beq _0803F5F0 beq _0803F5F0
@@ -47,9 +47,9 @@ _0803F5F0:
ble _0803F5DC ble _0803F5DC
b _0803F68A b _0803F68A
.align 2, 0 .align 2, 0
_0803F5FC: .4byte gUnknown_2023BC4 _0803F5FC: .4byte gActiveBattler
_0803F600: .4byte gUnknown_2023D70 _0803F600: .4byte gAbsentBattlerFlags
_0803F604: .4byte gUnknown_825E45C _0803F604: .4byte gBitTable
_0803F608: _0803F608:
movs r5, 0 movs r5, 0
_0803F60A: _0803F60A:
@@ -57,16 +57,16 @@ _0803F60A:
lsrs r0, 24 lsrs r0, 24
bl GetBankSide bl GetBankSide
adds r4, r0, 0 adds r4, r0, 0
ldr r0, _0803F644 @ =gUnknown_2023D6B ldr r0, _0803F644 @ =sBattler_AI
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r4, 24 lsls r4, 24
lsls r0, 24 lsls r0, 24
cmp r4, r0 cmp r4, r0
bne _0803F63C bne _0803F63C
ldr r0, _0803F648 @ =gUnknown_2023D70 ldr r0, _0803F648 @ =gAbsentBattlerFlags
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, _0803F64C @ =gUnknown_825E45C ldr r2, _0803F64C @ =gBitTable
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r2 adds r0, r2
ldr r0, [r0] ldr r0, [r0]
@@ -82,9 +82,9 @@ _0803F63C:
ble _0803F60A ble _0803F60A
b _0803F68A b _0803F68A
.align 2, 0 .align 2, 0
_0803F644: .4byte gUnknown_2023D6B _0803F644: .4byte sBattler_AI
_0803F648: .4byte gUnknown_2023D70 _0803F648: .4byte gAbsentBattlerFlags
_0803F64C: .4byte gUnknown_825E45C _0803F64C: .4byte gBitTable
_0803F650: _0803F650:
movs r5, 0 movs r5, 0
_0803F652: _0803F652:
@@ -92,16 +92,16 @@ _0803F652:
lsrs r0, 24 lsrs r0, 24
bl GetBankSide bl GetBankSide
adds r4, r0, 0 adds r4, r0, 0
ldr r0, _0803F694 @ =gUnknown_2023D6C ldr r0, _0803F694 @ =gBattlerTarget
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r4, 24 lsls r4, 24
lsls r0, 24 lsls r0, 24
cmp r4, r0 cmp r4, r0
bne _0803F684 bne _0803F684
ldr r0, _0803F698 @ =gUnknown_2023D70 ldr r0, _0803F698 @ =gAbsentBattlerFlags
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, _0803F69C @ =gUnknown_825E45C ldr r2, _0803F69C @ =gBitTable
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r2 adds r0, r2
ldr r0, [r0] ldr r0, [r0]
@@ -121,9 +121,9 @@ _0803F68A:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0803F694: .4byte gUnknown_2023D6C _0803F694: .4byte gBattlerTarget
_0803F698: .4byte gUnknown_2023D70 _0803F698: .4byte gAbsentBattlerFlags
_0803F69C: .4byte gUnknown_825E45C _0803F69C: .4byte gBitTable
thumb_func_end sub_803F5B4 thumb_func_end sub_803F5B4
thumb_func_start GetDefaultMoveTarget thumb_func_start GetDefaultMoveTarget
@@ -138,7 +138,7 @@ GetDefaultMoveTarget: @ 803F6A0
ands r4, r0 ands r4, r0
eors r4, r1 eors r4, r1
adds r5, r4, 0 adds r5, r4, 0
ldr r0, _0803F6C4 @ =gUnknown_2022B4C ldr r0, _0803F6C4 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ands r0, r6 ands r0, r6
cmp r0, 0 cmp r0, 0
@@ -146,7 +146,7 @@ GetDefaultMoveTarget: @ 803F6A0
adds r0, r4, 0 adds r0, r4, 0
b _0803F712 b _0803F712
.align 2, 0 .align 2, 0
_0803F6C4: .4byte gUnknown_2022B4C _0803F6C4: .4byte gBattleTypeFlags
_0803F6C8: _0803F6C8:
movs r0, 0 movs r0, 0
bl sub_803F5B4 bl sub_803F5B4
@@ -166,9 +166,9 @@ _0803F6E8:
adds r0, r4, 0 adds r0, r4, 0
b _0803F712 b _0803F712
_0803F6EC: _0803F6EC:
ldr r0, _0803F704 @ =gUnknown_2023D70 ldr r0, _0803F704 @ =gAbsentBattlerFlags
ldrb r1, [r0] ldrb r1, [r0]
ldr r2, _0803F708 @ =gUnknown_825E45C ldr r2, _0803F708 @ =gBitTable
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r2 adds r0, r2
ldr r0, [r0] ldr r0, [r0]
@@ -178,8 +178,8 @@ _0803F6EC:
adds r0, r4, 0 adds r0, r4, 0
b _0803F712 b _0803F712
.align 2, 0 .align 2, 0
_0803F704: .4byte gUnknown_2023D70 _0803F704: .4byte gAbsentBattlerFlags
_0803F708: .4byte gUnknown_825E45C _0803F708: .4byte gBitTable
_0803F70C: _0803F70C:
movs r0, 0x2 movs r0, 0x2
eors r5, r0 eors r5, r0
@@ -217,7 +217,7 @@ GetBoxMonGender: @ 803F730
movs r2, 0 movs r2, 0
bl GetBoxMonData bl GetBoxMonData
adds r2, r0, 0 adds r2, r0, 0
ldr r1, _0803F780 @ =gUnknown_8254784 ldr r1, _0803F780 @ =gBaseStats
lsls r0, r5, 3 lsls r0, r5, 3
subs r0, r5 subs r0, r5
lsls r0, 2 lsls r0, 2
@@ -232,7 +232,7 @@ GetBoxMonGender: @ 803F730
cmp r0, 0xFE cmp r0, 0xFE
bge _0803F786 bge _0803F786
_0803F768: _0803F768:
ldr r1, _0803F780 @ =gUnknown_8254784 ldr r1, _0803F780 @ =gBaseStats
lsls r0, r5, 3 lsls r0, r5, 3
subs r0, r5 subs r0, r5
lsls r0, 2 lsls r0, 2
@@ -245,7 +245,7 @@ _0803F768:
movs r0, 0 movs r0, 0
b _0803F786 b _0803F786
.align 2, 0 .align 2, 0
_0803F780: .4byte gUnknown_8254784 _0803F780: .4byte gBaseStats
_0803F784: _0803F784:
movs r0, 0xFE movs r0, 0xFE
_0803F786: _0803F786:
@@ -260,7 +260,7 @@ GetGenderFromSpeciesAndPersonality: @ 803F78C
adds r3, r1, 0 adds r3, r1, 0
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
ldr r1, _0803F7C8 @ =gUnknown_8254784 ldr r1, _0803F7C8 @ =gBaseStats
lsls r0, r2, 3 lsls r0, r2, 3
subs r0, r2 subs r0, r2
lsls r0, 2 lsls r0, 2
@@ -287,7 +287,7 @@ _0803F7B0:
movs r0, 0 movs r0, 0
b _0803F7CE b _0803F7CE
.align 2, 0 .align 2, 0
_0803F7C8: .4byte gUnknown_8254784 _0803F7C8: .4byte gBaseStats
_0803F7CC: _0803F7CC:
movs r0, 0xFE movs r0, 0xFE
_0803F7CE: _0803F7CE:
@@ -1655,7 +1655,7 @@ _08040204:
ldrh r5, [r2] ldrh r5, [r2]
adds r7, r1, 0 adds r7, r1, 0
adds r2, r6, 0 adds r2, r6, 0
ldr r1, _0804023C @ =gUnknown_825E45C ldr r1, _0804023C @ =gBitTable
_0804020E: _0804020E:
ldrh r3, [r2] ldrh r3, [r2]
cmp r5, r3 cmp r5, r3
@@ -1682,7 +1682,7 @@ _0804022C:
b _0804035C b _0804035C
.align 2, 0 .align 2, 0
_08040238: .4byte 0x00000163 _08040238: .4byte 0x00000163
_0804023C: .4byte gUnknown_825E45C _0804023C: .4byte gBitTable
_08040240: _08040240:
movs r4, 0 movs r4, 0
mov r1, r9 mov r1, r9
@@ -2823,7 +2823,7 @@ _08040B46:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _08040B78 @ =gUnknown_2024284 ldr r0, _08040B78 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -2841,7 +2841,7 @@ _08040B46:
movs r0, 0 movs r0, 0
b _08040B8A b _08040B8A
.align 2, 0 .align 2, 0
_08040B78: .4byte gUnknown_2024284 _08040B78: .4byte gPlayerParty
_08040B7C: .4byte gUnknown_2024029 _08040B7C: .4byte gUnknown_2024029
_08040B80: _08040B80:
adds r0, r6, 0 adds r0, r6, 0
@@ -2956,7 +2956,7 @@ _08040C54:
adds r1, r0, 0 adds r1, r0, 0
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08040C7C @ =gUnknown_2024284 ldr r1, _08040C7C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
movs r2, 0 movs r2, 0
@@ -2969,7 +2969,7 @@ _08040C72:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08040C7C: .4byte gUnknown_2024284 _08040C7C: .4byte gPlayerParty
thumb_func_end CalculatePlayerPartyCount thumb_func_end CalculatePlayerPartyCount
thumb_func_start CalculateEnemyPartyCount thumb_func_start CalculateEnemyPartyCount
@@ -2994,7 +2994,7 @@ _08040C98:
adds r1, r0, 0 adds r1, r0, 0
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08040CC0 @ =gUnknown_202402C ldr r1, _08040CC0 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
movs r2, 0 movs r2, 0
@@ -3007,7 +3007,7 @@ _08040CB6:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08040CC0: .4byte gUnknown_202402C _08040CC0: .4byte gEnemyParty
thumb_func_end CalculateEnemyPartyCount thumb_func_end CalculateEnemyPartyCount
thumb_func_start GetMonsStateToDoubles thumb_func_start GetMonsStateToDoubles
@@ -3027,7 +3027,7 @@ _08040CDC:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _08040D34 @ =gUnknown_2024284 ldr r0, _08040D34 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -3067,7 +3067,7 @@ _08040D28:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08040D30: .4byte gUnknown_2024029 _08040D30: .4byte gUnknown_2024029
_08040D34: .4byte gUnknown_2024284 _08040D34: .4byte gPlayerParty
thumb_func_end GetMonsStateToDoubles thumb_func_end GetMonsStateToDoubles
thumb_func_start GetAbilityBySpecies thumb_func_start GetAbilityBySpecies
@@ -3079,7 +3079,7 @@ GetAbilityBySpecies: @ 8040D38
cmp r1, 0 cmp r1, 0
beq _08040D5C beq _08040D5C
ldr r2, _08040D54 @ =gUnknown_2023D6A ldr r2, _08040D54 @ =gUnknown_2023D6A
ldr r1, _08040D58 @ =gUnknown_8254784 ldr r1, _08040D58 @ =gBaseStats
lsls r0, r3, 3 lsls r0, r3, 3
subs r0, r3 subs r0, r3
lsls r0, 2 lsls r0, 2
@@ -3088,10 +3088,10 @@ GetAbilityBySpecies: @ 8040D38
b _08040D6A b _08040D6A
.align 2, 0 .align 2, 0
_08040D54: .4byte gUnknown_2023D6A _08040D54: .4byte gUnknown_2023D6A
_08040D58: .4byte gUnknown_8254784 _08040D58: .4byte gBaseStats
_08040D5C: _08040D5C:
ldr r2, _08040D74 @ =gUnknown_2023D6A ldr r2, _08040D74 @ =gUnknown_2023D6A
ldr r1, _08040D78 @ =gUnknown_8254784 ldr r1, _08040D78 @ =gBaseStats
lsls r0, r3, 3 lsls r0, r3, 3
subs r0, r3 subs r0, r3
lsls r0, 2 lsls r0, 2
@@ -3104,7 +3104,7 @@ _08040D6A:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08040D74: .4byte gUnknown_2023D6A _08040D74: .4byte gUnknown_2023D6A
_08040D78: .4byte gUnknown_8254784 _08040D78: .4byte gBaseStats
thumb_func_end GetAbilityBySpecies thumb_func_end GetAbilityBySpecies
thumb_func_start GetMonAbility thumb_func_start GetMonAbility
@@ -3143,7 +3143,7 @@ CreateSecretBaseEnemyParty: @ 8040DB0
sub sp, 0x14 sub sp, 0x14
adds r5, r0, 0 adds r5, r0, 0
bl ZeroEnemyPartyMons bl ZeroEnemyPartyMons
ldr r4, _08040ED8 @ =gUnknown_2023FF4 ldr r4, _08040ED8 @ =gBattleResources
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0] ldr r0, [r0]
adds r1, r5, 0 adds r1, r5, 0
@@ -3152,7 +3152,7 @@ CreateSecretBaseEnemyParty: @ 8040DB0
movs r0, 0 movs r0, 0
mov r9, r0 mov r9, r0
_08040DD4: _08040DD4:
ldr r1, _08040ED8 @ =gUnknown_2023FF4 ldr r1, _08040ED8 @ =gBattleResources
ldr r3, [r1] ldr r3, [r1]
ldr r2, [r3] ldr r2, [r3]
mov r4, r9 mov r4, r9
@@ -3168,7 +3168,7 @@ _08040DD4:
movs r0, 0x64 movs r0, 0x64
mov r6, r9 mov r6, r9
muls r6, r0 muls r6, r0
ldr r4, _08040EDC @ =gUnknown_202402C ldr r4, _08040EDC @ =gEnemyParty
mov r8, r4 mov r8, r4
adds r5, r6, r4 adds r5, r6, r4
ldrh r1, [r1] ldrh r1, [r1]
@@ -3192,7 +3192,7 @@ _08040DD4:
adds r0, r5, 0 adds r0, r5, 0
movs r3, 0xF movs r3, 0xF
bl CreateMon bl CreateMon
ldr r1, _08040ED8 @ =gUnknown_2023FF4 ldr r1, _08040ED8 @ =gBattleResources
ldr r0, [r1] ldr r0, [r1]
adds r1, r7, 0 adds r1, r7, 0
adds r1, 0x88 adds r1, 0x88
@@ -3209,7 +3209,7 @@ _08040DD4:
_08040E44: _08040E44:
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x1A adds r1, 0x1A
ldr r2, _08040ED8 @ =gUnknown_2023FF4 ldr r2, _08040ED8 @ =gBattleResources
ldr r0, [r2] ldr r0, [r2]
ldr r2, [r0] ldr r2, [r0]
adds r2, r7 adds r2, r7
@@ -3222,7 +3222,7 @@ _08040E44:
movs r3, 0x64 movs r3, 0x64
mov r0, r9 mov r0, r9
muls r0, r3 muls r0, r3
ldr r1, _08040EDC @ =gUnknown_202402C ldr r1, _08040EDC @ =gEnemyParty
adds r7, r0, r1 adds r7, r0, r1
mov r4, r10 mov r4, r10
lsls r0, r4, 1 lsls r0, r4, 1
@@ -3232,7 +3232,7 @@ _08040E44:
_08040E72: _08040E72:
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0xD adds r1, 0xD
ldr r2, _08040ED8 @ =gUnknown_2023FF4 ldr r2, _08040ED8 @ =gBattleResources
ldr r0, [r2] ldr r0, [r2]
ldr r2, [r0] ldr r2, [r0]
adds r2, r6 adds r2, r6
@@ -3240,7 +3240,7 @@ _08040E72:
bl sub_804037C bl sub_804037C
adds r1, r5, 0 adds r1, r5, 0
adds r1, 0x11 adds r1, 0x11
ldr r3, _08040ED8 @ =gUnknown_2023FF4 ldr r3, _08040ED8 @ =gBattleResources
ldr r0, [r3] ldr r0, [r3]
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x4C adds r0, 0x4C
@@ -3263,10 +3263,10 @@ _08040EAE:
mov r9, r4 mov r9, r4
cmp r4, 0x5 cmp r4, 0x5
ble _08040DD4 ble _08040DD4
ldr r1, _08040EE4 @ =gUnknown_2022B4C ldr r1, _08040EE4 @ =gBattleTypeFlags
movs r0, 0x8 movs r0, 0x8
str r0, [r1] str r0, [r1]
ldr r1, _08040EE8 @ =gUnknown_20386AE ldr r1, _08040EE8 @ =gTrainerBattleOpponent_A
movs r2, 0x80 movs r2, 0x80
lsls r2, 3 lsls r2, 3
adds r0, r2, 0 adds r0, r2, 0
@@ -3280,18 +3280,18 @@ _08040EAE:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08040ED8: .4byte gUnknown_2023FF4 _08040ED8: .4byte gBattleResources
_08040EDC: .4byte gUnknown_202402C _08040EDC: .4byte gEnemyParty
_08040EE0: .4byte gUnknown_8250C08 _08040EE0: .4byte gUnknown_8250C08
_08040EE4: .4byte gUnknown_2022B4C _08040EE4: .4byte gBattleTypeFlags
_08040EE8: .4byte gUnknown_20386AE _08040EE8: .4byte gTrainerBattleOpponent_A
thumb_func_end CreateSecretBaseEnemyParty thumb_func_end CreateSecretBaseEnemyParty
thumb_func_start GetSecretBaseTrainerPicIndex thumb_func_start GetSecretBaseTrainerPicIndex
GetSecretBaseTrainerPicIndex: @ 8040EEC GetSecretBaseTrainerPicIndex: @ 8040EEC
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _08040F20 @ =gUnknown_825DFE0 ldr r5, _08040F20 @ =gUnknown_825DFE0
ldr r0, _08040F24 @ =gUnknown_2023FF4 ldr r0, _08040F24 @ =gBattleResources
ldr r0, [r0] ldr r0, [r0]
ldr r4, [r0] ldr r4, [r0]
ldrb r0, [r4, 0x9] ldrb r0, [r4, 0x9]
@@ -3315,7 +3315,7 @@ GetSecretBaseTrainerPicIndex: @ 8040EEC
bx r1 bx r1
.align 2, 0 .align 2, 0
_08040F20: .4byte gUnknown_825DFE0 _08040F20: .4byte gUnknown_825DFE0
_08040F24: .4byte gUnknown_2023FF4 _08040F24: .4byte gBattleResources
_08040F28: .4byte gUnknown_82538A8 _08040F28: .4byte gUnknown_82538A8
thumb_func_end GetSecretBaseTrainerPicIndex thumb_func_end GetSecretBaseTrainerPicIndex
@@ -3323,7 +3323,7 @@ _08040F28: .4byte gUnknown_82538A8
GetSecretBaseTrainerNameIndex: @ 8040F2C GetSecretBaseTrainerNameIndex: @ 8040F2C
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _08040F60 @ =gUnknown_825DFE0 ldr r5, _08040F60 @ =gUnknown_825DFE0
ldr r0, _08040F64 @ =gUnknown_2023FF4 ldr r0, _08040F64 @ =gBattleResources
ldr r0, [r0] ldr r0, [r0]
ldr r4, [r0] ldr r4, [r0]
ldrb r0, [r4, 0x9] ldrb r0, [r4, 0x9]
@@ -3347,7 +3347,7 @@ GetSecretBaseTrainerNameIndex: @ 8040F2C
bx r1 bx r1
.align 2, 0 .align 2, 0
_08040F60: .4byte gUnknown_825DFE0 _08040F60: .4byte gUnknown_825DFE0
_08040F64: .4byte gUnknown_2023FF4 _08040F64: .4byte gBattleResources
_08040F68: .4byte gUnknown_825393E _08040F68: .4byte gUnknown_825393E
thumb_func_end GetSecretBaseTrainerNameIndex thumb_func_end GetSecretBaseTrainerNameIndex
@@ -3358,7 +3358,7 @@ IsPlayerPartyAndPokemonStorageFull: @ 8040F6C
_08040F70: _08040F70:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _08040F88 @ =gUnknown_2024284 ldr r1, _08040F88 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
movs r2, 0 movs r2, 0
@@ -3368,7 +3368,7 @@ _08040F70:
movs r0, 0 movs r0, 0
b _08040F9A b _08040F9A
.align 2, 0 .align 2, 0
_08040F88: .4byte gUnknown_2024284 _08040F88: .4byte gPlayerParty
_08040F8C: _08040F8C:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x5 cmp r4, 0x5
@@ -3466,7 +3466,7 @@ CalculatePPWithBonus: @ 804101C
lsrs r0, 16 lsrs r0, 16
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
ldr r4, _0804105C @ =gUnknown_8250C04 ldr r4, _0804105C @ =gBattleMoves
lsls r3, r0, 1 lsls r3, r0, 1
adds r3, r0 adds r3, r0
lsls r3, 2 lsls r3, 2
@@ -3492,7 +3492,7 @@ CalculatePPWithBonus: @ 804101C
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0804105C: .4byte gUnknown_8250C04 _0804105C: .4byte gBattleMoves
_08041060: .4byte gUnknown_825DEA1 _08041060: .4byte gUnknown_825DEA1
thumb_func_end CalculatePPWithBonus thumb_func_end CalculatePPWithBonus
@@ -3561,13 +3561,13 @@ CopyPlayerPartyMonToBattleData: @ 80410B8
movs r0, 0x64 movs r0, 0x64
mov r5, r9 mov r5, r9
muls r5, r0 muls r5, r0
ldr r0, _080413A4 @ =gUnknown_2024284 ldr r0, _080413A4 @ =gPlayerParty
adds r5, r0 adds r5, r0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0xB movs r1, 0xB
movs r2, 0 movs r2, 0
bl GetMonData bl GetMonData
ldr r1, _080413A8 @ =gUnknown_2023BE4 ldr r1, _080413A8 @ =gBattleMons
mov r8, r1 mov r8, r1
movs r1, 0x58 movs r1, 0x58
ldr r2, [sp, 0x14] ldr r2, [sp, 0x14]
@@ -3610,7 +3610,7 @@ _0804110A:
movs r0, 0x64 movs r0, 0x64
mov r4, r9 mov r4, r9
muls r4, r0 muls r4, r0
ldr r0, _080413A4 @ =gUnknown_2024284 ldr r0, _080413A4 @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x15 movs r1, 0x15
@@ -3806,7 +3806,7 @@ _0804110A:
adds r1, 0x48 adds r1, 0x48
adds r1, r5, r1 adds r1, r5, r1
str r0, [r1] str r0, [r1]
ldr r2, _080413B8 @ =gUnknown_8254784 ldr r2, _080413B8 @ =gBaseStats
ldrh r1, [r7] ldrh r1, [r7]
lsls r0, r1, 3 lsls r0, r1, 3
subs r0, r1 subs r0, r1
@@ -3849,7 +3849,7 @@ _0804110A:
bl GetMonData bl GetMonData
ldr r0, [sp, 0x14] ldr r0, [sp, 0x14]
bl GetBankSide bl GetBankSide
ldr r1, _080413BC @ =gUnknown_2023FE8 ldr r1, _080413BC @ =gBattleStruct
lsls r0, 24 lsls r0, 24
lsrs r0, 23 lsrs r0, 23
adds r0, 0xA8 adds r0, 0xA8
@@ -3890,13 +3890,13 @@ _0804136E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080413A4: .4byte gUnknown_2024284 _080413A4: .4byte gPlayerParty
_080413A8: .4byte gUnknown_2023BE4 _080413A8: .4byte gBattleMons
_080413AC: .4byte 0xfffffc1f _080413AC: .4byte 0xfffffc1f
_080413B0: .4byte 0xfff07fff _080413B0: .4byte 0xfff07fff
_080413B4: .4byte 0xfffffe0f _080413B4: .4byte 0xfffffe0f
_080413B8: .4byte gUnknown_8254784 _080413B8: .4byte gBaseStats
_080413BC: .4byte gUnknown_2023FE8 _080413BC: .4byte gBattleStruct
thumb_func_end CopyPlayerPartyMonToBattleData thumb_func_end CopyPlayerPartyMonToBattleData
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+102 -102
View File
@@ -38,7 +38,7 @@ sub_80423A4: @ 80423A4
beq _080423F6 beq _080423F6
cmp r6, 0x4 cmp r6, 0x4
beq _080423F6 beq _080423F6
ldr r0, _08042404 @ =gUnknown_2023BE4 ldr r0, _08042404 @ =gBattleMons
movs r1, 0x58 movs r1, 0x58
muls r1, r6 muls r1, r6
adds r0, 0x4C adds r0, 0x4C
@@ -52,7 +52,7 @@ _080423F6:
.align 2, 0 .align 2, 0
_080423FC: .4byte gMain _080423FC: .4byte gMain
_08042400: .4byte 0x00000439 _08042400: .4byte 0x00000439
_08042404: .4byte gUnknown_2023BE4 _08042404: .4byte gBattleMons
_08042408: _08042408:
movs r0, 0x1 movs r0, 0x1
_0804240A: _0804240A:
@@ -111,7 +111,7 @@ _08042458:
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
beq _080424F8 beq _080424F8
ldr r0, _080424C0 @ =gUnknown_2023BC4 ldr r0, _080424C0 @ =gActiveBattler
strb r2, [r0] strb r2, [r0]
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
@@ -127,7 +127,7 @@ _08042458:
ldrb r0, [r0] ldrb r0, [r0]
cmp r1, r0 cmp r1, r0
bge _08042504 bge _08042504
ldr r2, _080424C8 @ =gUnknown_2023BCE ldr r2, _080424C8 @ =gBattlerPartyIndexes
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r2 adds r0, r2
ldrh r3, [r0] ldrh r3, [r0]
@@ -145,9 +145,9 @@ _080424B0: .4byte gUnknown_2023D6F
_080424B4: .4byte gUnknown_2024004 _080424B4: .4byte gUnknown_2024004
_080424B8: .4byte gMain _080424B8: .4byte gMain
_080424BC: .4byte 0x00000439 _080424BC: .4byte 0x00000439
_080424C0: .4byte gUnknown_2023BC4 _080424C0: .4byte gActiveBattler
_080424C4: .4byte gUnknown_2023BCC _080424C4: .4byte gUnknown_2023BCC
_080424C8: .4byte gUnknown_2023BCE _080424C8: .4byte gBattlerPartyIndexes
_080424CC: _080424CC:
ldr r0, [sp, 0xC] ldr r0, [sp, 0xC]
adds r0, 0x2 adds r0, 0x2
@@ -171,7 +171,7 @@ _080424CC:
.align 2, 0 .align 2, 0
_080424F4: .4byte gUnknown_2023BCC _080424F4: .4byte gUnknown_2023BCC
_080424F8: _080424F8:
ldr r0, _08042520 @ =gUnknown_2023BC4 ldr r0, _08042520 @ =gActiveBattler
strb r1, [r0] strb r1, [r0]
movs r0, 0x4 movs r0, 0x4
str r0, [sp, 0x1C] str r0, [sp, 0x1C]
@@ -193,7 +193,7 @@ _08042504:
beq _0804252E beq _0804252E
b _08042578 b _08042578
.align 2, 0 .align 2, 0
_08042520: .4byte gUnknown_2023BC4 _08042520: .4byte gActiveBattler
_08042524: .4byte gUnknown_82528BC _08042524: .4byte gUnknown_82528BC
_08042528: _08042528:
ldr r2, [sp] ldr r2, [sp]
@@ -208,7 +208,7 @@ _0804252E:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _08042560 beq _08042560
ldr r0, _08042558 @ =gUnknown_2023BC4 ldr r0, _08042558 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
subs r0, r1 subs r0, r1
@@ -219,7 +219,7 @@ _0804252E:
.align 2, 0 .align 2, 0
_08042550: .4byte gMain _08042550: .4byte gMain
_08042554: .4byte 0x00000439 _08042554: .4byte 0x00000439
_08042558: .4byte gUnknown_2023BC4 _08042558: .4byte gActiveBattler
_0804255C: .4byte gUnknown_2023F5C _0804255C: .4byte gUnknown_2023F5C
_08042560: _08042560:
ldr r0, _0804256C @ =gSaveBlock1Ptr ldr r0, _0804256C @ =gSaveBlock1Ptr
@@ -284,7 +284,7 @@ _080425B0:
ldr r0, [sp, 0x1C] ldr r0, [sp, 0x1C]
cmp r0, 0x4 cmp r0, 0x4
beq _080425F4 beq _080425F4
ldr r1, _08042644 @ =gUnknown_2023BE4 ldr r1, _08042644 @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
ldr r2, [sp, 0x1C] ldr r2, [sp, 0x1C]
muls r0, r2 muls r0, r2
@@ -304,8 +304,8 @@ _080425F4:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0804261C beq _0804261C
ldr r1, _08042644 @ =gUnknown_2023BE4 ldr r1, _08042644 @ =gBattleMons
ldr r0, _08042648 @ =gUnknown_2023BC4 ldr r0, _08042648 @ =gActiveBattler
ldrb r2, [r0] ldrb r2, [r0]
movs r0, 0x58 movs r0, 0x58
muls r0, r2 muls r0, r2
@@ -327,8 +327,8 @@ _0804261C:
bne _08042628 bne _08042628
b _08042BCA b _08042BCA
_08042628: _08042628:
ldr r2, _08042644 @ =gUnknown_2023BE4 ldr r2, _08042644 @ =gBattleMons
ldr r0, _08042648 @ =gUnknown_2023BC4 ldr r0, _08042648 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x58 movs r0, 0x58
muls r0, r1 muls r0, r1
@@ -340,8 +340,8 @@ _08042628:
.align 2, 0 .align 2, 0
_0804263C: .4byte gMain _0804263C: .4byte gMain
_08042640: .4byte 0x00000439 _08042640: .4byte 0x00000439
_08042644: .4byte gUnknown_2023BE4 _08042644: .4byte gBattleMons
_08042648: .4byte gUnknown_2023BC4 _08042648: .4byte gActiveBattler
_0804264C: _0804264C:
ldr r0, [sp, 0x14] ldr r0, [sp, 0x14]
ldr r1, [sp, 0xC] ldr r1, [sp, 0xC]
@@ -352,8 +352,8 @@ _0804264C:
adds r5, r2, 0 adds r5, r2, 0
cmp r0, 0 cmp r0, 0
beq _08042678 beq _08042678
ldr r2, _080426A0 @ =gUnknown_2023BE4 ldr r2, _080426A0 @ =gBattleMons
ldr r0, _080426A4 @ =gUnknown_2023BC4 ldr r0, _080426A4 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x58 movs r0, 0x58
muls r0, r1 muls r0, r1
@@ -373,8 +373,8 @@ _08042678:
bne _08042684 bne _08042684
b _08042BCA b _08042BCA
_08042684: _08042684:
ldr r2, _080426A0 @ =gUnknown_2023BE4 ldr r2, _080426A0 @ =gBattleMons
ldr r0, _080426A4 @ =gUnknown_2023BC4 ldr r0, _080426A4 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x58 movs r0, 0x58
muls r0, r1 muls r0, r1
@@ -388,8 +388,8 @@ _08042684:
_0804269C: _0804269C:
b _08042832 b _08042832
.align 2, 0 .align 2, 0
_080426A0: .4byte gUnknown_2023BE4 _080426A0: .4byte gBattleMons
_080426A4: .4byte gUnknown_2023BC4 _080426A4: .4byte gActiveBattler
_080426A8: _080426A8:
ldr r1, [sp, 0x14] ldr r1, [sp, 0x14]
ldr r0, [sp, 0xC] ldr r0, [sp, 0xC]
@@ -400,8 +400,8 @@ _080426A8:
adds r5, r2, 0 adds r5, r2, 0
cmp r0, 0 cmp r0, 0
beq _080426D4 beq _080426D4
ldr r2, _08042700 @ =gUnknown_2023BE4 ldr r2, _08042700 @ =gBattleMons
ldr r0, _08042704 @ =gUnknown_2023BC4 ldr r0, _08042704 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x58 movs r0, 0x58
muls r0, r1 muls r0, r1
@@ -421,8 +421,8 @@ _080426D4:
bne _080426E0 bne _080426E0
b _08042BCA b _08042BCA
_080426E0: _080426E0:
ldr r2, _08042700 @ =gUnknown_2023BE4 ldr r2, _08042700 @ =gBattleMons
ldr r0, _08042704 @ =gUnknown_2023BC4 ldr r0, _08042704 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x58 movs r0, 0x58
muls r0, r1 muls r0, r1
@@ -439,8 +439,8 @@ _080426F8:
str r2, [sp, 0x10] str r2, [sp, 0x10]
b _08042BCA b _08042BCA
.align 2, 0 .align 2, 0
_08042700: .4byte gUnknown_2023BE4 _08042700: .4byte gBattleMons
_08042704: .4byte gUnknown_2023BC4 _08042704: .4byte gActiveBattler
_08042708: _08042708:
ldr r0, [sp, 0x14] ldr r0, [sp, 0x14]
ldr r1, [sp, 0xC] ldr r1, [sp, 0xC]
@@ -452,7 +452,7 @@ _08042708:
cmp r0, 0 cmp r0, 0
beq _0804273A beq _0804273A
ldr r4, _08042838 @ =gUnknown_2023DE4 ldr r4, _08042838 @ =gUnknown_2023DE4
ldr r0, _0804283C @ =gUnknown_2023BC4 ldr r0, _0804283C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -583,7 +583,7 @@ _08042814:
bne _0804281C bne _0804281C
b _08042BCA b _08042BCA
_0804281C: _0804281C:
ldr r1, _0804284C @ =gUnknown_2023BE4 ldr r1, _0804284C @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
muls r0, r2 muls r0, r2
adds r1, 0x50 adds r1, 0x50
@@ -600,11 +600,11 @@ _08042832:
b _08042BCA b _08042BCA
.align 2, 0 .align 2, 0
_08042838: .4byte gUnknown_2023DE4 _08042838: .4byte gUnknown_2023DE4
_0804283C: .4byte gUnknown_2023BC4 _0804283C: .4byte gActiveBattler
_08042840: .4byte 0x00000f88 _08042840: .4byte 0x00000f88
_08042844: .4byte gMain _08042844: .4byte gMain
_08042848: .4byte 0x00000439 _08042848: .4byte 0x00000439
_0804284C: .4byte gUnknown_2023BE4 _0804284C: .4byte gBattleMons
_08042850: _08042850:
ldr r1, [sp, 0x14] ldr r1, [sp, 0x14]
ldr r2, [sp, 0xC] ldr r2, [sp, 0xC]
@@ -1108,7 +1108,7 @@ _08042C34:
cmp r3, 0xAF cmp r3, 0xAF
bne _08042C46 bne _08042C46
_08042C38: _08042C38:
ldr r0, _08042C58 @ =gUnknown_2023BC4 ldr r0, _08042C58 @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
subs r0, r1 subs r0, r1
@@ -1127,7 +1127,7 @@ _08042C4A:
beq _08042CF4 beq _08042CF4
b _08042D3E b _08042D3E
.align 2, 0 .align 2, 0
_08042C58: .4byte gUnknown_2023BC4 _08042C58: .4byte gActiveBattler
_08042C5C: .4byte gUnknown_2023F5C _08042C5C: .4byte gUnknown_2023F5C
_08042C60: _08042C60:
cmp r2, 0 cmp r2, 0
@@ -1265,7 +1265,7 @@ _08042D48:
thumb_func_start sub_8042D50 thumb_func_start sub_8042D50
sub_8042D50: @ 8042D50 sub_8042D50: @ 8042D50
push {lr} push {lr}
ldr r2, _08042D84 @ =gUnknown_2023D6C ldr r2, _08042D84 @ =gBattlerTarget
ldr r1, _08042D88 @ =gUnknown_2024004 ldr r1, _08042D88 @ =gUnknown_2024004
ldrb r1, [r1] ldrb r1, [r1]
strb r1, [r2] strb r1, [r2]
@@ -1287,7 +1287,7 @@ sub_8042D50: @ 8042D50
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08042D84: .4byte gUnknown_2023D6C _08042D84: .4byte gBattlerTarget
_08042D88: .4byte gUnknown_2024004 _08042D88: .4byte gUnknown_2024004
_08042D8C: .4byte gUnknown_2022AB8 _08042D8C: .4byte gUnknown_2022AB8
_08042D90: .4byte gUnknown_83FD5D0 _08042D90: .4byte gUnknown_83FD5D0
@@ -1349,7 +1349,7 @@ _08042E04:
ldrb r0, [r2] ldrb r0, [r2]
strb r0, [r1] strb r0, [r1]
movs r5, 0 movs r5, 0
ldr r0, _08042E48 @ =gUnknown_2023D6B ldr r0, _08042E48 @ =sBattler_AI
mov r8, r0 mov r8, r0
movs r6, 0 movs r6, 0
_08042E12: _08042E12:
@@ -1376,7 +1376,7 @@ _08042E24:
_08042E3C: .4byte gUnknown_82528BC _08042E3C: .4byte gUnknown_82528BC
_08042E40: .4byte gUnknown_2024004 _08042E40: .4byte gUnknown_2024004
_08042E44: .4byte gUnknown_2023D6F _08042E44: .4byte gUnknown_2023D6F
_08042E48: .4byte gUnknown_2023D6B _08042E48: .4byte sBattler_AI
_08042E4C: _08042E4C:
ldr r0, _08042E88 @ =gUnknown_2024004 ldr r0, _08042E88 @ =gUnknown_2024004
ldrb r0, [r0] ldrb r0, [r0]
@@ -1394,7 +1394,7 @@ _08042E5A:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _08042E7A beq _08042E7A
ldr r1, _08042E90 @ =gUnknown_2023D6B ldr r1, _08042E90 @ =sBattler_AI
ldr r0, _08042E88 @ =gUnknown_2024004 ldr r0, _08042E88 @ =gUnknown_2024004
ldrb r0, [r0] ldrb r0, [r0]
strb r0, [r1] strb r0, [r1]
@@ -1410,7 +1410,7 @@ _08042E7A:
.align 2, 0 .align 2, 0
_08042E88: .4byte gUnknown_2024004 _08042E88: .4byte gUnknown_2024004
_08042E8C: .4byte gUnknown_83FBBE9 _08042E8C: .4byte gUnknown_83FBBE9
_08042E90: .4byte gUnknown_2023D6B _08042E90: .4byte sBattler_AI
_08042E94: .4byte gUnknown_83FBBB4 _08042E94: .4byte gUnknown_83FBBB4
_08042E98: .4byte gUnknown_202298C _08042E98: .4byte gUnknown_202298C
thumb_func_end sub_8042DA4 thumb_func_end sub_8042DA4
@@ -2509,7 +2509,7 @@ _08043676:
sub_804367C: @ 804367C sub_804367C: @ 804367C
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, _08043694 @ =gUnknown_823EAC8 ldr r2, _08043694 @ =gTrainers
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
@@ -2519,7 +2519,7 @@ sub_804367C: @ 804367C
ands r0, r1 ands r0, r1
bx lr bx lr
.align 2, 0 .align 2, 0
_08043694: .4byte gUnknown_823EAC8 _08043694: .4byte gTrainers
thumb_func_end sub_804367C thumb_func_end sub_804367C
thumb_func_start nature_stat_mod thumb_func_start nature_stat_mod
@@ -2669,14 +2669,14 @@ _08043798:
_080437A8: _080437A8:
cmp r5, 0x3 cmp r5, 0x3
bne _080437D4 bne _080437D4
ldr r0, _08043880 @ =gUnknown_2022B4C ldr r0, _08043880 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x8 movs r1, 0x8
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _08043876 beq _08043876
ldr r2, _08043884 @ =gUnknown_823EAC8 ldr r2, _08043884 @ =gTrainers
ldr r0, _08043888 @ =gUnknown_20386AE ldr r0, _08043888 @ =gTrainerBattleOpponent_A
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -2777,9 +2777,9 @@ _08043876:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08043880: .4byte gUnknown_2022B4C _08043880: .4byte gBattleTypeFlags
_08043884: .4byte gUnknown_823EAC8 _08043884: .4byte gTrainers
_08043888: .4byte gUnknown_20386AE _08043888: .4byte gTrainerBattleOpponent_A
_0804388C: .4byte gUnknown_825DFF6 _0804388C: .4byte gUnknown_825DFF6
thumb_func_end sub_80436F8 thumb_func_end sub_80436F8
@@ -2841,7 +2841,7 @@ _080438EC:
.4byte _08043954 .4byte _08043954
.4byte _08043968 .4byte _08043968
_08043904: _08043904:
ldr r0, _08043914 @ =gUnknown_8254784 ldr r0, _08043914 @ =gBaseStats
lsls r1, r5, 3 lsls r1, r5, 3
subs r1, r5 subs r1, r5
lsls r1, 2 lsls r1, 2
@@ -2850,9 +2850,9 @@ _08043904:
lsls r0, 30 lsls r0, 30
b _08043976 b _08043976
.align 2, 0 .align 2, 0
_08043914: .4byte gUnknown_8254784 _08043914: .4byte gBaseStats
_08043918: _08043918:
ldr r0, _08043928 @ =gUnknown_8254784 ldr r0, _08043928 @ =gBaseStats
lsls r1, r5, 3 lsls r1, r5, 3
subs r1, r5 subs r1, r5
lsls r1, 2 lsls r1, 2
@@ -2860,9 +2860,9 @@ _08043918:
ldrb r0, [r1, 0xA] ldrb r0, [r1, 0xA]
b _08043974 b _08043974
.align 2, 0 .align 2, 0
_08043928: .4byte gUnknown_8254784 _08043928: .4byte gBaseStats
_0804392C: _0804392C:
ldr r0, _0804393C @ =gUnknown_8254784 ldr r0, _0804393C @ =gBaseStats
lsls r1, r5, 3 lsls r1, r5, 3
subs r1, r5 subs r1, r5
lsls r1, 2 lsls r1, 2
@@ -2871,9 +2871,9 @@ _0804392C:
lsls r0, 26 lsls r0, 26
b _08043976 b _08043976
.align 2, 0 .align 2, 0
_0804393C: .4byte gUnknown_8254784 _0804393C: .4byte gBaseStats
_08043940: _08043940:
ldr r0, _08043950 @ =gUnknown_8254784 ldr r0, _08043950 @ =gBaseStats
lsls r1, r5, 3 lsls r1, r5, 3
subs r1, r5 subs r1, r5
lsls r1, 2 lsls r1, 2
@@ -2882,9 +2882,9 @@ _08043940:
lsrs r0, 6 lsrs r0, 6
b _08043978 b _08043978
.align 2, 0 .align 2, 0
_08043950: .4byte gUnknown_8254784 _08043950: .4byte gBaseStats
_08043954: _08043954:
ldr r0, _08043964 @ =gUnknown_8254784 ldr r0, _08043964 @ =gBaseStats
lsls r1, r5, 3 lsls r1, r5, 3
subs r1, r5 subs r1, r5
lsls r1, 2 lsls r1, 2
@@ -2893,9 +2893,9 @@ _08043954:
lsls r0, 30 lsls r0, 30
b _08043976 b _08043976
.align 2, 0 .align 2, 0
_08043964: .4byte gUnknown_8254784 _08043964: .4byte gBaseStats
_08043968: _08043968:
ldr r0, _080439A4 @ =gUnknown_8254784 ldr r0, _080439A4 @ =gBaseStats
lsls r1, r5, 3 lsls r1, r5, 3
subs r1, r5 subs r1, r5
lsls r1, 2 lsls r1, 2
@@ -2929,7 +2929,7 @@ _0804397C:
ldrb r0, [r0, 0x7] ldrb r0, [r0, 0x7]
b _080439D0 b _080439D0
.align 2, 0 .align 2, 0
_080439A4: .4byte gUnknown_8254784 _080439A4: .4byte gBaseStats
_080439A8: .4byte gMain _080439A8: .4byte gMain
_080439AC: .4byte 0x00000439 _080439AC: .4byte 0x00000439
_080439B0: .4byte gUnknown_2023F54 _080439B0: .4byte gUnknown_2023F54
@@ -3171,7 +3171,7 @@ sub_8043B48: @ 8043B48
adds r4, r0, 0 adds r4, r0, 0
str r3, [sp] str r3, [sp]
ldr r2, _08043B88 @ =gUnknown_8253AE4 ldr r2, _08043B88 @ =gUnknown_8253AE4
ldr r3, _08043B8C @ =gUnknown_8254784 ldr r3, _08043B8C @ =gBaseStats
lsls r0, r1, 3 lsls r0, r1, 3
subs r0, r1 subs r0, r1
lsls r0, 2 lsls r0, 2
@@ -3200,7 +3200,7 @@ _08043B80:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08043B88: .4byte gUnknown_8253AE4 _08043B88: .4byte gUnknown_8253AE4
_08043B8C: .4byte gUnknown_8254784 _08043B8C: .4byte gBaseStats
thumb_func_end sub_8043B48 thumb_func_end sub_8043B48
thumb_func_start sub_8043B90 thumb_func_start sub_8043B90
@@ -3236,7 +3236,7 @@ sub_8043B90: @ 8043B90
mov r0, sp mov r0, sp
ldrb r1, [r0] ldrb r1, [r0]
lsls r1, 2 lsls r1, 2
ldr r2, _08043C10 @ =gUnknown_8254784 ldr r2, _08043C10 @ =gBaseStats
lsls r0, r6, 3 lsls r0, r6, 3
subs r0, r6 subs r0, r6
lsls r0, 2 lsls r0, 2
@@ -3264,7 +3264,7 @@ sub_8043B90: @ 8043B90
b _08043C22 b _08043C22
.align 2, 0 .align 2, 0
_08043C0C: .4byte gUnknown_8253AE4 _08043C0C: .4byte gUnknown_8253AE4
_08043C10: .4byte gUnknown_8254784 _08043C10: .4byte gBaseStats
_08043C14: _08043C14:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
@@ -3783,7 +3783,7 @@ _08043FD0: .4byte gUnknown_2024024
thumb_func_start sub_8043FD4 thumb_func_start sub_8043FD4
sub_8043FD4: @ 8043FD4 sub_8043FD4: @ 8043FD4
push {lr} push {lr}
ldr r0, _08043FFC @ =gUnknown_2022B4C ldr r0, _08043FFC @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x80 movs r0, 0x80
lsls r0, 5 lsls r0, 5
@@ -3804,14 +3804,14 @@ _08043FF6:
lsls r0, 1 lsls r0, 1
b _08044070 b _08044070
.align 2, 0 .align 2, 0
_08043FFC: .4byte gUnknown_2022B4C _08043FFC: .4byte gBattleTypeFlags
_08044000: _08044000:
movs r0, 0x8 movs r0, 0x8
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
beq _0804406C beq _0804406C
ldr r2, _08044028 @ =gUnknown_823EAC8 ldr r2, _08044028 @ =gTrainers
ldr r0, _0804402C @ =gUnknown_20386AE ldr r0, _0804402C @ =gTrainerBattleOpponent_A
ldrh r1, [r0] ldrh r1, [r0]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -3827,8 +3827,8 @@ _08044000:
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0 .align 2, 0
_08044028: .4byte gUnknown_823EAC8 _08044028: .4byte gTrainers
_0804402C: .4byte gUnknown_20386AE _0804402C: .4byte gTrainerBattleOpponent_A
_08044030: .4byte _08044034 _08044030: .4byte _08044034
.align 2, 0 .align 2, 0
_08044034: _08044034:
@@ -4073,7 +4073,7 @@ _080441EC:
IsPokeSpriteNotFlipped: @ 80441F4 IsPokeSpriteNotFlipped: @ 80441F4
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, _08044208 @ =gUnknown_8254784 ldr r2, _08044208 @ =gBaseStats
lsls r1, r0, 3 lsls r1, r0, 3
subs r1, r0 subs r1, r0
lsls r1, 2 lsls r1, 2
@@ -4082,7 +4082,7 @@ IsPokeSpriteNotFlipped: @ 80441F4
lsrs r0, 7 lsrs r0, 7
bx lr bx lr
.align 2, 0 .align 2, 0
_08044208: .4byte gUnknown_8254784 _08044208: .4byte gBaseStats
thumb_func_end IsPokeSpriteNotFlipped thumb_func_end IsPokeSpriteNotFlipped
thumb_func_start GetMonFlavorRelation thumb_func_start GetMonFlavorRelation
@@ -4260,7 +4260,7 @@ _08044338:
sub_8044348: @ 8044348 sub_8044348: @ 8044348
push {r4,r5,lr} push {r4,r5,lr}
ldr r2, _0804438C @ =gUnknown_2023D6A ldr r2, _0804438C @ =gUnknown_2023D6A
ldr r5, _08044390 @ =gUnknown_2023FE8 ldr r5, _08044390 @ =gBattleStruct
ldr r1, [r5] ldr r1, [r5]
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0xAC adds r0, 0xAC
@@ -4281,7 +4281,7 @@ sub_8044348: @ 8044348
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0804439C bne _0804439C
ldr r1, _08044398 @ =gUnknown_2023BCE ldr r1, _08044398 @ =gBattlerPartyIndexes
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x49 adds r0, 0x49
ldrb r0, [r0] ldrb r0, [r0]
@@ -4292,11 +4292,11 @@ sub_8044348: @ 8044348
b _080443AA b _080443AA
.align 2, 0 .align 2, 0
_0804438C: .4byte gUnknown_2023D6A _0804438C: .4byte gUnknown_2023D6A
_08044390: .4byte gUnknown_2023FE8 _08044390: .4byte gBattleStruct
_08044394: .4byte gUnknown_2022AB8 _08044394: .4byte gUnknown_2022AB8
_08044398: .4byte gUnknown_2023BCE _08044398: .4byte gBattlerPartyIndexes
_0804439C: _0804439C:
ldr r1, _080443E0 @ =gUnknown_2023BCE ldr r1, _080443E0 @ =gBattlerPartyIndexes
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x49 adds r0, 0x49
ldrb r0, [r0] ldrb r0, [r0]
@@ -4313,7 +4313,7 @@ _080443AA:
ldr r1, _080443E8 @ =gUnknown_2024004 ldr r1, _080443E8 @ =gUnknown_2024004
ldrb r0, [r1] ldrb r0, [r1]
strb r0, [r4, 0x2] strb r0, [r4, 0x2]
ldr r2, _080443E0 @ =gUnknown_2023BCE ldr r2, _080443E0 @ =gBattlerPartyIndexes
ldrb r0, [r1] ldrb r0, [r1]
lsls r0, 1 lsls r0, 1
adds r0, r2 adds r0, r2
@@ -4329,7 +4329,7 @@ _080443AA:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080443E0: .4byte gUnknown_2023BCE _080443E0: .4byte gBattlerPartyIndexes
_080443E4: .4byte gUnknown_2022AC8 _080443E4: .4byte gUnknown_2022AC8
_080443E8: .4byte gUnknown_2024004 _080443E8: .4byte gUnknown_2024004
_080443EC: .4byte gUnknown_83FCA2C _080443EC: .4byte gUnknown_83FCA2C
@@ -4339,7 +4339,7 @@ _080443F0: .4byte gStringVar4
thumb_func_start SetWildMonHeldItem thumb_func_start SetWildMonHeldItem
SetWildMonHeldItem: @ 80443F4 SetWildMonHeldItem: @ 80443F4
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, _0804444C @ =gUnknown_2022B4C ldr r0, _0804444C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
ldr r1, _08044450 @ =0x00012008 ldr r1, _08044450 @ =0x00012008
ands r0, r1 ands r0, r1
@@ -4352,14 +4352,14 @@ SetWildMonHeldItem: @ 80443F4
bl __umodsi3 bl __umodsi3
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
ldr r4, _08044454 @ =gUnknown_202402C ldr r4, _08044454 @ =gEnemyParty
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
movs r2, 0 movs r2, 0
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r2, _08044458 @ =gUnknown_8254784 ldr r2, _08044458 @ =gBaseStats
lsls r1, r0, 3 lsls r1, r0, 3
subs r1, r0 subs r1, r0
lsls r3, r1, 2 lsls r3, r1, 2
@@ -4380,10 +4380,10 @@ _0804443E:
bl sub_804037C bl sub_804037C
b _08044468 b _08044468
.align 2, 0 .align 2, 0
_0804444C: .4byte gUnknown_2022B4C _0804444C: .4byte gBattleTypeFlags
_08044450: .4byte 0x00012008 _08044450: .4byte 0x00012008
_08044454: .4byte gUnknown_202402C _08044454: .4byte gEnemyParty
_08044458: .4byte gUnknown_8254784 _08044458: .4byte gBaseStats
_0804445C: _0804445C:
adds r2, 0xE adds r2, 0xE
adds r2, r3, r2 adds r2, r3, r2
@@ -4479,7 +4479,7 @@ _080444FE:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _08044548 @ =gUnknown_2024284 ldr r0, _08044548 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x5 movs r1, 0x5
@@ -4511,7 +4511,7 @@ _08044538:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08044548: .4byte gUnknown_2024284 _08044548: .4byte gPlayerParty
thumb_func_end sub_80444F8 thumb_func_end sub_80444F8
thumb_func_start sub_804454C thumb_func_start sub_804454C
@@ -4551,7 +4551,7 @@ _08044578:
.4byte _08044664 .4byte _08044664
.4byte _080445F4 .4byte _080445F4
_08044590: _08044590:
ldr r0, _080445B0 @ =gUnknown_2022B4C ldr r0, _080445B0 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -4567,11 +4567,11 @@ _08044590:
beq _08044632 beq _08044632
b _0804461A b _0804461A
.align 2, 0 .align 2, 0
_080445B0: .4byte gUnknown_2022B4C _080445B0: .4byte gBattleTypeFlags
_080445B4: .4byte gMain _080445B4: .4byte gMain
_080445B8: .4byte 0x00000439 _080445B8: .4byte 0x00000439
_080445BC: _080445BC:
ldr r0, _080445E8 @ =gUnknown_2022B4C ldr r0, _080445E8 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -4593,11 +4593,11 @@ _080445BC:
beq _08044664 beq _08044664
b _08044632 b _08044632
.align 2, 0 .align 2, 0
_080445E8: .4byte gUnknown_2022B4C _080445E8: .4byte gBattleTypeFlags
_080445EC: .4byte gMain _080445EC: .4byte gMain
_080445F0: .4byte 0x00000439 _080445F0: .4byte 0x00000439
_080445F4: _080445F4:
ldr r0, _08044638 @ =gUnknown_2022B4C ldr r0, _08044638 @ =gBattleTypeFlags
ldr r2, [r0] ldr r2, [r0]
movs r3, 0x2 movs r3, 0x2
adds r0, r2, 0 adds r0, r2, 0
@@ -4632,7 +4632,7 @@ _08044632:
movs r0, 0 movs r0, 0
b _08044666 b _08044666
.align 2, 0 .align 2, 0
_08044638: .4byte gUnknown_2022B4C _08044638: .4byte gBattleTypeFlags
_0804463C: .4byte gMain _0804463C: .4byte gMain
_08044640: .4byte 0x00000439 _08044640: .4byte 0x00000439
_08044644: .4byte gUnknown_202273C _08044644: .4byte gUnknown_202273C
@@ -4667,7 +4667,7 @@ GetDeoxysStat: @ 8044674
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r6, r1, 0 adds r6, r1, 0
ldr r0, _0804469C @ =gUnknown_2022B4C ldr r0, _0804469C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x20 movs r1, 0x20
ands r0, r1 ands r0, r1
@@ -4685,7 +4685,7 @@ _08044698:
movs r0, 0 movs r0, 0
b _080446FE b _080446FE
.align 2, 0 .align 2, 0
_0804469C: .4byte gUnknown_2022B4C _0804469C: .4byte gBattleTypeFlags
_080446A0: _080446A0:
adds r1, r6, 0 adds r1, r6, 0
adds r1, 0x27 adds r1, 0x27
@@ -4747,7 +4747,7 @@ _0804470E:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _080447A8 @ =gUnknown_2024284 ldr r0, _080447A8 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -4811,7 +4811,7 @@ _08044798:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080447A8: .4byte gUnknown_2024284 _080447A8: .4byte gPlayerParty
thumb_func_end sub_8044708 thumb_func_end sub_8044708
thumb_func_start sub_80447AC thumb_func_start sub_80447AC
@@ -4896,7 +4896,7 @@ sub_8044838: @ 8044838
ldr r0, _08044890 @ =gUnknown_20370C4 ldr r0, _08044890 @ =gUnknown_20370C4
ldrh r6, [r0] ldrh r6, [r0]
bl ZeroEnemyPartyMons bl ZeroEnemyPartyMons
ldr r7, _08044894 @ =gUnknown_202402C ldr r7, _08044894 @ =gEnemyParty
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r0, 0 movs r0, 0
@@ -4929,7 +4929,7 @@ _08044880:
_08044888: .4byte gUnknown_20370C0 _08044888: .4byte gUnknown_20370C0
_0804488C: .4byte gUnknown_20370C2 _0804488C: .4byte gUnknown_20370C2
_08044890: .4byte gUnknown_20370C4 _08044890: .4byte gUnknown_20370C4
_08044894: .4byte gUnknown_202402C _08044894: .4byte gEnemyParty
thumb_func_end sub_8044838 thumb_func_end sub_8044838
thumb_func_start sub_8044898 thumb_func_start sub_8044898
@@ -4989,7 +4989,7 @@ sub_80448F8: @ 80448F8
adds r4, r0, 0 adds r4, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r2, r1, 24 lsrs r2, r1, 24
ldr r0, _0804493C @ =gUnknown_2022B4C ldr r0, _0804493C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
lsls r1, 8 lsls r1, 8
@@ -5015,7 +5015,7 @@ sub_80448F8: @ 80448F8
movs r0, 0x1 movs r0, 0x1
b _08044946 b _08044946
.align 2, 0 .align 2, 0
_0804493C: .4byte gUnknown_2022B4C _0804493C: .4byte gBattleTypeFlags
_08044940: .4byte gUnknown_841D148 _08044940: .4byte gUnknown_841D148
_08044944: _08044944:
movs r0, 0 movs r0, 0
+72 -72
View File
@@ -115,7 +115,7 @@ _0804147C:
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
beq _0804151C beq _0804151C
ldr r0, _080414E8 @ =gUnknown_2023BC4 ldr r0, _080414E8 @ =gActiveBattler
strb r2, [r0] strb r2, [r0]
ldrb r0, [r0] ldrb r0, [r0]
bl GetBankSide bl GetBankSide
@@ -131,7 +131,7 @@ _0804147C:
ldrb r0, [r0] ldrb r0, [r0]
cmp r1, r0 cmp r1, r0
bge _08041528 bge _08041528
ldr r2, _080414F0 @ =gUnknown_2023BCE ldr r2, _080414F0 @ =gBattlerPartyIndexes
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r2 adds r0, r2
ldrh r3, [r0] ldrh r3, [r0]
@@ -149,9 +149,9 @@ _080414D8: .4byte gUnknown_2023D6F
_080414DC: .4byte gUnknown_2024004 _080414DC: .4byte gUnknown_2024004
_080414E0: .4byte gMain _080414E0: .4byte gMain
_080414E4: .4byte 0x00000439 _080414E4: .4byte 0x00000439
_080414E8: .4byte gUnknown_2023BC4 _080414E8: .4byte gActiveBattler
_080414EC: .4byte gUnknown_2023BCC _080414EC: .4byte gUnknown_2023BCC
_080414F0: .4byte gUnknown_2023BCE _080414F0: .4byte gBattlerPartyIndexes
_080414F4: _080414F4:
ldr r1, [sp, 0x18] ldr r1, [sp, 0x18]
adds r1, 0x2 adds r1, 0x2
@@ -174,7 +174,7 @@ _080414F4:
.align 2, 0 .align 2, 0
_08041518: .4byte gUnknown_2023BCC _08041518: .4byte gUnknown_2023BCC
_0804151C: _0804151C:
ldr r0, _08041544 @ =gUnknown_2023BC4 ldr r0, _08041544 @ =gActiveBattler
strb r1, [r0] strb r1, [r0]
movs r3, 0x4 movs r3, 0x4
str r3, [sp, 0x34] str r3, [sp, 0x34]
@@ -196,7 +196,7 @@ _08041528:
beq _08041552 beq _08041552
b _080415A8 b _080415A8
.align 2, 0 .align 2, 0
_08041544: .4byte gUnknown_2023BC4 _08041544: .4byte gActiveBattler
_08041548: .4byte gUnknown_82528BC _08041548: .4byte gUnknown_82528BC
_0804154C: _0804154C:
ldr r5, [sp, 0x8] ldr r5, [sp, 0x8]
@@ -211,7 +211,7 @@ _08041552:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _08041584 beq _08041584
ldr r0, _0804157C @ =gUnknown_2023BC4 ldr r0, _0804157C @ =gActiveBattler
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
subs r0, r1 subs r0, r1
@@ -222,7 +222,7 @@ _08041552:
.align 2, 0 .align 2, 0
_08041574: .4byte gMain _08041574: .4byte gMain
_08041578: .4byte 0x00000439 _08041578: .4byte 0x00000439
_0804157C: .4byte gUnknown_2023BC4 _0804157C: .4byte gActiveBattler
_08041580: .4byte gUnknown_2023F5C _08041580: .4byte gUnknown_2023F5C
_08041584: _08041584:
ldr r0, _08041590 @ =gSaveBlock1Ptr ldr r0, _08041590 @ =gSaveBlock1Ptr
@@ -291,7 +291,7 @@ _080415E4:
ldr r2, [sp, 0x34] ldr r2, [sp, 0x34]
cmp r2, 0x4 cmp r2, 0x4
beq _0804162C beq _0804162C
ldr r1, _080416A4 @ =gUnknown_2023BE4 ldr r1, _080416A4 @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
muls r0, r2 muls r0, r2
adds r1, 0x50 adds r1, 0x50
@@ -313,8 +313,8 @@ _0804162C:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0804165A beq _0804165A
ldr r1, _080416A4 @ =gUnknown_2023BE4 ldr r1, _080416A4 @ =gBattleMons
ldr r0, _080416AC @ =gUnknown_2023BC4 ldr r0, _080416AC @ =gActiveBattler
ldrb r2, [r0] ldrb r2, [r0]
movs r0, 0x58 movs r0, 0x58
muls r0, r2 muls r0, r2
@@ -339,8 +339,8 @@ _0804165A:
bne _08041668 bne _08041668
bl _08042384 bl _08042384
_08041668: _08041668:
ldr r6, _080416A4 @ =gUnknown_2023BE4 ldr r6, _080416A4 @ =gBattleMons
ldr r5, _080416AC @ =gUnknown_2023BC4 ldr r5, _080416AC @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x58 movs r4, 0x58
muls r0, r4 muls r0, r4
@@ -369,9 +369,9 @@ _08041696:
.align 2, 0 .align 2, 0
_0804169C: .4byte gMain _0804169C: .4byte gMain
_080416A0: .4byte 0x00000439 _080416A0: .4byte 0x00000439
_080416A4: .4byte gUnknown_2023BE4 _080416A4: .4byte gBattleMons
_080416A8: .4byte 0xfff0ffff _080416A8: .4byte 0xfff0ffff
_080416AC: .4byte gUnknown_2023BC4 _080416AC: .4byte gActiveBattler
_080416B0: _080416B0:
ldr r0, [sp, 0x20] ldr r0, [sp, 0x20]
ldr r1, [sp, 0x18] ldr r1, [sp, 0x18]
@@ -383,8 +383,8 @@ _080416B0:
adds r6, r2, 0 adds r6, r2, 0
cmp r3, 0 cmp r3, 0
beq _080416F6 beq _080416F6
ldr r7, _0804173C @ =gUnknown_2023BE4 ldr r7, _0804173C @ =gBattleMons
ldr r5, _08041740 @ =gUnknown_2023BC4 ldr r5, _08041740 @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x58 movs r4, 0x58
muls r0, r4 muls r0, r4
@@ -417,8 +417,8 @@ _080416F6:
bne _08041704 bne _08041704
bl _08042384 bl _08042384
_08041704: _08041704:
ldr r6, _0804173C @ =gUnknown_2023BE4 ldr r6, _0804173C @ =gBattleMons
ldr r5, _08041740 @ =gUnknown_2023BC4 ldr r5, _08041740 @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x58 movs r4, 0x58
muls r0, r4 muls r0, r4
@@ -446,8 +446,8 @@ _08041734:
str r3, [sp, 0x1C] str r3, [sp, 0x1C]
bl _08042384 bl _08042384
.align 2, 0 .align 2, 0
_0804173C: .4byte gUnknown_2023BE4 _0804173C: .4byte gBattleMons
_08041740: .4byte gUnknown_2023BC4 _08041740: .4byte gActiveBattler
_08041744: _08041744:
ldr r4, [sp, 0x20] ldr r4, [sp, 0x20]
ldr r5, [sp, 0x18] ldr r5, [sp, 0x18]
@@ -459,8 +459,8 @@ _08041744:
adds r6, r2, 0 adds r6, r2, 0
cmp r3, 0 cmp r3, 0
beq _0804178A beq _0804178A
ldr r7, _080417D0 @ =gUnknown_2023BE4 ldr r7, _080417D0 @ =gBattleMons
ldr r5, _080417D4 @ =gUnknown_2023BC4 ldr r5, _080417D4 @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x58 movs r4, 0x58
muls r0, r4 muls r0, r4
@@ -493,8 +493,8 @@ _0804178A:
bne _08041798 bne _08041798
bl _08042384 bl _08042384
_08041798: _08041798:
ldr r6, _080417D0 @ =gUnknown_2023BE4 ldr r6, _080417D0 @ =gBattleMons
ldr r5, _080417D4 @ =gUnknown_2023BC4 ldr r5, _080417D4 @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
movs r4, 0x58 movs r4, 0x58
muls r0, r4 muls r0, r4
@@ -522,8 +522,8 @@ _080417C8:
str r1, [sp, 0x1C] str r1, [sp, 0x1C]
bl _08042384 bl _08042384
.align 2, 0 .align 2, 0
_080417D0: .4byte gUnknown_2023BE4 _080417D0: .4byte gBattleMons
_080417D4: .4byte gUnknown_2023BC4 _080417D4: .4byte gActiveBattler
_080417D8: _080417D8:
ldr r3, [sp, 0x20] ldr r3, [sp, 0x20]
ldr r4, [sp, 0x18] ldr r4, [sp, 0x18]
@@ -535,7 +535,7 @@ _080417D8:
cmp r0, 0 cmp r0, 0
beq _08041820 beq _08041820
ldr r5, _08041994 @ =gUnknown_2023DE4 ldr r5, _08041994 @ =gUnknown_2023DE4
ldr r4, _08041998 @ =gUnknown_2023BC4 ldr r4, _08041998 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -583,7 +583,7 @@ _08041820:
bl GetMonData bl GetMonData
adds r4, 0x1 adds r4, 0x1
lsls r4, 2 lsls r4, 2
ldr r2, _080419A0 @ =gUnknown_8254784 ldr r2, _080419A0 @ =gBaseStats
lsls r1, r0, 3 lsls r1, r0, 3
subs r1, r0 subs r1, r0
lsls r1, 2 lsls r1, 2
@@ -621,7 +621,7 @@ _08041882:
ldr r1, [sp, 0x34] ldr r1, [sp, 0x34]
cmp r1, 0x4 cmp r1, 0x4
beq _080418BA beq _080418BA
ldr r1, _080419A4 @ =gUnknown_2023BE4 ldr r1, _080419A4 @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
ldr r3, [sp, 0x34] ldr r3, [sp, 0x34]
adds r2, r3, 0 adds r2, r3, 0
@@ -722,7 +722,7 @@ _08041960:
bne _0804196A bne _0804196A
bl _08042384 bl _08042384
_0804196A: _0804196A:
ldr r1, _080419A4 @ =gUnknown_2023BE4 ldr r1, _080419A4 @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
muls r0, r4 muls r0, r4
adds r1, 0x50 adds r1, 0x50
@@ -744,10 +744,10 @@ _0804198A:
bl _08042384 bl _08042384
.align 2, 0 .align 2, 0
_08041994: .4byte gUnknown_2023DE4 _08041994: .4byte gUnknown_2023DE4
_08041998: .4byte gUnknown_2023BC4 _08041998: .4byte gActiveBattler
_0804199C: .4byte gUnknown_8253AE4 _0804199C: .4byte gUnknown_8253AE4
_080419A0: .4byte gUnknown_8254784 _080419A0: .4byte gBaseStats
_080419A4: .4byte gUnknown_2023BE4 _080419A4: .4byte gBattleMons
_080419A8: .4byte 0xf7ffffff _080419A8: .4byte 0xf7ffffff
_080419AC: .4byte 0x00000f88 _080419AC: .4byte 0x00000f88
_080419B0: .4byte gMain _080419B0: .4byte gMain
@@ -988,8 +988,8 @@ _08041B90:
ldr r2, [sp, 0x34] ldr r2, [sp, 0x34]
cmp r2, 0x4 cmp r2, 0x4
beq _08041BF0 beq _08041BF0
ldr r2, _08041BE0 @ =gUnknown_2023D70 ldr r2, _08041BE0 @ =gAbsentBattlerFlags
ldr r1, _08041BE4 @ =gUnknown_825E45C ldr r1, _08041BE4 @ =gBitTable
ldr r3, [sp, 0x34] ldr r3, [sp, 0x34]
lsls r0, r3, 2 lsls r0, r3, 2
adds r0, r1 adds r0, r1
@@ -997,7 +997,7 @@ _08041B90:
ldrb r0, [r2] ldrb r0, [r2]
bics r0, r1 bics r0, r1
strb r0, [r2] strb r0, [r2]
ldr r1, _08041BE8 @ =gUnknown_2023BCE ldr r1, _08041BE8 @ =gBattlerPartyIndexes
lsls r0, r3, 1 lsls r0, r3, 1
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -1007,20 +1007,20 @@ _08041B90:
lsrs r1, 24 lsrs r1, 24
ldr r0, [sp, 0x34] ldr r0, [sp, 0x34]
bl CopyPlayerPartyMonToBattleData bl CopyPlayerPartyMonToBattleData
ldr r0, _08041BEC @ =gUnknown_2023BC4 ldr r0, _08041BEC @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
b _08041C08 b _08041C08
.align 2, 0 .align 2, 0
_08041BD8: .4byte gMain _08041BD8: .4byte gMain
_08041BDC: .4byte 0x00000439 _08041BDC: .4byte 0x00000439
_08041BE0: .4byte gUnknown_2023D70 _08041BE0: .4byte gAbsentBattlerFlags
_08041BE4: .4byte gUnknown_825E45C _08041BE4: .4byte gBitTable
_08041BE8: .4byte gUnknown_2023BCE _08041BE8: .4byte gBattlerPartyIndexes
_08041BEC: .4byte gUnknown_2023BC4 _08041BEC: .4byte gActiveBattler
_08041BF0: _08041BF0:
ldr r3, _08041C20 @ =gUnknown_2023D70 ldr r3, _08041C20 @ =gAbsentBattlerFlags
ldr r1, _08041C24 @ =gUnknown_825E45C ldr r1, _08041C24 @ =gBitTable
ldr r2, _08041C28 @ =gUnknown_2023BC4 ldr r2, _08041C28 @ =gActiveBattler
ldrb r0, [r2] ldrb r0, [r2]
eors r0, r4 eors r0, r4
lsls r0, 2 lsls r0, 2
@@ -1035,7 +1035,7 @@ _08041C08:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08041C46 bne _08041C46
ldr r1, _08041C2C @ =gUnknown_3004F90 ldr r1, _08041C2C @ =gBattleResults
ldrb r0, [r1, 0x4] ldrb r0, [r1, 0x4]
cmp r0, 0xFE cmp r0, 0xFE
bhi _08041C46 bhi _08041C46
@@ -1043,10 +1043,10 @@ _08041C08:
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
b _08041C46 b _08041C46
.align 2, 0 .align 2, 0
_08041C20: .4byte gUnknown_2023D70 _08041C20: .4byte gAbsentBattlerFlags
_08041C24: .4byte gUnknown_825E45C _08041C24: .4byte gBitTable
_08041C28: .4byte gUnknown_2023BC4 _08041C28: .4byte gActiveBattler
_08041C2C: .4byte gUnknown_3004F90 _08041C2C: .4byte gBattleResults
_08041C30: _08041C30:
mov r0, r8 mov r0, r8
movs r1, 0x39 movs r1, 0x39
@@ -1103,7 +1103,7 @@ _08041C88:
movs r0, 0x1 movs r0, 0x1
b _08041CA4 b _08041CA4
_08041C9E: _08041C9E:
ldr r0, _08041D60 @ =gUnknown_2023FC4 ldr r0, _08041D60 @ =gBattleScripting
adds r0, 0x23 adds r0, 0x23
ldrb r0, [r0] ldrb r0, [r0]
_08041CA4: _08041CA4:
@@ -1158,7 +1158,7 @@ _08041CF2:
ldr r2, [sp, 0x34] ldr r2, [sp, 0x34]
cmp r2, 0x4 cmp r2, 0x4
beq _08041D80 beq _08041D80
ldr r1, _08041D6C @ =gUnknown_2023BE4 ldr r1, _08041D6C @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
muls r0, r2 muls r0, r2
adds r0, r1 adds r0, r1
@@ -1169,13 +1169,13 @@ _08041CF2:
ands r0, r3 ands r0, r3
cmp r0, 0 cmp r0, 0
bne _08041D80 bne _08041D80
ldr r4, _08041D70 @ =gUnknown_2023BC4 ldr r4, _08041D70 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08041D80 bne _08041D80
ldr r1, _08041D74 @ =gUnknown_3004F90 ldr r1, _08041D74 @ =gBattleResults
ldrb r0, [r1, 0x3] ldrb r0, [r1, 0x3]
cmp r0, 0xFE cmp r0, 0xFE
bhi _08041D42 bhi _08041D42
@@ -1195,14 +1195,14 @@ _08041D42:
strb r5, [r4] strb r5, [r4]
b _08041D80 b _08041D80
.align 2, 0 .align 2, 0
_08041D60: .4byte gUnknown_2023FC4 _08041D60: .4byte gBattleScripting
_08041D64: .4byte gMain _08041D64: .4byte gMain
_08041D68: .4byte 0x00000439 _08041D68: .4byte 0x00000439
_08041D6C: .4byte gUnknown_2023BE4 _08041D6C: .4byte gBattleMons
_08041D70: .4byte gUnknown_2023BC4 _08041D70: .4byte gActiveBattler
_08041D74: .4byte gUnknown_3004F90 _08041D74: .4byte gBattleResults
_08041D78: _08041D78:
ldr r1, _08041D90 @ =gUnknown_2023D50 ldr r1, _08041D90 @ =gBattleMoveDamage
ldr r0, [sp] ldr r0, [sp]
negs r0, r0 negs r0, r0
str r0, [r1] str r0, [r1]
@@ -1216,7 +1216,7 @@ _08041D84:
mov r10, r2 mov r10, r2
b _08042042 b _08042042
.align 2, 0 .align 2, 0
_08041D90: .4byte gUnknown_2023D50 _08041D90: .4byte gBattleMoveDamage
_08041D94: _08041D94:
movs r7, 0x2 movs r7, 0x2
mov r0, r10 mov r0, r10
@@ -1328,7 +1328,7 @@ _08041E60:
ldr r0, [sp, 0x34] ldr r0, [sp, 0x34]
cmp r0, 0x4 cmp r0, 0x4
beq _08041EC6 beq _08041EC6
ldr r4, _08041EE4 @ =gUnknown_2023BE4 ldr r4, _08041EE4 @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
ldr r1, [sp, 0x34] ldr r1, [sp, 0x34]
adds r3, r1, 0 adds r3, r1, 0
@@ -1342,7 +1342,7 @@ _08041E60:
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
bne _08041EC6 bne _08041EC6
ldr r1, _08041EE8 @ =gUnknown_2023E0C ldr r1, _08041EE8 @ =gDisableStructs
ldr r2, [sp, 0x34] ldr r2, [sp, 0x34]
lsls r0, r2, 3 lsls r0, r2, 3
subs r0, r2 subs r0, r2
@@ -1350,7 +1350,7 @@ _08041E60:
adds r0, r1 adds r0, r1
ldrb r1, [r0, 0x18] ldrb r1, [r0, 0x18]
lsrs r1, 4 lsrs r1, 4
ldr r2, _08041EEC @ =gUnknown_825E45C ldr r2, _08041EEC @ =gBitTable
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r2 adds r0, r2
ldr r0, [r0] ldr r0, [r0]
@@ -1381,9 +1381,9 @@ _08041ED6:
.align 2, 0 .align 2, 0
_08041EDC: .4byte gMain _08041EDC: .4byte gMain
_08041EE0: .4byte 0x00000439 _08041EE0: .4byte 0x00000439
_08041EE4: .4byte gUnknown_2023BE4 _08041EE4: .4byte gBattleMons
_08041EE8: .4byte gUnknown_2023E0C _08041EE8: .4byte gDisableStructs
_08041EEC: .4byte gUnknown_825E45C _08041EEC: .4byte gBitTable
_08041EF0: _08041EF0:
ldr r6, [sp, 0x10] ldr r6, [sp, 0x10]
adds r6, 0x11 adds r6, 0x11
@@ -1486,7 +1486,7 @@ _08041FAC:
ldr r2, [sp, 0x34] ldr r2, [sp, 0x34]
cmp r2, 0x4 cmp r2, 0x4
beq _08042010 beq _08042010
ldr r4, _08042020 @ =gUnknown_2023BE4 ldr r4, _08042020 @ =gBattleMons
movs r0, 0x58 movs r0, 0x58
adds r3, r2, 0 adds r3, r2, 0
muls r3, r0 muls r3, r0
@@ -1499,14 +1499,14 @@ _08041FAC:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _08042010 bne _08042010
ldr r1, _08042024 @ =gUnknown_2023E0C ldr r1, _08042024 @ =gDisableStructs
lsls r0, r2, 3 lsls r0, r2, 3
subs r0, r2 subs r0, r2
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
ldrb r1, [r0, 0x18] ldrb r1, [r0, 0x18]
lsrs r1, 4 lsrs r1, 4
ldr r2, _08042028 @ =gUnknown_825E45C ldr r2, _08042028 @ =gBitTable
ldr r5, [sp, 0x10] ldr r5, [sp, 0x10]
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r2 adds r0, r2
@@ -1527,9 +1527,9 @@ _08042010:
.align 2, 0 .align 2, 0
_08042018: .4byte gMain _08042018: .4byte gMain
_0804201C: .4byte 0x00000439 _0804201C: .4byte 0x00000439
_08042020: .4byte gUnknown_2023BE4 _08042020: .4byte gBattleMons
_08042024: .4byte gUnknown_2023E0C _08042024: .4byte gDisableStructs
_08042028: .4byte gUnknown_825E45C _08042028: .4byte gBitTable
_0804202C: _0804202C:
mov r0, r8 mov r0, r8
movs r1, 0x2 movs r1, 0x2
+4 -4
View File
@@ -223,7 +223,7 @@ _080A0848:
ldrh r1, [r1] ldrh r1, [r1]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080A0870 @ =gUnknown_2024284 ldr r0, _080A0870 @ =gPlayerParty
adds r5, r1, r0 adds r5, r1, r0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2D movs r1, 0x2D
@@ -239,7 +239,7 @@ _080A086A:
movs r0, 0x1 movs r0, 0x1
b _080A08C4 b _080A08C4
.align 2, 0 .align 2, 0
_080A0870: .4byte gUnknown_2024284 _080A0870: .4byte gPlayerParty
_080A0874: _080A0874:
mov r4, sp mov r4, sp
adds r0, r5, 0 adds r0, r5, 0
@@ -437,7 +437,7 @@ _080A09E6:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _080A0A40 @ =gUnknown_2024284 ldr r0, _080A0A40 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -475,7 +475,7 @@ _080A0A28:
_080A0A34: .4byte gUnknown_83E27AC _080A0A34: .4byte gUnknown_83E27AC
_080A0A38: .4byte gSaveBlock1Ptr _080A0A38: .4byte gSaveBlock1Ptr
_080A0A3C: .4byte 0x0000309c _080A0A3C: .4byte 0x0000309c
_080A0A40: .4byte gUnknown_2024284 _080A0A40: .4byte gPlayerParty
_080A0A44: .4byte 0x0000083b _080A0A44: .4byte 0x0000083b
thumb_func_end GiveGiftRibbonToParty thumb_func_end GiveGiftRibbonToParty
+2 -2
View File
@@ -126,7 +126,7 @@ _0811C628:
movs r0, 0x64 movs r0, 0x64
mov r4, r8 mov r4, r8
muls r4, r0 muls r4, r0
ldr r0, _0811C6E0 @ =gUnknown_2024284 ldr r0, _0811C6E0 @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r7, 0 adds r0, r7, 0
adds r0, 0x92 adds r0, 0x92
@@ -208,7 +208,7 @@ _0811C6D2:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0811C6E0: .4byte gUnknown_2024284 _0811C6E0: .4byte gPlayerParty
_0811C6E4: .4byte gUnknown_8247094 _0811C6E4: .4byte gUnknown_8247094
thumb_func_end sub_811C5D4 thumb_func_end sub_811C5D4
+51 -51
View File
@@ -1058,7 +1058,7 @@ _0808C142:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _0808C180 @ =gUnknown_2024284 ldr r0, _0808C180 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -1085,7 +1085,7 @@ _0808C16A:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0808C180: .4byte gUnknown_2024284 _0808C180: .4byte gPlayerParty
thumb_func_end CountPartyNonEggMons thumb_func_end CountPartyNonEggMons
thumb_func_start CountPartyAliveNonEggMonsExcept thumb_func_start CountPartyAliveNonEggMonsExcept
@@ -1101,7 +1101,7 @@ _0808C18E:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _0808C1DC @ =gUnknown_2024284 ldr r0, _0808C1DC @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -1133,7 +1133,7 @@ _0808C1C6:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0808C1DC: .4byte gUnknown_2024284 _0808C1DC: .4byte gPlayerParty
thumb_func_end CountPartyAliveNonEggMonsExcept thumb_func_end CountPartyAliveNonEggMonsExcept
thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
@@ -1158,7 +1158,7 @@ CountPartyMons: @ 808C1F8
_0808C1FE: _0808C1FE:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _0808C22C @ =gUnknown_2024284 ldr r1, _0808C22C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -1179,7 +1179,7 @@ _0808C216:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0808C22C: .4byte gUnknown_2024284 _0808C22C: .4byte gPlayerParty
thumb_func_end CountPartyMons thumb_func_end CountPartyMons
thumb_func_start StringCopyAndFillWithSpaces thumb_func_start StringCopyAndFillWithSpaces
@@ -6624,7 +6624,7 @@ sub_808EF0C: @ 808EF0C
beq _0808EF4C beq _0808EF4C
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0808EF48 @ =gUnknown_2024284 ldr r1, _0808EF48 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xC movs r1, 0xC
mov r2, sp mov r2, sp
@@ -6633,7 +6633,7 @@ sub_808EF0C: @ 808EF0C
.align 2, 0 .align 2, 0
_0808EF40: .4byte gUnknown_203AD30 _0808EF40: .4byte gUnknown_203AD30
_0808EF44: .4byte gUnknown_20397B4 _0808EF44: .4byte gUnknown_20397B4
_0808EF48: .4byte gUnknown_2024284 _0808EF48: .4byte gPlayerParty
_0808EF4C: _0808EF4C:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0xC movs r1, 0xC
@@ -7968,7 +7968,7 @@ sub_808F9FC: @ 808F9FC
_0808FA00: _0808FA00:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _0808FA2C @ =gUnknown_2024284 ldr r1, _0808FA2C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -7986,7 +7986,7 @@ _0808FA00:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0808FA2C: .4byte gUnknown_2024284 _0808FA2C: .4byte gPlayerParty
thumb_func_end sub_808F9FC thumb_func_end sub_808F9FC
thumb_func_start sub_808FA30 thumb_func_start sub_808FA30
@@ -8528,7 +8528,7 @@ sub_808FE54: @ 808FE54
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0808FE98 @ =gUnknown_2024284 ldr r1, _0808FE98 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
bl GetMonData bl GetMonData
@@ -8536,7 +8536,7 @@ sub_808FE54: @ 808FE54
.align 2, 0 .align 2, 0
_0808FE90: .4byte gUnknown_20397B0 _0808FE90: .4byte gUnknown_20397B0
_0808FE94: .4byte gUnknown_20397B4 _0808FE94: .4byte gUnknown_20397B4
_0808FE98: .4byte gUnknown_2024284 _0808FE98: .4byte gPlayerParty
_0808FE9C: _0808FE9C:
bl StorageGetCurrentBox bl StorageGetCurrentBox
lsls r0, 24 lsls r0, 24
@@ -9854,7 +9854,7 @@ sub_809088C: @ 809088C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
ldr r4, _0809092C @ =gUnknown_2024284 ldr r4, _0809092C @ =gPlayerParty
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
bl GetMonData bl GetMonData
@@ -9883,7 +9883,7 @@ _080908D2:
movs r0, 0x64 movs r0, 0x64
adds r1, r6, 0 adds r1, r6, 0
muls r1, r0 muls r1, r0
ldr r0, _0809092C @ =gUnknown_2024284 ldr r0, _0809092C @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -9923,7 +9923,7 @@ _080908D2:
lsrs r7, r0, 16 lsrs r7, r0, 16
b _08090946 b _08090946
.align 2, 0 .align 2, 0
_0809092C: .4byte gUnknown_2024284 _0809092C: .4byte gPlayerParty
_08090930: .4byte gUnknown_20397B0 _08090930: .4byte gUnknown_20397B0
_08090934: .4byte 0x00000a6c _08090934: .4byte 0x00000a6c
_08090938: _08090938:
@@ -9988,7 +9988,7 @@ _08090998:
beq _080909D0 beq _080909D0
movs r0, 0x64 movs r0, 0x64
muls r0, r6 muls r0, r6
ldr r1, _080909F0 @ =gUnknown_2024284 ldr r1, _080909F0 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xC movs r1, 0xC
bl GetMonData bl GetMonData
@@ -10022,7 +10022,7 @@ _080909DA:
.align 2, 0 .align 2, 0
_080909E8: .4byte gUnknown_20397B0 _080909E8: .4byte gUnknown_20397B0
_080909EC: .4byte 0x00000a6c _080909EC: .4byte 0x00000a6c
_080909F0: .4byte gUnknown_2024284 _080909F0: .4byte gPlayerParty
thumb_func_end sub_809088C thumb_func_end sub_809088C
thumb_func_start sub_80909F4 thumb_func_start sub_80909F4
@@ -13489,7 +13489,7 @@ sub_8092458: @ 8092458
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08092488 @ =gUnknown_2024284 ldr r1, _08092488 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -13497,7 +13497,7 @@ sub_8092458: @ 8092458
.align 2, 0 .align 2, 0
_08092480: .4byte gUnknown_2039820 _08092480: .4byte gUnknown_2039820
_08092484: .4byte gUnknown_2039821 _08092484: .4byte gUnknown_2039821
_08092488: .4byte gUnknown_2024284 _08092488: .4byte gPlayerParty
_0809248C: _0809248C:
ldr r0, _0809249C @ =gUnknown_2039821 ldr r0, _0809249C @ =gUnknown_2039821
ldrb r0, [r0] ldrb r0, [r0]
@@ -14922,7 +14922,7 @@ sub_8092F60: @ 8092F60
ldr r0, [r0] ldr r0, [r0]
ldr r1, _08092F90 @ =0x000020a0 ldr r1, _08092F90 @ =0x000020a0
adds r0, r1 adds r0, r1
ldr r3, _08092F94 @ =gUnknown_2024284 ldr r3, _08092F94 @ =gPlayerParty
ldr r1, _08092F98 @ =gUnknown_2039821 ldr r1, _08092F98 @ =gUnknown_2039821
movs r2, 0 movs r2, 0
ldrsb r2, [r1, r2] ldrsb r2, [r1, r2]
@@ -14935,7 +14935,7 @@ sub_8092F60: @ 8092F60
.align 2, 0 .align 2, 0
_08092F8C: .4byte gUnknown_20397B0 _08092F8C: .4byte gUnknown_20397B0
_08092F90: .4byte 0x000020a0 _08092F90: .4byte 0x000020a0
_08092F94: .4byte gUnknown_2024284 _08092F94: .4byte gPlayerParty
_08092F98: .4byte gUnknown_2039821 _08092F98: .4byte gUnknown_2039821
_08092F9C: _08092F9C:
ldr r0, _08092FC4 @ =gUnknown_20397B0 ldr r0, _08092FC4 @ =gUnknown_20397B0
@@ -14972,7 +14972,7 @@ diegohint2: @ 8092FD4
lsrs r7, r1, 24 lsrs r7, r1, 24
cmp r6, 0xE cmp r6, 0xE
bne _08093008 bne _08093008
ldr r1, _08092FFC @ =gUnknown_2024284 ldr r1, _08092FFC @ =gPlayerParty
movs r0, 0x64 movs r0, 0x64
muls r0, r7 muls r0, r7
adds r0, r1 adds r0, r1
@@ -14984,7 +14984,7 @@ diegohint2: @ 8092FD4
bl memcpy bl memcpy
b _08093020 b _08093020
.align 2, 0 .align 2, 0
_08092FFC: .4byte gUnknown_2024284 _08092FFC: .4byte gPlayerParty
_08093000: .4byte gUnknown_20397B0 _08093000: .4byte gUnknown_20397B0
_08093004: .4byte 0x000020a0 _08093004: .4byte 0x000020a0
_08093008: _08093008:
@@ -15018,12 +15018,12 @@ sub_8093030: @ 8093030
bne _08093050 bne _08093050
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0809304C @ =gUnknown_2024284 ldr r1, _0809304C @ =gPlayerParty
adds r0, r1 adds r0, r1
bl ZeroMonData bl ZeroMonData
b _08093054 b _08093054
.align 2, 0 .align 2, 0
_0809304C: .4byte gUnknown_2024284 _0809304C: .4byte gPlayerParty
_08093050: _08093050:
bl sub_808BCB4 bl sub_808BCB4
_08093054: _08093054:
@@ -15044,7 +15044,7 @@ diegohint1: @ 8093058
ldr r0, [r0] ldr r0, [r0]
ldr r1, _08093084 @ =0x00002104 ldr r1, _08093084 @ =0x00002104
adds r0, r1 adds r0, r1
ldr r2, _08093088 @ =gUnknown_2024284 ldr r2, _08093088 @ =gPlayerParty
movs r1, 0x64 movs r1, 0x64
muls r1, r7 muls r1, r7
adds r1, r2 adds r1, r2
@@ -15054,7 +15054,7 @@ diegohint1: @ 8093058
.align 2, 0 .align 2, 0
_08093080: .4byte gUnknown_20397B0 _08093080: .4byte gUnknown_20397B0
_08093084: .4byte 0x00002104 _08093084: .4byte 0x00002104
_08093088: .4byte gUnknown_2024284 _08093088: .4byte gPlayerParty
_0809308C: _0809308C:
ldr r0, _080930D0 @ =gUnknown_20397B0 ldr r0, _080930D0 @ =gUnknown_20397B0
ldr r2, [r0] ldr r2, [r0]
@@ -15357,7 +15357,7 @@ _080932D8:
ldr r0, [r4] ldr r0, [r4]
ldr r3, _08093314 @ =0x00002104 ldr r3, _08093314 @ =0x00002104
adds r0, r3 adds r0, r3
ldr r3, _08093318 @ =gUnknown_2024284 ldr r3, _08093318 @ =gPlayerParty
ldr r1, _0809331C @ =gUnknown_2039821 ldr r1, _0809331C @ =gUnknown_2039821
movs r2, 0 movs r2, 0
ldrsb r2, [r1, r2] ldrsb r2, [r1, r2]
@@ -15376,7 +15376,7 @@ _080932D8:
_0809330C: .4byte gUnknown_2039820 _0809330C: .4byte gUnknown_2039820
_08093310: .4byte gUnknown_20397B0 _08093310: .4byte gUnknown_20397B0
_08093314: .4byte 0x00002104 _08093314: .4byte 0x00002104
_08093318: .4byte gUnknown_2024284 _08093318: .4byte gPlayerParty
_0809331C: .4byte gUnknown_2039821 _0809331C: .4byte gUnknown_2039821
_08093320: .4byte 0x0000216e _08093320: .4byte 0x0000216e
_08093324: _08093324:
@@ -15550,7 +15550,7 @@ _0809346A:
_08093488: _08093488:
movs r0, 0x64 movs r0, 0x64
muls r0, r6 muls r0, r6
ldr r1, _08093504 @ =gUnknown_2024284 ldr r1, _08093504 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _08093508 @ =0x00002172 ldr r1, _08093508 @ =0x00002172
adds r2, r1 adds r2, r1
@@ -15611,7 +15611,7 @@ _080934DC:
b _08093600 b _08093600
.align 2, 0 .align 2, 0
_08093500: .4byte 0x0000216e _08093500: .4byte 0x0000216e
_08093504: .4byte gUnknown_2024284 _08093504: .4byte gPlayerParty
_08093508: .4byte 0x00002172 _08093508: .4byte 0x00002172
_0809350C: .4byte 0x0000216a _0809350C: .4byte 0x0000216a
_08093510: .4byte gUnknown_20397B0 _08093510: .4byte gUnknown_20397B0
@@ -15869,7 +15869,7 @@ _08093708:
ldr r1, [r4] ldr r1, [r4]
ldr r0, _0809374C @ =0x0000217c ldr r0, _0809374C @ =0x0000217c
adds r2, r1, r0 adds r2, r1, r0
ldr r0, _08093750 @ =gUnknown_2024284 ldr r0, _08093750 @ =gPlayerParty
str r0, [r2] str r0, [r2]
ldr r0, _08093754 @ =gUnknown_2039821 ldr r0, _08093754 @ =gUnknown_2039821
ldrb r0, [r0] ldrb r0, [r0]
@@ -15891,7 +15891,7 @@ _08093708:
_08093744: .4byte gUnknown_2039820 _08093744: .4byte gUnknown_2039820
_08093748: .4byte gUnknown_20397B0 _08093748: .4byte gUnknown_20397B0
_0809374C: .4byte 0x0000217c _0809374C: .4byte 0x0000217c
_08093750: .4byte gUnknown_2024284 _08093750: .4byte gPlayerParty
_08093754: .4byte gUnknown_2039821 _08093754: .4byte gUnknown_2039821
_08093758: .4byte 0x00002179 _08093758: .4byte 0x00002179
_0809375C: .4byte 0x00002178 _0809375C: .4byte 0x00002178
@@ -15969,7 +15969,7 @@ CompactPartySlots: @ 80937DC
movs r5, 0 movs r5, 0
movs r0, 0x64 movs r0, 0x64
mov r9, r0 mov r9, r0
ldr r1, _0809382C @ =gUnknown_2024284 ldr r1, _0809382C @ =gPlayerParty
mov r8, r1 mov r8, r1
subs r0, 0x65 subs r0, 0x65
mov r10, r0 mov r10, r0
@@ -15999,7 +15999,7 @@ _08093820:
b _0809383A b _0809383A
.align 2, 0 .align 2, 0
_08093828: .4byte 0x0000ffff _08093828: .4byte 0x0000ffff
_0809382C: .4byte gUnknown_2024284 _0809382C: .4byte gPlayerParty
_08093830: _08093830:
lsls r0, r7, 16 lsls r0, r7, 16
asrs r0, 16 asrs r0, 16
@@ -16016,7 +16016,7 @@ _0809383A:
cmp r5, 0x5 cmp r5, 0x5
bhi _08093862 bhi _08093862
movs r6, 0x64 movs r6, 0x64
ldr r4, _08093874 @ =gUnknown_2024284 ldr r4, _08093874 @ =gPlayerParty
_0809384E: _0809384E:
adds r0, r5, 0 adds r0, r5, 0
muls r0, r6 muls r0, r6
@@ -16037,7 +16037,7 @@ _08093862:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08093874: .4byte gUnknown_2024284 _08093874: .4byte gPlayerParty
thumb_func_end CompactPartySlots thumb_func_end CompactPartySlots
thumb_func_start sub_8093878 thumb_func_start sub_8093878
@@ -16080,7 +16080,7 @@ _080938B8:
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080938FC @ =gUnknown_2024284 ldr r1, _080938FC @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x8 movs r1, 0x8
mov r2, sp mov r2, sp
@@ -16103,7 +16103,7 @@ _080938EC:
.align 2, 0 .align 2, 0
_080938F4: .4byte gUnknown_2039820 _080938F4: .4byte gUnknown_2039820
_080938F8: .4byte gUnknown_2039821 _080938F8: .4byte gUnknown_2039821
_080938FC: .4byte gUnknown_2024284 _080938FC: .4byte gPlayerParty
thumb_func_end sub_8093878 thumb_func_end sub_8093878
thumb_func_start sub_8093900 thumb_func_start sub_8093900
@@ -16307,14 +16307,14 @@ _08093A5A:
adds r1, r0, 0 adds r1, r0, 0
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08093A7C @ =gUnknown_2024284 ldr r1, _08093A7C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0 movs r1, 0
bl sub_8093AD0 bl sub_8093AD0
b _08093AA0 b _08093AA0
.align 2, 0 .align 2, 0
_08093A78: .4byte gUnknown_2039821 _08093A78: .4byte gUnknown_2039821
_08093A7C: .4byte gUnknown_2024284 _08093A7C: .4byte gPlayerParty
_08093A80: _08093A80:
movs r0, 0 movs r0, 0
movs r1, 0x2 movs r1, 0x2
@@ -20749,7 +20749,7 @@ _08095CD2:
movs r0, 0x64 movs r0, 0x64
adds r1, r7, 0 adds r1, r7, 0
muls r1, r0 muls r1, r0
ldr r0, _08095D40 @ =gUnknown_2024284 ldr r0, _08095D40 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x5 movs r1, 0x5
@@ -20795,7 +20795,7 @@ _08095D36:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08095D40: .4byte gUnknown_2024284 _08095D40: .4byte gPlayerParty
thumb_func_end sub_8095C84 thumb_func_end sub_8095C84
thumb_func_start sub_8095D44 thumb_func_start sub_8095D44
@@ -20882,7 +20882,7 @@ _08095DE8: .4byte gUnknown_20397B0
_08095DEC: _08095DEC:
movs r0, 0x64 movs r0, 0x64
muls r0, r7 muls r0, r7
ldr r1, _08095E1C @ =gUnknown_2024284 ldr r1, _08095E1C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xC movs r1, 0xC
mov r2, sp mov r2, sp
@@ -20905,7 +20905,7 @@ _08095E14:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08095E1C: .4byte gUnknown_2024284 _08095E1C: .4byte gPlayerParty
_08095E20: .4byte gUnknown_20397B0 _08095E20: .4byte gUnknown_20397B0
_08095E24: .4byte 0x00000ce2 _08095E24: .4byte 0x00000ce2
_08095E28: .4byte 0x00002224 _08095E28: .4byte 0x00002224
@@ -21019,7 +21019,7 @@ _08095F10:
movs r0, 0x64 movs r0, 0x64
adds r4, r7, 0 adds r4, r7, 0
muls r4, r0 muls r4, r0
ldr r0, _08095F6C @ =gUnknown_2024284 ldr r0, _08095F6C @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xC movs r1, 0xC
@@ -21059,7 +21059,7 @@ _08095F5E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08095F6C: .4byte gUnknown_2024284 _08095F6C: .4byte gPlayerParty
_08095F70: .4byte 0x00002224 _08095F70: .4byte 0x00002224
thumb_func_end sub_8095EA0 thumb_func_end sub_8095EA0
@@ -21112,7 +21112,7 @@ _08095FD4:
mov r1, r8 mov r1, r8
muls r1, r0 muls r1, r0
adds r0, r1, 0 adds r0, r1, 0
ldr r1, _08096000 @ =gUnknown_2024284 ldr r1, _08096000 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r2, [r6] ldr r2, [r6]
ldr r1, _08096004 @ =0x00002224 ldr r1, _08096004 @ =0x00002224
@@ -21129,7 +21129,7 @@ _08095FF4:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08096000: .4byte gUnknown_2024284 _08096000: .4byte gPlayerParty
_08096004: .4byte 0x00002224 _08096004: .4byte 0x00002224
thumb_func_end sub_8095F74 thumb_func_end sub_8095F74
@@ -21179,7 +21179,7 @@ _08096060: .4byte gUnknown_20397B0
_08096064: _08096064:
movs r0, 0x64 movs r0, 0x64
muls r0, r7 muls r0, r7
ldr r1, _08096084 @ =gUnknown_2024284 ldr r1, _08096084 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xC movs r1, 0xC
mov r2, sp mov r2, sp
@@ -21193,7 +21193,7 @@ _0809607C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08096084: .4byte gUnknown_2024284 _08096084: .4byte gPlayerParty
thumb_func_end sub_8096008 thumb_func_end sub_8096008
thumb_func_start sub_8096088 thumb_func_start sub_8096088
+22 -22
View File
@@ -56,7 +56,7 @@ _08134548:
adds r0, r5, r2 adds r0, r5, r2
mov r3, r8 mov r3, r8
str r3, [r0] str r3, [r0]
ldr r0, _08134588 @ =gUnknown_202402C ldr r0, _08134588 @ =gEnemyParty
cmp r8, r0 cmp r8, r0
bne _08134590 bne _08134590
ldr r0, _0813458C @ =0x00003024 ldr r0, _0813458C @ =0x00003024
@@ -69,7 +69,7 @@ _08134578: .4byte gUnknown_203B16D
_0813457C: .4byte gUnknown_203B16E _0813457C: .4byte gUnknown_203B16E
_08134580: .4byte 0x000032f8 _08134580: .4byte 0x000032f8
_08134584: .4byte 0x000032f4 _08134584: .4byte 0x000032f4
_08134588: .4byte gUnknown_202402C _08134588: .4byte gEnemyParty
_0813458C: .4byte 0x00003024 _0813458C: .4byte 0x00003024
_08134590: _08134590:
ldr r2, _081345C0 @ =0x00003024 ldr r2, _081345C0 @ =0x00003024
@@ -3404,7 +3404,7 @@ _08136168:
adds r1, r4, 0 adds r1, r4, 0
bl GetSpeciesName bl GetSpeciesName
ldr r1, [r6] ldr r1, [r6]
ldr r2, _081361F8 @ =gUnknown_8254784 ldr r2, _081361F8 @ =gBaseStats
lsls r0, r4, 3 lsls r0, r4, 3
subs r0, r4 subs r0, r4
lsls r0, 2 lsls r0, 2
@@ -3454,7 +3454,7 @@ _08136168:
.align 2, 0 .align 2, 0
_081361F0: .4byte 0x00003290 _081361F0: .4byte 0x00003290
_081361F4: .4byte 0x00003028 _081361F4: .4byte 0x00003028
_081361F8: .4byte gUnknown_8254784 _081361F8: .4byte gBaseStats
_081361FC: .4byte 0x00003220 _081361FC: .4byte 0x00003220
_08136200: .4byte 0x00003221 _08136200: .4byte 0x00003221
_08136204: .4byte 0x00003034 _08136204: .4byte 0x00003034
@@ -3976,7 +3976,7 @@ _08136630:
ldr r4, _08136790 @ =gUnknown_8253AE4 ldr r4, _08136790 @ =gUnknown_8253AE4
adds r2, r5, 0x1 adds r2, r5, 0x1
lsls r2, 2 lsls r2, 2
ldr r3, _08136794 @ =gUnknown_8254784 ldr r3, _08136794 @ =gBaseStats
lsls r1, r0, 3 lsls r1, r0, 3
subs r1, r0 subs r1, r0
lsls r1, 2 lsls r1, 2
@@ -4085,7 +4085,7 @@ _08136784: .4byte 0x0000309c
_08136788: .4byte gUnknown_203B144 _08136788: .4byte gUnknown_203B144
_0813678C: .4byte 0x000031a4 _0813678C: .4byte 0x000031a4
_08136790: .4byte gUnknown_8253AE4 _08136790: .4byte gUnknown_8253AE4
_08136794: .4byte gUnknown_8254784 _08136794: .4byte gBaseStats
_08136798: .4byte 0x000031b0 _08136798: .4byte 0x000031b0
_0813679C: .4byte 0x000031bc _0813679C: .4byte 0x000031bc
_081367A0: .4byte gUnknown_824FC40 _081367A0: .4byte gUnknown_824FC40
@@ -4222,7 +4222,7 @@ _081368B0:
ldr r1, _0813694C @ =0x0000324e ldr r1, _0813694C @ =0x0000324e
adds r4, r0, r1 adds r4, r0, r1
add r4, r9 add r4, r9
ldr r5, _08136950 @ =gUnknown_8250C04 ldr r5, _08136950 @ =gBattleMoves
ldr r2, _08136954 @ =0x00003258 ldr r2, _08136954 @ =0x00003258
adds r3, r0, r2 adds r3, r0, r2
add r3, r9 add r3, r9
@@ -4289,7 +4289,7 @@ _081368B0:
.align 2, 0 .align 2, 0
_08136948: .4byte 0x00003264 _08136948: .4byte 0x00003264
_0813694C: .4byte 0x0000324e _0813694C: .4byte 0x0000324e
_08136950: .4byte gUnknown_8250C04 _08136950: .4byte gBattleMoves
_08136954: .4byte 0x00003258 _08136954: .4byte 0x00003258
_08136958: .4byte 0x00003128 _08136958: .4byte 0x00003128
_0813695C: .4byte gUnknown_8247094 _0813695C: .4byte gUnknown_8247094
@@ -4381,7 +4381,7 @@ _081369D0:
lsls r1, 1 lsls r1, 1
subs r4, r1 subs r4, r1
strh r4, [r2] strh r4, [r2]
ldr r2, _08136A64 @ =gUnknown_8250C04 ldr r2, _08136A64 @ =gBattleMoves
ldr r6, [r6] ldr r6, [r6]
ldr r3, _08136A5C @ =0x00003258 ldr r3, _08136A5C @ =0x00003258
adds r0, r6, r3 adds r0, r6, r3
@@ -4409,7 +4409,7 @@ _08136A54: .4byte 0x00003290
_08136A58: .4byte 0x000030f0 _08136A58: .4byte 0x000030f0
_08136A5C: .4byte 0x00003258 _08136A5C: .4byte 0x00003258
_08136A60: .4byte gUnknown_203B144 _08136A60: .4byte gUnknown_203B144
_08136A64: .4byte gUnknown_8250C04 _08136A64: .4byte gBattleMoves
_08136A68: .4byte 0x0000316c _08136A68: .4byte 0x0000316c
_08136A6C: .4byte gUnknown_8416213 _08136A6C: .4byte gUnknown_8416213
_08136A70: _08136A70:
@@ -4423,7 +4423,7 @@ _08136A70:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
_08136A84: _08136A84:
ldr r2, _08136AB4 @ =gUnknown_8250C04 ldr r2, _08136AB4 @ =gBattleMoves
ldr r0, _08136AB8 @ =gUnknown_203B140 ldr r0, _08136AB8 @ =gUnknown_203B140
ldr r3, [r0] ldr r3, [r0]
ldr r1, _08136ABC @ =0x00003258 ldr r1, _08136ABC @ =0x00003258
@@ -4446,7 +4446,7 @@ _08136A84:
b _08136ADA b _08136ADA
.align 2, 0 .align 2, 0
_08136AB0: .4byte 0x0000316c _08136AB0: .4byte 0x0000316c
_08136AB4: .4byte gUnknown_8250C04 _08136AB4: .4byte gBattleMoves
_08136AB8: .4byte gUnknown_203B140 _08136AB8: .4byte gUnknown_203B140
_08136ABC: .4byte 0x00003258 _08136ABC: .4byte 0x00003258
_08136AC0: .4byte 0x00003188 _08136AC0: .4byte 0x00003188
@@ -6230,7 +6230,7 @@ sub_8137970: @ 8137970
ldr r1, _081379CC @ =0x000032f4 ldr r1, _081379CC @ =0x000032f4
adds r0, r2, r1 adds r0, r2, r1
ldr r1, [r0] ldr r1, [r0]
ldr r0, _081379D0 @ =gUnknown_202402C ldr r0, _081379D0 @ =gEnemyParty
cmp r1, r0 cmp r1, r0
beq _081379E4 beq _081379E4
cmp r4, 0xFF cmp r4, 0xFF
@@ -6257,7 +6257,7 @@ sub_8137970: @ 8137970
_081379C4: .4byte gUnknown_203B140 _081379C4: .4byte gUnknown_203B140
_081379C8: .4byte 0x00003290 _081379C8: .4byte 0x00003290
_081379CC: .4byte 0x000032f4 _081379CC: .4byte 0x000032f4
_081379D0: .4byte gUnknown_202402C _081379D0: .4byte gEnemyParty
_081379D4: _081379D4:
cmp r4, 0xFD cmp r4, 0xFD
bne _081379DA bne _081379DA
@@ -7623,7 +7623,7 @@ sub_813847C: @ 813847C
ldr r1, _081384C0 @ =0x000032f4 ldr r1, _081384C0 @ =0x000032f4
adds r0, r1 adds r0, r1
ldr r1, [r0] ldr r1, [r0]
ldr r0, _081384C4 @ =gUnknown_202402C ldr r0, _081384C4 @ =gEnemyParty
cmp r1, r0 cmp r1, r0
bne _081384D0 bne _081384D0
bl GetMultiplayerId bl GetMultiplayerId
@@ -7648,7 +7648,7 @@ sub_813847C: @ 813847C
.align 2, 0 .align 2, 0
_081384BC: .4byte gUnknown_203B140 _081384BC: .4byte gUnknown_203B140
_081384C0: .4byte 0x000032f4 _081384C0: .4byte 0x000032f4
_081384C4: .4byte gUnknown_202402C _081384C4: .4byte gEnemyParty
_081384C8: .4byte gUnknown_202273C _081384C8: .4byte gUnknown_202273C
_081384CC: .4byte 0x0000304c _081384CC: .4byte 0x0000304c
_081384D0: _081384D0:
@@ -12273,7 +12273,7 @@ _0813A9E2:
ldr r3, _0813AADC @ =gUnknown_8253AE4 ldr r3, _0813AADC @ =gUnknown_8253AE4
adds r1, r5, 0x1 adds r1, r5, 0x1
lsls r1, 2 lsls r1, 2
ldr r2, _0813AAE0 @ =gUnknown_8254784 ldr r2, _0813AAE0 @ =gBaseStats
lsls r0, r4, 3 lsls r0, r4, 3
subs r0, r4 subs r0, r4
lsls r0, 2 lsls r0, 2
@@ -12396,7 +12396,7 @@ _0813AAB8:
_0813AAD4: .4byte gUnknown_203B140 _0813AAD4: .4byte gUnknown_203B140
_0813AAD8: .4byte 0x00003290 _0813AAD8: .4byte 0x00003290
_0813AADC: .4byte gUnknown_8253AE4 _0813AADC: .4byte gUnknown_8253AE4
_0813AAE0: .4byte gUnknown_8254784 _0813AAE0: .4byte gBaseStats
_0813AAE4: .4byte gUnknown_203B160 _0813AAE4: .4byte gUnknown_203B160
_0813AAE8: _0813AAE8:
movs r6, 0x2 movs r6, 0x2
@@ -13439,7 +13439,7 @@ _0813B30A:
ldrb r1, [r5] ldrb r1, [r5]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0813B338 @ =gUnknown_2024284 ldr r1, _0813B338 @ =gPlayerParty
adds r0, r1 adds r0, r1
bl sub_813B2C8 bl sub_813B2C8
lsls r0, 24 lsls r0, 24
@@ -13451,7 +13451,7 @@ _0813B30A:
b _0813B340 b _0813B340
.align 2, 0 .align 2, 0
_0813B334: .4byte gUnknown_8463FB8 _0813B334: .4byte gUnknown_8463FB8
_0813B338: .4byte gUnknown_2024284 _0813B338: .4byte gPlayerParty
_0813B33C: _0813B33C:
movs r0, 0x1 movs r0, 0x1
negs r0, r0 negs r0, r0
@@ -13477,7 +13477,7 @@ _0813B34E:
ldrb r1, [r5] ldrb r1, [r5]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0813B37C @ =gUnknown_2024284 ldr r1, _0813B37C @ =gPlayerParty
adds r0, r1 adds r0, r1
bl sub_813B2C8 bl sub_813B2C8
lsls r0, 24 lsls r0, 24
@@ -13489,7 +13489,7 @@ _0813B34E:
b _0813B384 b _0813B384
.align 2, 0 .align 2, 0
_0813B378: .4byte gUnknown_8463FB8 _0813B378: .4byte gUnknown_8463FB8
_0813B37C: .4byte gUnknown_2024284 _0813B37C: .4byte gPlayerParty
_0813B380: _0813B380:
movs r0, 0x1 movs r0, 0x1
negs r0, r0 negs r0, r0
+2 -2
View File
@@ -56,7 +56,7 @@ _080CA34A:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _080CA3B8 @ =gUnknown_2024284 ldr r0, _080CA3B8 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x5 movs r1, 0x5
@@ -101,7 +101,7 @@ _080CA39E:
.align 2, 0 .align 2, 0
_080CA3B0: .4byte gUnknown_203AB44 _080CA3B0: .4byte gUnknown_203AB44
_080CA3B4: .4byte gSaveBlock2Ptr _080CA3B4: .4byte gSaveBlock2Ptr
_080CA3B8: .4byte gUnknown_2024284 _080CA3B8: .4byte gPlayerParty
_080CA3BC: .4byte 0x0000083b _080CA3BC: .4byte 0x0000083b
_080CA3C0: .4byte CB2_DoHallOfFameScreen _080CA3C0: .4byte CB2_DoHallOfFameScreen
thumb_func_end sub_80CA2E4 thumb_func_end sub_80CA2E4
+14 -14
View File
@@ -1580,7 +1580,7 @@ _08111492:
subs r0, r3 subs r0, r3
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _081114C0 @ =gUnknown_2024284 ldr r1, _081114C0 @ =gPlayerParty
adds r0, r1 adds r0, r1
str r3, [sp, 0x10] str r3, [sp, 0x10]
bl ZeroMonData bl ZeroMonData
@@ -1597,7 +1597,7 @@ _08111492:
b _0811150E b _0811150E
.align 2, 0 .align 2, 0
_081114BC: .4byte 0x00004027 _081114BC: .4byte 0x00004027
_081114C0: .4byte gUnknown_2024284 _081114C0: .4byte gPlayerParty
_081114C4: _081114C4:
mov r8, r4 mov r8, r4
cmp r5, r0 cmp r5, r0
@@ -1623,7 +1623,7 @@ _081114CE:
_081114EE: _081114EE:
movs r0, 0x64 movs r0, 0x64
muls r0, r3 muls r0, r3
ldr r1, _08111574 @ =gUnknown_2024284 ldr r1, _08111574 @ =gPlayerParty
adds r0, r1 adds r0, r1
mov r1, r9 mov r1, r9
movs r2, 0x64 movs r2, 0x64
@@ -1688,7 +1688,7 @@ _08111554:
bls _08111520 bls _08111520
b _081115D2 b _081115D2
.align 2, 0 .align 2, 0
_08111574: .4byte gUnknown_2024284 _08111574: .4byte gPlayerParty
_08111578: _08111578:
cmp r5, r0 cmp r5, r0
bcs _081115D2 bcs _081115D2
@@ -1779,7 +1779,7 @@ sub_8111618: @ 8111618
_0811161E: _0811161E:
movs r0, 0x64 movs r0, 0x64
muls r0, r4 muls r0, r4
ldr r1, _08111648 @ =gUnknown_2024284 ldr r1, _08111648 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x5 movs r1, 0x5
bl GetMonData bl GetMonData
@@ -1799,7 +1799,7 @@ _08111636:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08111648: .4byte gUnknown_2024284 _08111648: .4byte gPlayerParty
thumb_func_end sub_8111618 thumb_func_end sub_8111618
thumb_func_start sub_811164C thumb_func_start sub_811164C
@@ -6179,7 +6179,7 @@ sub_81137E4: @ 81137E4
lsrs r0, 16 lsrs r0, 16
cmp r0, 0x22 cmp r0, 0x22
bne _08113814 bne _08113814
ldr r2, _08113810 @ =gUnknown_823EAC8 ldr r2, _08113810 @ =gTrainers
ldrh r1, [r1] ldrh r1, [r1]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -6197,7 +6197,7 @@ sub_81137E4: @ 81137E4
movs r0, 0x1 movs r0, 0x1
b _08113816 b _08113816
.align 2, 0 .align 2, 0
_08113810: .4byte gUnknown_823EAC8 _08113810: .4byte gTrainers
_08113814: _08113814:
movs r0, 0 movs r0, 0
_08113816: _08113816:
@@ -9006,7 +9006,7 @@ sub_8114D68: @ 8114D68
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
ldr r0, _08114DD8 @ =gUnknown_823EACC ldr r0, _08114DD8 @ =gTrainers+0x4
adds r1, r0 adds r1, r0
movs r0, 0x1 movs r0, 0x1
bl UnkTextUtil_SetPtrI bl UnkTextUtil_SetPtrI
@@ -9035,7 +9035,7 @@ sub_8114D68: @ 8114D68
bx r1 bx r1
.align 2, 0 .align 2, 0
_08114DD4: .4byte gStringVar1 _08114DD4: .4byte gStringVar1
_08114DD8: .4byte gUnknown_823EACC _08114DD8: .4byte gTrainers+0x4
_08114DDC: .4byte gUnknown_8456ACC _08114DDC: .4byte gUnknown_8456ACC
_08114DE0: .4byte gStringVar4 _08114DE0: .4byte gStringVar4
_08114DE4: .4byte gUnknown_841AF0C _08114DE4: .4byte gUnknown_841AF0C
@@ -9325,7 +9325,7 @@ sub_811500C: @ 811500C
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
ldr r0, _08115068 @ =gUnknown_823EACC ldr r0, _08115068 @ =gTrainers+0x4
adds r1, r0 adds r1, r0
movs r0, 0 movs r0, 0
bl UnkTextUtil_SetPtrI bl UnkTextUtil_SetPtrI
@@ -9353,7 +9353,7 @@ sub_811500C: @ 811500C
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08115068: .4byte gUnknown_823EACC _08115068: .4byte gTrainers+0x4
_0811506C: .4byte gUnknown_8456ACC _0811506C: .4byte gUnknown_8456ACC
_08115070: .4byte gStringVar4 _08115070: .4byte gStringVar4
_08115074: .4byte gUnknown_841AF3E _08115074: .4byte gUnknown_841AF3E
@@ -9544,7 +9544,7 @@ sub_81151DC: @ 81151DC
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
bl UnkTextUtil_SetPtrI bl UnkTextUtil_SetPtrI
ldr r3, _08115230 @ =gUnknown_823EAC8 ldr r3, _08115230 @ =gTrainers
ldrh r1, [r5, 0x4] ldrh r1, [r5, 0x4]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -9566,7 +9566,7 @@ _0811521A:
b _0811523E b _0811523E
.align 2, 0 .align 2, 0
_0811522C: .4byte gStringVar1 _0811522C: .4byte gStringVar1
_08115230: .4byte gUnknown_823EAC8 _08115230: .4byte gTrainers
_08115234: _08115234:
adds r1, r3, 0x4 adds r1, r3, 0x4
adds r1, r2, r1 adds r1, r2, r1
+32 -32
View File
@@ -12,7 +12,7 @@ sub_812BFDC: @ 812BFDC
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
ldr r4, _0812C03C @ =gUnknown_2022B4C ldr r4, _0812C03C @ =gBattleTypeFlags
ldr r0, [r4] ldr r0, [r4]
ldr r1, _0812C040 @ =0x00010202 ldr r1, _0812C040 @ =0x00010202
ands r0, r1 ands r0, r1
@@ -41,8 +41,8 @@ _0812C002:
bne _0812C01E bne _0812C01E
b _0812C1CC b _0812C1CC
_0812C01E: _0812C01E:
ldr r3, _0812C048 @ =gUnknown_823EAC8 ldr r3, _0812C048 @ =gTrainers
ldr r2, _0812C04C @ =gUnknown_20386AE ldr r2, _0812C04C @ =gTrainerBattleOpponent_A
ldrh r1, [r2] ldrh r1, [r2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -57,11 +57,11 @@ _0812C01E:
beq _0812C056 beq _0812C056
b _0812C066 b _0812C066
.align 2, 0 .align 2, 0
_0812C03C: .4byte gUnknown_2022B4C _0812C03C: .4byte gBattleTypeFlags
_0812C040: .4byte 0x00010202 _0812C040: .4byte 0x00010202
_0812C044: .4byte gUnknown_2023E8A _0812C044: .4byte gUnknown_2023E8A
_0812C048: .4byte gUnknown_823EAC8 _0812C048: .4byte gTrainers
_0812C04C: .4byte gUnknown_20386AE _0812C04C: .4byte gTrainerBattleOpponent_A
_0812C050: _0812C050:
cmp r1, 0x5A cmp r1, 0x5A
beq _0812C05C beq _0812C05C
@@ -84,16 +84,16 @@ _0812C068:
_0812C06A: _0812C06A:
ldrh r0, [r2] ldrh r0, [r2]
strh r0, [r7] strh r0, [r7]
ldr r0, _0812C0AC @ =gUnknown_2022B4C ldr r0, _0812C0AC @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x1 movs r1, 0x1
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0812C150 beq _0812C150
ldr r0, _0812C0B0 @ =gUnknown_3004F90 ldr r0, _0812C0B0 @ =gBattleResults
ldrh r0, [r0, 0x20] ldrh r0, [r0, 0x20]
strh r0, [r7, 0x2] strh r0, [r7, 0x2]
ldr r4, _0812C0B4 @ =gUnknown_2023FE8 ldr r4, _0812C0B4 @ =gBattleStruct
ldr r0, [r4] ldr r0, [r4]
movs r1, 0xC1 movs r1, 0xC1
lsls r1, 1 lsls r1, 1
@@ -103,7 +103,7 @@ _0812C06A:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0812C0BC bne _0812C0BC
ldr r2, _0812C0B8 @ =gUnknown_2023BE4 ldr r2, _0812C0B8 @ =gBattleMons
ldr r0, [r4] ldr r0, [r4]
movs r1, 0xC1 movs r1, 0xC1
lsls r1, 1 lsls r1, 1
@@ -114,12 +114,12 @@ _0812C06A:
adds r0, r2 adds r0, r2
b _0812C0EA b _0812C0EA
.align 2, 0 .align 2, 0
_0812C0AC: .4byte gUnknown_2022B4C _0812C0AC: .4byte gBattleTypeFlags
_0812C0B0: .4byte gUnknown_3004F90 _0812C0B0: .4byte gBattleResults
_0812C0B4: .4byte gUnknown_2023FE8 _0812C0B4: .4byte gBattleStruct
_0812C0B8: .4byte gUnknown_2023BE4 _0812C0B8: .4byte gBattleMons
_0812C0BC: _0812C0BC:
ldr r5, _0812C0D8 @ =gUnknown_2023BE4 ldr r5, _0812C0D8 @ =gBattleMons
movs r0, 0 movs r0, 0
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
@@ -133,7 +133,7 @@ _0812C0BC:
movs r0, 0 movs r0, 0
b _0812C0DE b _0812C0DE
.align 2, 0 .align 2, 0
_0812C0D8: .4byte gUnknown_2023BE4 _0812C0D8: .4byte gBattleMons
_0812C0DC: _0812C0DC:
movs r0, 0x2 movs r0, 0x2
_0812C0DE: _0812C0DE:
@@ -150,7 +150,7 @@ _0812C0EA:
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x2 movs r0, 0x2
bl GetBankByIdentity bl GetBankByIdentity
ldr r6, _0812C14C @ =gUnknown_2023BE4 ldr r6, _0812C14C @ =gBattleMons
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r5, 0x58 movs r5, 0x58
@@ -188,14 +188,14 @@ _0812C0EA:
lsrs r4, r0, 16 lsrs r4, r0, 16
b _0812C18E b _0812C18E
.align 2, 0 .align 2, 0
_0812C14C: .4byte gUnknown_2023BE4 _0812C14C: .4byte gBattleMons
_0812C150: _0812C150:
ldr r0, _0812C1C4 @ =gUnknown_3004F90 ldr r0, _0812C1C4 @ =gBattleResults
ldrh r0, [r0, 0x20] ldrh r0, [r0, 0x20]
strh r0, [r7, 0x2] strh r0, [r7, 0x2]
movs r0, 0 movs r0, 0
bl GetBankByIdentity bl GetBankByIdentity
ldr r5, _0812C1C8 @ =gUnknown_2023BE4 ldr r5, _0812C1C8 @ =gBattleMons
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r4, 0x58 movs r4, 0x58
@@ -245,13 +245,13 @@ _0812C1B8:
bl sub_8113550 bl sub_8113550
b _0812C206 b _0812C206
.align 2, 0 .align 2, 0
_0812C1C4: .4byte gUnknown_3004F90 _0812C1C4: .4byte gBattleResults
_0812C1C8: .4byte gUnknown_2023BE4 _0812C1C8: .4byte gBattleMons
_0812C1CC: _0812C1CC:
ldrb r0, [r5] ldrb r0, [r5]
cmp r0, 0x1 cmp r0, 0x1
bne _0812C1E8 bne _0812C1E8
ldr r0, _0812C1E4 @ =gUnknown_202402C ldr r0, _0812C1E4 @ =gEnemyParty
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
mov r1, r9 mov r1, r9
@@ -259,11 +259,11 @@ _0812C1CC:
strh r4, [r1, 0x2] strh r4, [r1, 0x2]
b _0812C1F8 b _0812C1F8
.align 2, 0 .align 2, 0
_0812C1E4: .4byte gUnknown_202402C _0812C1E4: .4byte gEnemyParty
_0812C1E8: _0812C1E8:
mov r0, r9 mov r0, r9
strh r4, [r0] strh r4, [r0]
ldr r0, _0812C220 @ =gUnknown_202402C ldr r0, _0812C220 @ =gEnemyParty
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
mov r1, r9 mov r1, r9
@@ -288,7 +288,7 @@ _0812C212:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0812C220: .4byte gUnknown_202402C _0812C220: .4byte gEnemyParty
thumb_func_end sub_812BFDC thumb_func_end sub_812BFDC
thumb_func_start sub_812C224 thumb_func_start sub_812C224
@@ -298,7 +298,7 @@ sub_812C224: @ 812C224
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
sub sp, 0xC sub sp, 0xC
ldr r4, _0812C2B8 @ =gUnknown_2022B4C ldr r4, _0812C2B8 @ =gBattleTypeFlags
ldr r0, [r4] ldr r0, [r4]
movs r1, 0x2 movs r1, 0x2
ands r0, r1 ands r0, r1
@@ -366,7 +366,7 @@ _0812C274:
ble _0812C274 ble _0812C274
b _0812C30E b _0812C30E
.align 2, 0 .align 2, 0
_0812C2B8: .4byte gUnknown_2022B4C _0812C2B8: .4byte gBattleTypeFlags
_0812C2BC: .4byte gUnknown_2023E8A _0812C2BC: .4byte gUnknown_2023E8A
_0812C2C0: .4byte gUnknown_2022744 _0812C2C0: .4byte gUnknown_2022744
_0812C2C4: _0812C2C4:
@@ -390,7 +390,7 @@ _0812C2E2:
adds r4, r5, 0x1 adds r4, r5, 0x1
ldr r1, _0812C32C @ =gUnknown_2022744 ldr r1, _0812C32C @ =gUnknown_2022744
mov r12, r1 mov r12, r1
ldr r7, _0812C330 @ =gUnknown_2023FE8 ldr r7, _0812C330 @ =gBattleStruct
movs r6, 0x1 movs r6, 0x1
_0812C2EE: _0812C2EE:
adds r2, r4, r3 adds r2, r4, r3
@@ -425,7 +425,7 @@ _0812C31C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0812C32C: .4byte gUnknown_2022744 _0812C32C: .4byte gUnknown_2022744
_0812C330: .4byte gUnknown_2023FE8 _0812C330: .4byte gBattleStruct
thumb_func_end sub_812C224 thumb_func_end sub_812C224
thumb_func_start sub_812C334 thumb_func_start sub_812C334
@@ -433,7 +433,7 @@ sub_812C334: @ 812C334
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
ldr r3, _0812C35C @ =gUnknown_202273C ldr r3, _0812C35C @ =gUnknown_202273C
ldr r4, _0812C360 @ =gUnknown_2023FE8 ldr r4, _0812C360 @ =gBattleStruct
ldr r0, [r4] ldr r0, [r4]
adds r0, 0xB5 adds r0, 0xB5
ldrb r2, [r0] ldrb r2, [r0]
@@ -453,7 +453,7 @@ _0812C352:
b _0812C370 b _0812C370
.align 2, 0 .align 2, 0
_0812C35C: .4byte gUnknown_202273C _0812C35C: .4byte gUnknown_202273C
_0812C360: .4byte gUnknown_2023FE8 _0812C360: .4byte gBattleStruct
_0812C364: _0812C364:
ldr r0, [r4] ldr r0, [r4]
adds r0, 0xB5 adds r0, 0xB5
+72 -72
View File
@@ -23,14 +23,14 @@ sub_8077764: @ 8077764
movs r0, 0x4C movs r0, 0x4C
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
ldr r0, _080777B4 @ =gUnknown_2023FC4 ldr r0, _080777B4 @ =gBattleScripting
adds r2, r0, 0 adds r2, r0, 0
adds r2, 0x21 adds r2, 0x21
movs r1, 0 movs r1, 0
strb r1, [r2] strb r1, [r2]
adds r0, 0x22 adds r0, 0x22
strb r1, [r0] strb r1, [r0]
ldr r0, _080777B8 @ =gUnknown_2022B4C ldr r0, _080777B8 @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x2 movs r0, 0x2
ands r0, r1 ands r0, r1
@@ -49,8 +49,8 @@ sub_8077764: @ 8077764
b _080777DA b _080777DA
.align 2, 0 .align 2, 0
_080777B0: .4byte gUnknown_2037AB8 _080777B0: .4byte gUnknown_2037AB8
_080777B4: .4byte gUnknown_2023FC4 _080777B4: .4byte gBattleScripting
_080777B8: .4byte gUnknown_2022B4C _080777B8: .4byte gBattleTypeFlags
_080777BC: _080777BC:
movs r0, 0x18 movs r0, 0x18
bl sub_812B1F0 bl sub_812B1F0
@@ -79,7 +79,7 @@ _080777E4: .4byte sub_80777E8
sub_80777E8: @ 80777E8 sub_80777E8: @ 80777E8
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, _08077804 @ =gUnknown_2023FC4 ldr r0, _08077804 @ =gBattleScripting
adds r0, 0x21 adds r0, 0x21
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x14 cmp r0, 0x14
@@ -92,7 +92,7 @@ _080777F8:
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0 .align 2, 0
_08077804: .4byte gUnknown_2023FC4 _08077804: .4byte gBattleScripting
_08077808: .4byte _0807780C _08077808: .4byte _0807780C
.align 2, 0 .align 2, 0
_0807780C: _0807780C:
@@ -195,7 +195,7 @@ _08077918:
bl ClearSpritesHealthboxAnimData bl ClearSpritesHealthboxAnimData
b _08077A8A b _08077A8A
_0807791E: _0807791E:
ldr r5, _08077938 @ =gUnknown_2023FC4 ldr r5, _08077938 @ =gBattleScripting
adds r4, r5, 0 adds r4, r5, 0
adds r4, 0x22 adds r4, 0x22
ldrb r0, [r4] ldrb r0, [r4]
@@ -207,7 +207,7 @@ _0807791E:
strb r0, [r4] strb r0, [r4]
b _08077A8A b _08077A8A
.align 2, 0 .align 2, 0
_08077938: .4byte gUnknown_2023FC4 _08077938: .4byte gBattleScripting
_0807793C: _0807793C:
ldrb r0, [r4] ldrb r0, [r4]
adds r0, 0x1 adds r0, 0x1
@@ -232,7 +232,7 @@ _08077954:
beq _08077960 beq _08077960
b _08077A8A b _08077A8A
_08077960: _08077960:
ldr r1, _0807796C @ =gUnknown_2023FC4 ldr r1, _0807796C @ =gBattleScripting
_08077962: _08077962:
adds r1, 0x21 adds r1, 0x21
ldrb r0, [r1] ldrb r0, [r1]
@@ -240,7 +240,7 @@ _08077962:
strb r0, [r1] strb r0, [r1]
b _08077A8A b _08077A8A
.align 2, 0 .align 2, 0
_0807796C: .4byte gUnknown_2023FC4 _0807796C: .4byte gBattleScripting
_08077970: _08077970:
movs r0, 0 movs r0, 0
bl sub_8077C38 bl sub_8077C38
@@ -280,13 +280,13 @@ _080779B0:
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r7, _08077A44 @ =gUnknown_2023BCE ldr r7, _08077A44 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r7 adds r0, r7
ldrh r0, [r0] ldrh r0, [r0]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _08077A48 @ =gUnknown_202402C ldr r5, _08077A48 @ =gEnemyParty
adds r0, r5 adds r0, r5
movs r1, 0xB movs r1, 0xB
bl GetMonData bl GetMonData
@@ -338,8 +338,8 @@ _08077A14:
bl sub_80FCD74 bl sub_80FCD74
b _08077A8A b _08077A8A
.align 2, 0 .align 2, 0
_08077A44: .4byte gUnknown_2023BCE _08077A44: .4byte gBattlerPartyIndexes
_08077A48: .4byte gUnknown_202402C _08077A48: .4byte gEnemyParty
_08077A4C: .4byte gUnknown_2023FF8 _08077A4C: .4byte gUnknown_2023FF8
_08077A50: .4byte gUnknown_2024004 _08077A50: .4byte gUnknown_2024004
_08077A54: .4byte gUnknown_3003F3C _08077A54: .4byte gUnknown_3003F3C
@@ -364,7 +364,7 @@ _08077A5C:
bl SetMainCallback2 bl SetMainCallback2
bl sub_80357C8 bl sub_80357C8
_08077A8A: _08077A8A:
ldr r1, _08077AA8 @ =gUnknown_2023FC4 ldr r1, _08077AA8 @ =gBattleScripting
adds r1, 0x21 adds r1, 0x21
ldrb r0, [r1] ldrb r0, [r1]
adds r0, 0x1 adds r0, 0x1
@@ -377,7 +377,7 @@ _08077A8A:
_08077A9C: .4byte sub_80116F4 _08077A9C: .4byte sub_80116F4
_08077AA0: .4byte gUnknown_2037AB8 _08077AA0: .4byte gUnknown_2037AB8
_08077AA4: .4byte sub_8011100 _08077AA4: .4byte sub_8011100
_08077AA8: .4byte gUnknown_2023FC4 _08077AA8: .4byte gBattleScripting
thumb_func_end sub_80777E8 thumb_func_end sub_80777E8
thumb_func_start sub_8077AAC thumb_func_start sub_8077AAC
@@ -437,7 +437,7 @@ _08077B1C:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08077BA6 beq _08077BA6
ldr r0, _08077B58 @ =gUnknown_2022B4C ldr r0, _08077B58 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xA0 movs r1, 0xA0
lsls r1, 8 lsls r1, 8
@@ -446,22 +446,22 @@ _08077B1C:
lsls r1, 8 lsls r1, 8
cmp r0, r1 cmp r0, r1
bne _08077B64 bne _08077B64
ldr r1, _08077B5C @ =gUnknown_2023BCE ldr r1, _08077B5C @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08077B60 @ =gUnknown_202402C ldr r1, _08077B60 @ =gEnemyParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
bl sub_8034658 bl sub_8034658
b _08077C24 b _08077C24
.align 2, 0 .align 2, 0
_08077B54: .4byte gUnknown_2023BCC _08077B54: .4byte gUnknown_2023BCC
_08077B58: .4byte gUnknown_2022B4C _08077B58: .4byte gBattleTypeFlags
_08077B5C: .4byte gUnknown_2023BCE _08077B5C: .4byte gBattlerPartyIndexes
_08077B60: .4byte gUnknown_202402C _08077B60: .4byte gEnemyParty
_08077B64: _08077B64:
ldr r0, _08077B90 @ =gUnknown_2024018 ldr r0, _08077B90 @ =gUnknown_2024018
ldr r0, [r0] ldr r0, [r0]
@@ -473,28 +473,28 @@ _08077B64:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _08077B9C bne _08077B9C
ldr r1, _08077B94 @ =gUnknown_2023BCE ldr r1, _08077B94 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08077B98 @ =gUnknown_202402C ldr r1, _08077B98 @ =gEnemyParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
bl BattleLoadOpponentMonSpriteGfx bl BattleLoadOpponentMonSpriteGfx
b _08077C24 b _08077C24
.align 2, 0 .align 2, 0
_08077B90: .4byte gUnknown_2024018 _08077B90: .4byte gUnknown_2024018
_08077B94: .4byte gUnknown_2023BCE _08077B94: .4byte gBattlerPartyIndexes
_08077B98: .4byte gUnknown_202402C _08077B98: .4byte gEnemyParty
_08077B9C: _08077B9C:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80350BC bl sub_80350BC
b _08077C24 b _08077C24
_08077BA6: _08077BA6:
ldr r0, _08077BC0 @ =gUnknown_2022B4C ldr r0, _08077BC0 @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
movs r2, 0x80 movs r2, 0x80
ands r1, r2 ands r1, r2
@@ -507,7 +507,7 @@ _08077BA6:
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
b _08077BDA b _08077BDA
.align 2, 0 .align 2, 0
_08077BC0: .4byte gUnknown_2022B4C _08077BC0: .4byte gBattleTypeFlags
_08077BC4: .4byte gSaveBlock2Ptr _08077BC4: .4byte gSaveBlock2Ptr
_08077BC8: _08077BC8:
ldr r0, [r0] ldr r0, [r0]
@@ -534,27 +534,27 @@ _08077BE2:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _08077C1C bne _08077C1C
ldr r1, _08077C14 @ =gUnknown_2023BCE ldr r1, _08077C14 @ =gBattlerPartyIndexes
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r1 adds r0, r1
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08077C18 @ =gUnknown_2024284 ldr r1, _08077C18 @ =gPlayerParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
bl sub_8034498 bl sub_8034498
b _08077C24 b _08077C24
.align 2, 0 .align 2, 0
_08077C10: .4byte gUnknown_2024018 _08077C10: .4byte gUnknown_2024018
_08077C14: .4byte gUnknown_2023BCE _08077C14: .4byte gBattlerPartyIndexes
_08077C18: .4byte gUnknown_2024284 _08077C18: .4byte gPlayerParty
_08077C1C: _08077C1C:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80350BC bl sub_80350BC
_08077C24: _08077C24:
ldr r0, _08077C34 @ =gUnknown_2023FC4 ldr r0, _08077C34 @ =gBattleScripting
adds r0, 0x22 adds r0, 0x22
movs r1, 0 movs r1, 0
strb r1, [r0] strb r1, [r0]
@@ -564,7 +564,7 @@ _08077C2C:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08077C34: .4byte gUnknown_2023FC4 _08077C34: .4byte gBattleScripting
thumb_func_end sub_8077B0C thumb_func_end sub_8077B0C
thumb_func_start sub_8077C38 thumb_func_start sub_8077C38
@@ -582,7 +582,7 @@ sub_8077C38: @ 8077C38
bcc _08077C50 bcc _08077C50
b _08077FB4 b _08077FB4
_08077C50: _08077C50:
ldr r0, _08077C70 @ =gUnknown_2022B4C ldr r0, _08077C70 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xA0 movs r1, 0xA0
lsls r1, 8 lsls r1, 8
@@ -596,7 +596,7 @@ _08077C50:
b _08077C9A b _08077C9A
.align 2, 0 .align 2, 0
_08077C6C: .4byte gUnknown_2023BCC _08077C6C: .4byte gUnknown_2023BCC
_08077C70: .4byte gUnknown_2022B4C _08077C70: .4byte gBattleTypeFlags
_08077C74: _08077C74:
ldr r0, _08077C90 @ =gUnknown_2024018 ldr r0, _08077C90 @ =gUnknown_2024018
ldr r0, [r0] ldr r0, [r0]
@@ -627,7 +627,7 @@ _08077C9A:
bne _08077CAE bne _08077CAE
b _08077DAC b _08077DAC
_08077CAE: _08077CAE:
ldr r1, _08077D90 @ =gUnknown_2023BCE ldr r1, _08077D90 @ =gBattlerPartyIndexes
lsls r0, r7, 1 lsls r0, r7, 1
adds r6, r0, r1 adds r6, r0, r1
ldrh r0, [r6] ldrh r0, [r6]
@@ -636,7 +636,7 @@ _08077CAE:
mov r1, r10 mov r1, r10
muls r1, r0 muls r1, r0
adds r0, r1, 0 adds r0, r1, 0
ldr r1, _08077D94 @ =gUnknown_202402C ldr r1, _08077D94 @ =gEnemyParty
mov r9, r1 mov r9, r1
add r0, r9 add r0, r9
movs r1, 0x39 movs r1, 0x39
@@ -732,15 +732,15 @@ _08077CD2:
bl StartSpriteAnim bl StartSpriteAnim
b _08077F84 b _08077F84
.align 2, 0 .align 2, 0
_08077D90: .4byte gUnknown_2023BCE _08077D90: .4byte gBattlerPartyIndexes
_08077D94: .4byte gUnknown_202402C _08077D94: .4byte gEnemyParty
_08077D98: .4byte gUnknown_20244DC _08077D98: .4byte gUnknown_20244DC
_08077D9C: .4byte gUnknown_2023D44 _08077D9C: .4byte gUnknown_2023D44
_08077DA0: .4byte gSprites _08077DA0: .4byte gSprites
_08077DA4: .4byte SpriteCallbackDummy _08077DA4: .4byte SpriteCallbackDummy
_08077DA8: .4byte gUnknown_2024024 _08077DA8: .4byte gUnknown_2024024
_08077DAC: _08077DAC:
ldr r0, _08077E00 @ =gUnknown_2022B4C ldr r0, _08077E00 @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
movs r2, 0x80 movs r2, 0x80
ands r1, r2 ands r1, r2
@@ -780,7 +780,7 @@ _08077DAC:
adds r0, r6, 0 adds r0, r6, 0
b _08077E54 b _08077E54
.align 2, 0 .align 2, 0
_08077E00: .4byte gUnknown_2022B4C _08077E00: .4byte gBattleTypeFlags
_08077E04: .4byte gSaveBlock2Ptr _08077E04: .4byte gSaveBlock2Ptr
_08077E08: .4byte gUnknown_20244DC _08077E08: .4byte gUnknown_20244DC
_08077E0C: .4byte gUnknown_8239F8C _08077E0C: .4byte gUnknown_8239F8C
@@ -855,7 +855,7 @@ _08077E9C: .4byte gUnknown_2023D44
_08077EA0: .4byte gSprites _08077EA0: .4byte gSprites
_08077EA4: .4byte SpriteCallbackDummy _08077EA4: .4byte SpriteCallbackDummy
_08077EA8: _08077EA8:
ldr r1, _08077FC4 @ =gUnknown_2023BCE ldr r1, _08077FC4 @ =gBattlerPartyIndexes
lsls r0, r7, 1 lsls r0, r7, 1
adds r6, r0, r1 adds r6, r0, r1
ldrh r0, [r6] ldrh r0, [r6]
@@ -864,7 +864,7 @@ _08077EA8:
mov r1, r10 mov r1, r10
muls r1, r0 muls r1, r0
adds r0, r1, 0 adds r0, r1, 0
ldr r1, _08077FC8 @ =gUnknown_2024284 ldr r1, _08077FC8 @ =gPlayerParty
mov r9, r1 mov r9, r1
add r0, r9 add r0, r9
movs r1, 0x39 movs r1, 0x39
@@ -990,8 +990,8 @@ _08077FB4:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08077FC4: .4byte gUnknown_2023BCE _08077FC4: .4byte gBattlerPartyIndexes
_08077FC8: .4byte gUnknown_2024284 _08077FC8: .4byte gPlayerParty
_08077FCC: .4byte gUnknown_20244DC _08077FCC: .4byte gUnknown_20244DC
_08077FD0: .4byte gUnknown_2023D44 _08077FD0: .4byte gUnknown_2023D44
_08077FD4: .4byte gSprites _08077FD4: .4byte gSprites
@@ -1011,7 +1011,7 @@ CreateHealthboxSprite: @ 8077FE4
bcc _08077FF4 bcc _08077FF4
b _08078166 b _08078166
_08077FF4: _08077FF4:
ldr r0, _08078010 @ =gUnknown_2022B4C ldr r0, _08078010 @ =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
movs r2, 0x80 movs r2, 0x80
ands r1, r2 ands r1, r2
@@ -1023,7 +1023,7 @@ _08077FF4:
b _0807802C b _0807802C
.align 2, 0 .align 2, 0
_0807800C: .4byte gUnknown_2023BCC _0807800C: .4byte gUnknown_2023BCC
_08078010: .4byte gUnknown_2022B4C _08078010: .4byte gBattleTypeFlags
_08078014: _08078014:
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
@@ -1053,53 +1053,53 @@ _0807802C:
cmp r0, 0 cmp r0, 0
beq _08078074 beq _08078074
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, _0807806C @ =gUnknown_2023BCE ldr r1, _0807806C @ =gBattlerPartyIndexes
lsls r4, r5, 1 lsls r4, r5, 1
adds r1, r4, r1 adds r1, r4, r1
ldrh r2, [r1] ldrh r2, [r1]
movs r1, 0x64 movs r1, 0x64
muls r1, r2 muls r1, r2
ldr r2, _08078070 @ =gUnknown_202402C ldr r2, _08078070 @ =gEnemyParty
adds r1, r2 adds r1, r2
movs r2, 0 movs r2, 0
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
b _080780C0 b _080780C0
.align 2, 0 .align 2, 0
_08078068: .4byte gUnknown_3004FF0 _08078068: .4byte gUnknown_3004FF0
_0807806C: .4byte gUnknown_2023BCE _0807806C: .4byte gBattlerPartyIndexes
_08078070: .4byte gUnknown_202402C _08078070: .4byte gEnemyParty
_08078074: _08078074:
ldr r0, _0807809C @ =gUnknown_2022B4C ldr r0, _0807809C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080780A8 beq _080780A8
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, _080780A0 @ =gUnknown_2023BCE ldr r1, _080780A0 @ =gBattlerPartyIndexes
lsls r4, r5, 1 lsls r4, r5, 1
adds r1, r4, r1 adds r1, r4, r1
ldrh r2, [r1] ldrh r2, [r1]
movs r1, 0x64 movs r1, 0x64
muls r1, r2 muls r1, r2
ldr r2, _080780A4 @ =gUnknown_2024284 ldr r2, _080780A4 @ =gPlayerParty
adds r1, r2 adds r1, r2
movs r2, 0xA movs r2, 0xA
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
b _080780C0 b _080780C0
.align 2, 0 .align 2, 0
_0807809C: .4byte gUnknown_2022B4C _0807809C: .4byte gBattleTypeFlags
_080780A0: .4byte gUnknown_2023BCE _080780A0: .4byte gBattlerPartyIndexes
_080780A4: .4byte gUnknown_2024284 _080780A4: .4byte gPlayerParty
_080780A8: _080780A8:
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, _080780EC @ =gUnknown_2023BCE ldr r1, _080780EC @ =gBattlerPartyIndexes
lsls r4, r5, 1 lsls r4, r5, 1
adds r1, r4, r1 adds r1, r4, r1
ldrh r2, [r1] ldrh r2, [r1]
movs r1, 0x64 movs r1, 0x64
muls r1, r2 muls r1, r2
ldr r2, _080780F0 @ =gUnknown_2024284 ldr r2, _080780F0 @ =gPlayerParty
adds r1, r2 adds r1, r2
movs r2, 0 movs r2, 0
bl UpdateHealthboxAttribute bl UpdateHealthboxAttribute
@@ -1124,8 +1124,8 @@ _080780DC:
bl nullsub_21 bl nullsub_21
b _08078104 b _08078104
.align 2, 0 .align 2, 0
_080780EC: .4byte gUnknown_2023BCE _080780EC: .4byte gBattlerPartyIndexes
_080780F0: .4byte gUnknown_2024284 _080780F0: .4byte gPlayerParty
_080780F4: .4byte gUnknown_3004FF0 _080780F4: .4byte gUnknown_3004FF0
_080780F8: _080780F8:
ldr r0, _08078130 @ =gUnknown_3004FF0 ldr r0, _08078130 @ =gUnknown_3004FF0
@@ -1139,12 +1139,12 @@ _08078104:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0807813C beq _0807813C
ldr r0, _08078134 @ =gUnknown_2023BCE ldr r0, _08078134 @ =gBattlerPartyIndexes
adds r0, r4, r0 adds r0, r4, r0
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08078138 @ =gUnknown_202402C ldr r1, _08078138 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x39 movs r1, 0x39
bl GetMonData bl GetMonData
@@ -1155,21 +1155,21 @@ _08078104:
b _08078166 b _08078166
.align 2, 0 .align 2, 0
_08078130: .4byte gUnknown_3004FF0 _08078130: .4byte gUnknown_3004FF0
_08078134: .4byte gUnknown_2023BCE _08078134: .4byte gBattlerPartyIndexes
_08078138: .4byte gUnknown_202402C _08078138: .4byte gEnemyParty
_0807813C: _0807813C:
ldr r0, _0807816C @ =gUnknown_2022B4C ldr r0, _0807816C @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x80 movs r1, 0x80
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _08078166 bne _08078166
ldr r0, _08078170 @ =gUnknown_2023BCE ldr r0, _08078170 @ =gBattlerPartyIndexes
adds r0, r4, r0 adds r0, r4, r0
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08078174 @ =gUnknown_2024284 ldr r1, _08078174 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x39 movs r1, 0x39
bl GetMonData bl GetMonData
@@ -1182,9 +1182,9 @@ _08078166:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0807816C: .4byte gUnknown_2022B4C _0807816C: .4byte gBattleTypeFlags
_08078170: .4byte gUnknown_2023BCE _08078170: .4byte gBattlerPartyIndexes
_08078174: .4byte gUnknown_2024284 _08078174: .4byte gPlayerParty
thumb_func_end CreateHealthboxSprite thumb_func_end CreateHealthboxSprite
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+4 -4
View File
@@ -42,7 +42,7 @@ _08141C90: .4byte gUnknown_203F3A8
sub_8141C94: @ 8141C94 sub_8141C94: @ 8141C94
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x10 sub sp, 0x10
ldr r7, _08141CB0 @ =gUnknown_202402C ldr r7, _08141CB0 @ =gEnemyParty
bl sub_80CBDB0 bl sub_80CBDB0
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -53,7 +53,7 @@ sub_8141C94: @ 8141C94
movs r6, 0xF3 movs r6, 0xF3
b _08141CBA b _08141CBA
.align 2, 0 .align 2, 0
_08141CB0: .4byte gUnknown_202402C _08141CB0: .4byte gEnemyParty
_08141CB4: _08141CB4:
movs r6, 0xF4 movs r6, 0xF4
b _08141CBA b _08141CBA
@@ -346,7 +346,7 @@ _08141EF2:
CreateRoamerMonInstance: @ 8141EF8 CreateRoamerMonInstance: @ 8141EF8
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, _08141F84 @ =gUnknown_202402C ldr r5, _08141F84 @ =gEnemyParty
bl ZeroEnemyPartyMons bl ZeroEnemyPartyMons
ldr r4, _08141F88 @ =gSaveBlock1Ptr ldr r4, _08141F88 @ =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
@@ -406,7 +406,7 @@ CreateRoamerMonInstance: @ 8141EF8
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08141F84: .4byte gUnknown_202402C _08141F84: .4byte gEnemyParty
_08141F88: .4byte gSaveBlock1Ptr _08141F88: .4byte gSaveBlock1Ptr
_08141F8C: .4byte 0x000030d0 _08141F8C: .4byte 0x000030d0
_08141F90: .4byte 0x000030dd _08141F90: .4byte 0x000030dd
+12 -12
View File
@@ -4051,7 +4051,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0806BD0C @ =gUnknown_2024284 ldr r1, _0806BD0C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0xB movs r1, 0xB
movs r2, 0 movs r2, 0
@@ -4068,7 +4068,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806BD08: .4byte gUnknown_83A7294 _0806BD08: .4byte gUnknown_83A7294
_0806BD0C: .4byte gUnknown_2024284 _0806BD0C: .4byte gPlayerParty
_0806BD10: .4byte gUnknown_8245EE0 _0806BD10: .4byte gUnknown_8245EE0
thumb_func_end ScrCmd_bufferleadmonspeciesname thumb_func_end ScrCmd_bufferleadmonspeciesname
@@ -4087,7 +4087,7 @@ ScrCmd_bufferpartymonnick: @ 806BD14
lsrs r0, 16 lsrs r0, 16
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0806BD54 @ =gUnknown_2024284 ldr r1, _0806BD54 @ =gPlayerParty
adds r0, r1 adds r0, r1
ldr r1, _0806BD58 @ =gUnknown_83A7294 ldr r1, _0806BD58 @ =gUnknown_83A7294
lsls r4, 2 lsls r4, 2
@@ -4103,7 +4103,7 @@ ScrCmd_bufferpartymonnick: @ 806BD14
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806BD54: .4byte gUnknown_2024284 _0806BD54: .4byte gPlayerParty
_0806BD58: .4byte gUnknown_83A7294 _0806BD58: .4byte gUnknown_83A7294
thumb_func_end ScrCmd_bufferpartymonnick thumb_func_end ScrCmd_bufferpartymonnick
@@ -4565,7 +4565,7 @@ _0806C0F6:
movs r0, 0x64 movs r0, 0x64
adds r1, r6, 0 adds r1, r6, 0
muls r1, r0 muls r1, r0
ldr r0, _0806C120 @ =gUnknown_2024284 ldr r0, _0806C120 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -4581,7 +4581,7 @@ _0806C116:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806C120: .4byte gUnknown_2024284 _0806C120: .4byte gPlayerParty
thumb_func_end ScrCmd_checkpartymove thumb_func_end ScrCmd_checkpartymove
thumb_func_start ScrCmd_givemoney thumb_func_start ScrCmd_givemoney
@@ -5533,7 +5533,7 @@ ScrCmd_setmonobedient: @ 806C7D4
lsrs r0, 16 lsrs r0, 16
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0806C808 @ =gUnknown_2024284 ldr r1, _0806C808 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x50 movs r1, 0x50
mov r2, sp mov r2, sp
@@ -5543,7 +5543,7 @@ ScrCmd_setmonobedient: @ 806C7D4
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806C808: .4byte gUnknown_2024284 _0806C808: .4byte gPlayerParty
thumb_func_end ScrCmd_setmonobedient thumb_func_end ScrCmd_setmonobedient
thumb_func_start ScrCmd_checkmonobedience thumb_func_start ScrCmd_checkmonobedience
@@ -5558,7 +5558,7 @@ ScrCmd_checkmonobedience: @ 806C80C
ldr r4, _0806C83C @ =gUnknown_20370D0 ldr r4, _0806C83C @ =gUnknown_20370D0
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _0806C840 @ =gUnknown_2024284 ldr r1, _0806C840 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x50 movs r1, 0x50
movs r2, 0 movs r2, 0
@@ -5570,7 +5570,7 @@ ScrCmd_checkmonobedience: @ 806C80C
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806C83C: .4byte gUnknown_20370D0 _0806C83C: .4byte gUnknown_20370D0
_0806C840: .4byte gUnknown_2024284 _0806C840: .4byte gPlayerParty
thumb_func_end ScrCmd_checkmonobedience thumb_func_end ScrCmd_checkmonobedience
thumb_func_start sub_806C844 thumb_func_start sub_806C844
@@ -5594,7 +5594,7 @@ sub_806C844: @ 806C844
bhi _0806C87A bhi _0806C87A
movs r0, 0x64 movs r0, 0x64
muls r0, r3 muls r0, r3
ldr r1, _0806C884 @ =gUnknown_2024284 ldr r1, _0806C884 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x23 movs r1, 0x23
mov r2, sp mov r2, sp
@@ -5606,7 +5606,7 @@ _0806C87A:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806C884: .4byte gUnknown_2024284 _0806C884: .4byte gPlayerParty
thumb_func_end sub_806C844 thumb_func_end sub_806C844
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
+6 -6
View File
@@ -329,7 +329,7 @@ sub_8097678: @ 8097678
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, 24 lsls r1, 24
ldr r2, _080976A0 @ =gUnknown_825E45C ldr r2, _080976A0 @ =gBitTable
lsrs r1, 22 lsrs r1, 22
adds r1, r2 adds r1, r2
ldr r2, [r1] ldr r2, [r1]
@@ -346,7 +346,7 @@ sub_8097678: @ 8097678
strh r2, [r1, 0x8] strh r2, [r1, 0x8]
bx lr bx lr
.align 2, 0 .align 2, 0
_080976A0: .4byte gUnknown_825E45C _080976A0: .4byte gBitTable
_080976A4: .4byte gUnknown_3005090 _080976A4: .4byte gUnknown_3005090
thumb_func_end sub_8097678 thumb_func_end sub_8097678
@@ -360,7 +360,7 @@ sub_80976A8: @ 80976A8
adds r2, r0 adds r2, r0
lsls r2, 3 lsls r2, 3
adds r2, r3 adds r2, r3
ldr r0, _080976CC @ =gUnknown_825E45C ldr r0, _080976CC @ =gBitTable
lsrs r1, 22 lsrs r1, 22
adds r1, r0 adds r1, r0
ldr r0, [r1] ldr r0, [r1]
@@ -370,7 +370,7 @@ sub_80976A8: @ 80976A8
bx lr bx lr
.align 2, 0 .align 2, 0
_080976C8: .4byte gUnknown_3005090 _080976C8: .4byte gUnknown_3005090
_080976CC: .4byte gUnknown_825E45C _080976CC: .4byte gBitTable
thumb_func_end sub_80976A8 thumb_func_end sub_80976A8
thumb_func_start sub_80976D0 thumb_func_start sub_80976D0
@@ -384,7 +384,7 @@ sub_80976D0: @ 80976D0
adds r2, r0 adds r2, r0
lsls r2, 3 lsls r2, 3
adds r2, r3 adds r2, r3
ldr r0, _080976FC @ =gUnknown_825E45C ldr r0, _080976FC @ =gBitTable
lsrs r1, 22 lsrs r1, 22
adds r1, r0 adds r1, r0
ldr r0, [r1] ldr r0, [r1]
@@ -396,7 +396,7 @@ sub_80976D0: @ 80976D0
b _08097702 b _08097702
.align 2, 0 .align 2, 0
_080976F8: .4byte gUnknown_3005090 _080976F8: .4byte gUnknown_3005090
_080976FC: .4byte gUnknown_825E45C _080976FC: .4byte gBitTable
_08097700: _08097700:
movs r0, 0x1 movs r0, 0x1
_08097702: _08097702:
+11 -11
View File
@@ -19,7 +19,7 @@ sp000_heal_pokemon: @ 80A0058
ldrb r0, [r0] ldrb r0, [r0]
cmp r8, r0 cmp r8, r0
bcs _080A0104 bcs _080A0104
ldr r1, _080A0118 @ =gUnknown_2024284 ldr r1, _080A0118 @ =gPlayerParty
mov r10, r1 mov r10, r1
mov r6, sp mov r6, sp
_080A0076: _080A0076:
@@ -99,7 +99,7 @@ _080A0104:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A0114: .4byte gUnknown_2024029 _080A0114: .4byte gUnknown_2024029
_080A0118: .4byte gUnknown_2024284 _080A0118: .4byte gPlayerParty
thumb_func_end sp000_heal_pokemon thumb_func_end sp000_heal_pokemon
thumb_func_start ScriptGiveMon thumb_func_start ScriptGiveMon
@@ -242,7 +242,7 @@ _080A0228:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _080A0258 @ =gUnknown_2024284 ldr r0, _080A0258 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -261,7 +261,7 @@ _080A0228:
movs r0, 0x1 movs r0, 0x1
b _080A0264 b _080A0264
.align 2, 0 .align 2, 0
_080A0258: .4byte gUnknown_2024284 _080A0258: .4byte gPlayerParty
_080A025C: _080A025C:
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x5 cmp r5, 0x5
@@ -313,7 +313,7 @@ CreateScriptedWildMon: @ 80A029C
lsls r7, r2, 16 lsls r7, r2, 16
lsrs r6, r7, 16 lsrs r6, r7, 16
bl ZeroEnemyPartyMons bl ZeroEnemyPartyMons
ldr r0, _080A02F8 @ =gUnknown_202402C ldr r0, _080A02F8 @ =gEnemyParty
mov r8, r0 mov r8, r0
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
@@ -344,7 +344,7 @@ _080A02EA:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A02F8: .4byte gUnknown_202402C _080A02F8: .4byte gEnemyParty
thumb_func_end CreateScriptedWildMon thumb_func_end CreateScriptedWildMon
thumb_func_start ScriptSetMonMoveSlot thumb_func_start ScriptSetMonMoveSlot
@@ -366,7 +366,7 @@ ScriptSetMonMoveSlot: @ 80A02FC
_080A0318: _080A0318:
movs r0, 0x64 movs r0, 0x64
muls r0, r3 muls r0, r3
ldr r1, _080A0330 @ =gUnknown_2024284 ldr r1, _080A0330 @ =gPlayerParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
bl SetMonMoveSlot bl SetMonMoveSlot
@@ -375,7 +375,7 @@ _080A0318:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A032C: .4byte gUnknown_2024029 _080A032C: .4byte gUnknown_2024029
_080A0330: .4byte gUnknown_2024284 _080A0330: .4byte gPlayerParty
thumb_func_end ScriptSetMonMoveSlot thumb_func_end ScriptSetMonMoveSlot
thumb_func_start sub_80A0334 thumb_func_start sub_80A0334
@@ -478,7 +478,7 @@ sub_80A03D8: @ 80A03D8
movs r5, 0 movs r5, 0
movs r0, 0x64 movs r0, 0x64
mov r8, r0 mov r8, r0
ldr r6, _080A0454 @ =gUnknown_2024284 ldr r6, _080A0454 @ =gPlayerParty
adds r4, r7, 0 adds r4, r7, 0
_080A03F4: _080A03F4:
ldr r0, _080A0458 @ =gUnknown_203B0D4 ldr r0, _080A0458 @ =gUnknown_203B0D4
@@ -500,7 +500,7 @@ _080A040E:
ble _080A03F4 ble _080A03F4
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
ldr r4, _080A0454 @ =gUnknown_2024284 ldr r4, _080A0454 @ =gPlayerParty
ldr r2, _080A045C @ =0x05000096 ldr r2, _080A045C @ =0x05000096
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
@@ -527,7 +527,7 @@ _080A042C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A0454: .4byte gUnknown_2024284 _080A0454: .4byte gPlayerParty
_080A0458: .4byte gUnknown_203B0D4 _080A0458: .4byte gUnknown_203B0D4
_080A045C: .4byte 0x05000096 _080A045C: .4byte 0x05000096
thumb_func_end sub_80A03D8 thumb_func_end sub_80A03D8
+11 -11
View File
@@ -104,7 +104,7 @@ _080BF9B8: .4byte gUnknown_3005090
sub_80BF9BC: @ 80BF9BC sub_80BF9BC: @ 80BF9BC
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
ldr r0, _080BF9F0 @ =gUnknown_2024284 ldr r0, _080BF9F0 @ =gPlayerParty
ldr r1, _080BF9F4 @ =gUnknown_20370C0 ldr r1, _080BF9F4 @ =gUnknown_20370C0
ldrb r1, [r1] ldrb r1, [r1]
ldr r2, _080BF9F8 @ =gUnknown_2024029 ldr r2, _080BF9F8 @ =gUnknown_2024029
@@ -126,7 +126,7 @@ sub_80BF9BC: @ 80BF9BC
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BF9F0: .4byte gUnknown_2024284 _080BF9F0: .4byte gPlayerParty
_080BF9F4: .4byte gUnknown_20370C0 _080BF9F4: .4byte gUnknown_20370C0
_080BF9F8: .4byte gUnknown_2024029 _080BF9F8: .4byte gUnknown_2024029
_080BF9FC: .4byte c2_exit_to_overworld_2_switch _080BF9FC: .4byte c2_exit_to_overworld_2_switch
@@ -147,7 +147,7 @@ _080BFA14:
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BFA4C @ =gUnknown_2024284 ldr r1, _080BFA4C @ =gPlayerParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0xD adds r1, 0xD
@@ -169,7 +169,7 @@ _080BFA32:
.align 2, 0 .align 2, 0
_080BFA44: .4byte gUnknown_20370D0 _080BFA44: .4byte gUnknown_20370D0
_080BFA48: .4byte gUnknown_20370C0 _080BFA48: .4byte gUnknown_20370C0
_080BFA4C: .4byte gUnknown_2024284 _080BFA4C: .4byte gPlayerParty
thumb_func_end ScrSpecial_CountPokemonMoves thumb_func_end ScrSpecial_CountPokemonMoves
thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName
@@ -180,7 +180,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
movs r0, 0x64 movs r0, 0x64
adds r5, r1, 0 adds r5, r1, 0
muls r5, r0 muls r5, r0
ldr r0, _080BFA94 @ =gUnknown_2024284 ldr r0, _080BFA94 @ =gPlayerParty
adds r5, r0 adds r5, r0
ldr r0, _080BFA98 @ =gUnknown_20370C2 ldr r0, _080BFA98 @ =gUnknown_20370C2
ldrh r1, [r0] ldrh r1, [r0]
@@ -204,7 +204,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BFA90: .4byte gUnknown_20370C0 _080BFA90: .4byte gUnknown_20370C0
_080BFA94: .4byte gUnknown_2024284 _080BFA94: .4byte gPlayerParty
_080BFA98: .4byte gUnknown_20370C2 _080BFA98: .4byte gUnknown_20370C2
_080BFA9C: .4byte gStringVar1 _080BFA9C: .4byte gStringVar1
_080BFAA0: .4byte gStringVar2 _080BFAA0: .4byte gStringVar2
@@ -343,7 +343,7 @@ sub_80BFBA8: @ 80BFBA8
ldrh r0, [r0] ldrh r0, [r0]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _080BFC0C @ =gUnknown_2024284 ldr r5, _080BFC0C @ =gPlayerParty
adds r0, r5 adds r0, r5
ldr r4, _080BFC10 @ =gUnknown_20370C2 ldr r4, _080BFC10 @ =gUnknown_20370C2
ldrb r2, [r4] ldrb r2, [r4]
@@ -363,7 +363,7 @@ _080BFBDA:
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BFC0C @ =gUnknown_2024284 ldr r1, _080BFC0C @ =gPlayerParty
adds r0, r1 adds r0, r1
lsls r1, r4, 24 lsls r1, r4, 24
lsrs r1, 24 lsrs r1, 24
@@ -383,7 +383,7 @@ _080BFBFC:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080BFC08: .4byte gUnknown_20370C0 _080BFC08: .4byte gUnknown_20370C0
_080BFC0C: .4byte gUnknown_2024284 _080BFC0C: .4byte gPlayerParty
_080BFC10: .4byte gUnknown_20370C2 _080BFC10: .4byte gUnknown_20370C2
thumb_func_end sub_80BFBA8 thumb_func_end sub_80BFBA8
@@ -394,7 +394,7 @@ sub_80BFC14: @ 80BFC14
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080BFC3C @ =gUnknown_2024284 ldr r1, _080BFC3C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x2D movs r1, 0x2D
bl GetMonData bl GetMonData
@@ -407,7 +407,7 @@ sub_80BFC14: @ 80BFC14
b _080BFC48 b _080BFC48
.align 2, 0 .align 2, 0
_080BFC38: .4byte gUnknown_20370C0 _080BFC38: .4byte gUnknown_20370C0
_080BFC3C: .4byte gUnknown_2024284 _080BFC3C: .4byte gPlayerParty
_080BFC40: .4byte gUnknown_20370D0 _080BFC40: .4byte gUnknown_20370D0
_080BFC44: _080BFC44:
ldr r0, _080BFC4C @ =gUnknown_20370D0 ldr r0, _080BFC4C @ =gUnknown_20370D0
+2 -2
View File
@@ -765,7 +765,7 @@ PlayCry4: @ 8071EC0
bl sub_8071F78 bl sub_8071F78
b _08071F10 b _08071F10
_08071EEA: _08071EEA:
ldr r0, _08071F18 @ =gUnknown_2022B4C ldr r0, _08071F18 @ =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
movs r1, 0x40 movs r1, 0x40
ands r0, r1 ands r0, r1
@@ -789,7 +789,7 @@ _08071F10:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08071F18: .4byte gUnknown_2022B4C _08071F18: .4byte gBattleTypeFlags
_08071F1C: .4byte gMPlay_BGM _08071F1C: .4byte gMPlay_BGM
_08071F20: .4byte 0x0000ffff _08071F20: .4byte 0x0000ffff
thumb_func_end PlayCry4 thumb_func_end PlayCry4
+10 -10
View File
@@ -3431,7 +3431,7 @@ _081334A8:
bl ItemIdToBattleMoveId bl ItemIdToBattleMoveId
lsls r0, 16 lsls r0, 16
lsrs r7, r0, 16 lsrs r7, r0, 16
ldr r1, _081334D8 @ =gUnknown_8250C04 ldr r1, _081334D8 @ =gBattleMoves
lsls r0, r7, 1 lsls r0, r7, 1
adds r0, r7 adds r0, r7
lsls r0, 2 lsls r0, 2
@@ -3450,7 +3450,7 @@ _081334A8:
ldr r2, _081334DC @ =gUnknown_8416213 ldr r2, _081334DC @ =gUnknown_8416213
b _081334F0 b _081334F0
.align 2, 0 .align 2, 0
_081334D8: .4byte gUnknown_8250C04 _081334D8: .4byte gBattleMoves
_081334DC: .4byte gUnknown_8416213 _081334DC: .4byte gUnknown_8416213
_081334E0: _081334E0:
ldr r4, _08133524 @ =gStringVar1 ldr r4, _08133524 @ =gStringVar1
@@ -3474,7 +3474,7 @@ _081334F0:
movs r1, 0x3 movs r1, 0x3
movs r3, 0x7 movs r3, 0x7
bl sub_81332EC bl sub_81332EC
ldr r2, _08133528 @ =gUnknown_8250C04 ldr r2, _08133528 @ =gBattleMoves
lsls r1, r7, 1 lsls r1, r7, 1
adds r0, r1, r7 adds r0, r1, r7
lsls r0, 2 lsls r0, 2
@@ -3487,7 +3487,7 @@ _081334F0:
b _08133540 b _08133540
.align 2, 0 .align 2, 0
_08133524: .4byte gStringVar1 _08133524: .4byte gStringVar1
_08133528: .4byte gUnknown_8250C04 _08133528: .4byte gBattleMoves
_0813352C: .4byte gUnknown_8416213 _0813352C: .4byte gUnknown_8416213
_08133530: _08133530:
ldr r4, _081335A8 @ =gStringVar1 ldr r4, _081335A8 @ =gStringVar1
@@ -3514,7 +3514,7 @@ _08133540:
movs r3, 0x7 movs r3, 0x7
bl sub_81332EC bl sub_81332EC
ldr r5, _081335A8 @ =gStringVar1 ldr r5, _081335A8 @ =gStringVar1
ldr r1, _081335AC @ =gUnknown_8250C04 ldr r1, _081335AC @ =gBattleMoves
adds r0, r6, r7 adds r0, r6, r7
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -3549,7 +3549,7 @@ _0813359A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_081335A8: .4byte gStringVar1 _081335A8: .4byte gStringVar1
_081335AC: .4byte gUnknown_8250C04 _081335AC: .4byte gBattleMoves
thumb_func_end sub_8133444 thumb_func_end sub_8133444
thumb_func_start sub_81335B0 thumb_func_start sub_81335B0
@@ -3699,7 +3699,7 @@ sub_813368C: @ 813368C
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_8133714 bl sub_8133714
ldr r0, _081336F0 @ =gUnknown_8250C04 ldr r0, _081336F0 @ =gBattleMoves
mov r8, r0 mov r8, r0
adds r0, r6, 0 adds r0, r6, 0
bl ItemIdToBattleMoveId bl ItemIdToBattleMoveId
@@ -3717,7 +3717,7 @@ sub_813368C: @ 813368C
.align 2, 0 .align 2, 0
_081336E8: .4byte gUnknown_8463220 _081336E8: .4byte gUnknown_8463220
_081336EC: .4byte gSprites _081336EC: .4byte gSprites
_081336F0: .4byte gUnknown_8250C04 _081336F0: .4byte gBattleMoves
_081336F4: _081336F4:
lsls r0, r7, 4 lsls r0, r7, 4
adds r0, r7 adds r0, r7
@@ -3898,7 +3898,7 @@ _08133822:
ldrh r0, [r5, 0x30] ldrh r0, [r5, 0x30]
adds r0, 0x1 adds r0, 0x1
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
ldr r4, _08133878 @ =gUnknown_8250C04 ldr r4, _08133878 @ =gBattleMoves
ldrh r0, [r5, 0x2E] ldrh r0, [r5, 0x2E]
bl ItemIdToBattleMoveId bl ItemIdToBattleMoveId
lsls r0, 16 lsls r0, 16
@@ -3925,7 +3925,7 @@ _08133822:
bl sub_8133790 bl sub_8133790
b _081338A2 b _081338A2
.align 2, 0 .align 2, 0
_08133878: .4byte gUnknown_8250C04 _08133878: .4byte gBattleMoves
_0813387C: .4byte 0xfffffedf _0813387C: .4byte 0xfffffedf
_08133880: _08133880:
adds r0, r1, 0 adds r0, r1, 0
+94 -94
View File
@@ -229,7 +229,7 @@ _0804C7FC:
_0804C80A: _0804C80A:
movs r0, 0x64 movs r0, 0x64
muls r0, r6 muls r0, r6
ldr r1, _0804C868 @ =gUnknown_202402C ldr r1, _0804C868 @ =gEnemyParty
adds r0, r1 adds r0, r1
str r4, [sp] str r4, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
@@ -268,7 +268,7 @@ _0804C80A:
b _0804C892 b _0804C892
.align 2, 0 .align 2, 0
_0804C864: .4byte gUnknown_2037AB8 _0804C864: .4byte gUnknown_2037AB8
_0804C868: .4byte gUnknown_202402C _0804C868: .4byte gEnemyParty
_0804C86C: .4byte gUnknown_3003F64 _0804C86C: .4byte gUnknown_3003F64
_0804C870: .4byte gUnknown_202271A _0804C870: .4byte gUnknown_202271A
_0804C874: .4byte 0x00001122 _0804C874: .4byte 0x00001122
@@ -494,7 +494,7 @@ _0804CA4A:
movs r0, 0x64 movs r0, 0x64
adds r4, r6, 0 adds r4, r6, 0
muls r4, r0 muls r4, r0
ldr r0, _0804CB3C @ =gUnknown_2024284 ldr r0, _0804CB3C @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -551,7 +551,7 @@ _0804CABE:
movs r0, 0x64 movs r0, 0x64
adds r4, r6, 0 adds r4, r6, 0
muls r4, r0 muls r4, r0
ldr r0, _0804CB48 @ =gUnknown_202402C ldr r0, _0804CB48 @ =gEnemyParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -605,10 +605,10 @@ _0804CB2C: .4byte gUnknown_2031DA8
_0804CB30: .4byte gUnknown_2024029 _0804CB30: .4byte gUnknown_2024029
_0804CB34: .4byte gUnknown_202402A _0804CB34: .4byte gUnknown_202402A
_0804CB38: .4byte gUnknown_8261E40 _0804CB38: .4byte gUnknown_8261E40
_0804CB3C: .4byte gUnknown_2024284 _0804CB3C: .4byte gPlayerParty
_0804CB40: .4byte 0xfff40000 _0804CB40: .4byte 0xfff40000
_0804CB44: .4byte sub_809718C _0804CB44: .4byte sub_809718C
_0804CB48: .4byte gUnknown_202402C _0804CB48: .4byte gEnemyParty
_0804CB4C: .4byte gMain _0804CB4C: .4byte gMain
_0804CB50: _0804CB50:
bl sub_8122550 bl sub_8122550
@@ -1183,7 +1183,7 @@ _0804D048:
movs r0, 0x64 movs r0, 0x64
adds r4, r6, 0 adds r4, r6, 0
muls r4, r0 muls r4, r0
ldr r0, _0804D13C @ =gUnknown_2024284 ldr r0, _0804D13C @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -1241,7 +1241,7 @@ _0804D0BE:
movs r0, 0x64 movs r0, 0x64
adds r4, r6, 0 adds r4, r6, 0
muls r4, r0 muls r4, r0
ldr r0, _0804D148 @ =gUnknown_202402C ldr r0, _0804D148 @ =gEnemyParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x41 movs r1, 0x41
@@ -1295,10 +1295,10 @@ _0804D12C: .4byte gUnknown_2031DA8
_0804D130: .4byte gUnknown_2024029 _0804D130: .4byte gUnknown_2024029
_0804D134: .4byte gUnknown_202402A _0804D134: .4byte gUnknown_202402A
_0804D138: .4byte gUnknown_8261E40 _0804D138: .4byte gUnknown_8261E40
_0804D13C: .4byte gUnknown_2024284 _0804D13C: .4byte gPlayerParty
_0804D140: .4byte 0xfff40000 _0804D140: .4byte 0xfff40000
_0804D144: .4byte sub_809718C _0804D144: .4byte sub_809718C
_0804D148: .4byte gUnknown_202402C _0804D148: .4byte gEnemyParty
_0804D14C: .4byte gMain _0804D14C: .4byte gMain
_0804D150: _0804D150:
bl sub_8122550 bl sub_8122550
@@ -2182,7 +2182,7 @@ _0804D860:
.4byte _0804DB14 .4byte _0804DB14
_0804D8B8: _0804D8B8:
ldr r0, _0804D8D8 @ =gUnknown_2022618 ldr r0, _0804D8D8 @ =gUnknown_2022618
ldr r1, _0804D8DC @ =gUnknown_2024284 ldr r1, _0804D8DC @ =gPlayerParty
movs r2, 0xC8 movs r2, 0xC8
bl sub_804D814 bl sub_804D814
ldr r3, _0804D8E0 @ =gUnknown_2031DA8 ldr r3, _0804D8E0 @ =gUnknown_2031DA8
@@ -2198,7 +2198,7 @@ _0804D8B8:
b _0804DB9E b _0804DB9E
.align 2, 0 .align 2, 0
_0804D8D8: .4byte gUnknown_2022618 _0804D8D8: .4byte gUnknown_2022618
_0804D8DC: .4byte gUnknown_2024284 _0804D8DC: .4byte gPlayerParty
_0804D8E0: .4byte gUnknown_2031DA8 _0804D8E0: .4byte gUnknown_2031DA8
_0804D8E4: _0804D8E4:
bl sub_800A4BC bl sub_800A4BC
@@ -2242,7 +2242,7 @@ _0804D928:
beq _0804D936 beq _0804D936
b _0804DB9E b _0804DB9E
_0804D936: _0804D936:
ldr r0, _0804D954 @ =gUnknown_202402C ldr r0, _0804D954 @ =gEnemyParty
movs r2, 0x1 movs r2, 0x1
adds r1, r5, 0 adds r1, r5, 0
eors r1, r2 eors r1, r2
@@ -2256,7 +2256,7 @@ _0804D936:
ldr r1, [r0] ldr r1, [r0]
b _0804DB96 b _0804DB96
.align 2, 0 .align 2, 0
_0804D954: .4byte gUnknown_202402C _0804D954: .4byte gEnemyParty
_0804D958: .4byte gUnknown_2022118 _0804D958: .4byte gUnknown_2022118
_0804D95C: .4byte gUnknown_2031DA8 _0804D95C: .4byte gUnknown_2031DA8
_0804D960: _0804D960:
@@ -2458,7 +2458,7 @@ _0804DAE0:
_0804DB0C: .4byte gUnknown_2031DA8 _0804DB0C: .4byte gUnknown_2031DA8
_0804DB10: .4byte gUnknown_2022118 _0804DB10: .4byte gUnknown_2022118
_0804DB14: _0804DB14:
ldr r4, _0804DB68 @ =gUnknown_202402C ldr r4, _0804DB68 @ =gEnemyParty
ldr r6, _0804DB6C @ =0x0000012f ldr r6, _0804DB6C @ =0x0000012f
movs r5, 0x5 movs r5, 0x5
_0804DB1A: _0804DB1A:
@@ -2497,7 +2497,7 @@ _0804DB5A:
movs r0, 0x1 movs r0, 0x1
b _0804DBA0 b _0804DBA0
.align 2, 0 .align 2, 0
_0804DB68: .4byte gUnknown_202402C _0804DB68: .4byte gEnemyParty
_0804DB6C: .4byte 0x0000012f _0804DB6C: .4byte 0x0000012f
_0804DB70: .4byte gUnknown_8262034 _0804DB70: .4byte gUnknown_8262034
_0804DB74: .4byte gUnknown_8246BE5 _0804DB74: .4byte gUnknown_8246BE5
@@ -3567,7 +3567,7 @@ _0804E3B6:
.align 2, 0 .align 2, 0
_0804E3D0: .4byte gUnknown_2031DA8 _0804E3D0: .4byte gUnknown_2031DA8
_0804E3D4: _0804E3D4:
ldr r0, _0804E3F4 @ =gUnknown_2024284 ldr r0, _0804E3F4 @ =gPlayerParty
ldr r1, _0804E3F8 @ =gUnknown_2024029 ldr r1, _0804E3F8 @ =gUnknown_2024029
ldrb r1, [r1] ldrb r1, [r1]
ldr r2, _0804E3FC @ =gUnknown_2031DA8 ldr r2, _0804E3FC @ =gUnknown_2031DA8
@@ -3583,7 +3583,7 @@ _0804E3D4:
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0 .align 2, 0
_0804E3F4: .4byte gUnknown_2024284 _0804E3F4: .4byte gPlayerParty
_0804E3F8: .4byte gUnknown_2024029 _0804E3F8: .4byte gUnknown_2024029
_0804E3FC: .4byte gUnknown_2031DA8 _0804E3FC: .4byte gUnknown_2031DA8
_0804E400: .4byte _0804E404 _0804E400: .4byte _0804E404
@@ -3682,7 +3682,7 @@ sub_804E494: @ 804E494
ldrb r1, [r3] ldrb r1, [r3]
cmp r1, 0x5 cmp r1, 0x5
bhi _0804E4DC bhi _0804E4DC
ldr r0, _0804E4D4 @ =gUnknown_2024284 ldr r0, _0804E4D4 @ =gPlayerParty
ldrb r1, [r3] ldrb r1, [r3]
adds r2, 0x36 adds r2, 0x36
ldrb r2, [r2] ldrb r2, [r2]
@@ -3697,10 +3697,10 @@ sub_804E494: @ 804E494
.align 2, 0 .align 2, 0
_0804E4CC: .4byte gUnknown_2037AB8 _0804E4CC: .4byte gUnknown_2037AB8
_0804E4D0: .4byte gUnknown_2031DA8 _0804E4D0: .4byte gUnknown_2031DA8
_0804E4D4: .4byte gUnknown_2024284 _0804E4D4: .4byte gPlayerParty
_0804E4D8: .4byte sub_804CF14 _0804E4D8: .4byte sub_804CF14
_0804E4DC: _0804E4DC:
ldr r0, _0804E504 @ =gUnknown_202402C ldr r0, _0804E504 @ =gEnemyParty
subs r1, 0x6 subs r1, 0x6
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@@ -3721,7 +3721,7 @@ _0804E4FC:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0804E504: .4byte gUnknown_202402C _0804E504: .4byte gEnemyParty
_0804E508: .4byte sub_804CF14 _0804E508: .4byte sub_804CF14
thumb_func_end sub_804E494 thumb_func_end sub_804E494
@@ -3736,7 +3736,7 @@ sub_804E50C: @ 804E50C
movs r4, 0 movs r4, 0
movs r3, 0 movs r3, 0
ldr r6, _0804E588 @ =gUnknown_2031DA8 ldr r6, _0804E588 @ =gUnknown_2031DA8
ldr r7, _0804E58C @ =gUnknown_202402C ldr r7, _0804E58C @ =gEnemyParty
cmp r4, r1 cmp r4, r1
bge _0804E538 bge _0804E538
_0804E524: _0804E524:
@@ -3790,7 +3790,7 @@ _0804E564:
b _0804E598 b _0804E598
.align 2, 0 .align 2, 0
_0804E588: .4byte gUnknown_2031DA8 _0804E588: .4byte gUnknown_2031DA8
_0804E58C: .4byte gUnknown_202402C _0804E58C: .4byte gEnemyParty
_0804E590: _0804E590:
cmp r4, 0 cmp r4, 0
beq _0804E596 beq _0804E596
@@ -4922,18 +4922,18 @@ sub_804EE6C: @ 804EE6C
bne _0804EE94 bne _0804EE94
movs r0, 0x64 movs r0, 0x64
muls r0, r2 muls r0, r2
ldr r1, _0804EE90 @ =gUnknown_2024284 ldr r1, _0804EE90 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
bl GetMonData bl GetMonData
b _0804EEA4 b _0804EEA4
.align 2, 0 .align 2, 0
_0804EE90: .4byte gUnknown_2024284 _0804EE90: .4byte gPlayerParty
_0804EE94: _0804EE94:
movs r0, 0x64 movs r0, 0x64
muls r0, r2 muls r0, r2
ldr r1, _0804EED0 @ =gUnknown_202402C ldr r1, _0804EED0 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
@@ -4958,7 +4958,7 @@ _0804EEA4:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0804EED0: .4byte gUnknown_202402C _0804EED0: .4byte gEnemyParty
thumb_func_end sub_804EE6C thumb_func_end sub_804EE6C
thumb_func_start sub_804EED4 thumb_func_start sub_804EED4
@@ -4988,9 +4988,9 @@ sub_804EED4: @ 804EED4
movs r0, 0x64 movs r0, 0x64
adds r5, r2, 0 adds r5, r2, 0
muls r5, r0 muls r5, r0
ldr r0, _0804EF20 @ =gUnknown_2024284 ldr r0, _0804EF20 @ =gPlayerParty
mov r9, r0 mov r9, r0
ldr r2, _0804EF24 @ =gUnknown_202402C ldr r2, _0804EF24 @ =gEnemyParty
mov r8, r2 mov r8, r2
_0804EF0E: _0804EF0E:
cmp r7, 0 cmp r7, 0
@@ -5001,8 +5001,8 @@ _0804EF0E:
b _0804EF2E b _0804EF2E
.align 2, 0 .align 2, 0
_0804EF1C: .4byte gUnknown_2031DA8 _0804EF1C: .4byte gUnknown_2031DA8
_0804EF20: .4byte gUnknown_2024284 _0804EF20: .4byte gPlayerParty
_0804EF24: .4byte gUnknown_202402C _0804EF24: .4byte gEnemyParty
_0804EF28: _0804EF28:
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0xD adds r1, 0xD
@@ -5130,10 +5130,10 @@ sub_804F020: @ 804F020
sub sp, 0x34 sub sp, 0x34
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r7, _0804F080 @ =gUnknown_202402C ldr r7, _0804F080 @ =gEnemyParty
cmp r6, 0 cmp r6, 0
bne _0804F030 bne _0804F030
ldr r7, _0804F084 @ =gUnknown_2024284 ldr r7, _0804F084 @ =gPlayerParty
_0804F030: _0804F030:
movs r4, 0 movs r4, 0
ldr r0, _0804F088 @ =gUnknown_2031DA8 ldr r0, _0804F088 @ =gUnknown_2031DA8
@@ -5174,8 +5174,8 @@ _0804F076:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0804F080: .4byte gUnknown_202402C _0804F080: .4byte gEnemyParty
_0804F084: .4byte gUnknown_2024284 _0804F084: .4byte gPlayerParty
_0804F088: .4byte gUnknown_2031DA8 _0804F088: .4byte gUnknown_2031DA8
thumb_func_end sub_804F020 thumb_func_end sub_804F020
@@ -5222,15 +5222,15 @@ sub_804F08C: @ 804F08C
bne _0804F0F0 bne _0804F0F0
movs r0, 0x64 movs r0, 0x64
muls r0, r7 muls r0, r7
ldr r1, _0804F0EC @ =gUnknown_2024284 ldr r1, _0804F0EC @ =gPlayerParty
b _0804F0F6 b _0804F0F6
.align 2, 0 .align 2, 0
_0804F0E8: .4byte gUnknown_8E9F1FC _0804F0E8: .4byte gUnknown_8E9F1FC
_0804F0EC: .4byte gUnknown_2024284 _0804F0EC: .4byte gPlayerParty
_0804F0F0: _0804F0F0:
movs r0, 0x64 movs r0, 0x64
muls r0, r7 muls r0, r7
ldr r1, _0804F16C @ =gUnknown_202402C ldr r1, _0804F16C @ =gEnemyParty
_0804F0F6: _0804F0F6:
adds r0, r1 adds r0, r1
movs r1, 0x38 movs r1, 0x38
@@ -5290,7 +5290,7 @@ _0804F148:
strh r0, [r4] strh r0, [r4]
b _0804F1B2 b _0804F1B2
.align 2, 0 .align 2, 0
_0804F16C: .4byte gUnknown_202402C _0804F16C: .4byte gEnemyParty
_0804F170: .4byte gUnknown_2031DA8 _0804F170: .4byte gUnknown_2031DA8
_0804F174: _0804F174:
mov r1, r10 mov r1, r10
@@ -5348,7 +5348,7 @@ _0804F1D4:
movs r0, 0x64 movs r0, 0x64
adds r4, r7, 0 adds r4, r7, 0
muls r4, r0 muls r4, r0
ldr r0, _0804F1FC @ =gUnknown_2024284 ldr r0, _0804F1FC @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
bl GetMonGender bl GetMonGender
@@ -5360,12 +5360,12 @@ _0804F1D4:
bl GetMonData bl GetMonData
b _0804F21E b _0804F21E
.align 2, 0 .align 2, 0
_0804F1FC: .4byte gUnknown_2024284 _0804F1FC: .4byte gPlayerParty
_0804F200: _0804F200:
movs r0, 0x64 movs r0, 0x64
adds r4, r7, 0 adds r4, r7, 0
muls r4, r0 muls r4, r0
ldr r0, _0804F22C @ =gUnknown_202402C ldr r0, _0804F22C @ =gEnemyParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
bl GetMonGender bl GetMonGender
@@ -5383,7 +5383,7 @@ _0804F21E:
movs r2, 0x83 movs r2, 0x83
b _0804F256 b _0804F256
.align 2, 0 .align 2, 0
_0804F22C: .4byte gUnknown_202402C _0804F22C: .4byte gEnemyParty
_0804F230: _0804F230:
add r0, sp, 0xC add r0, sp, 0xC
movs r1, 0 movs r1, 0
@@ -6069,7 +6069,7 @@ _0804F776:
movs r0, 0x64 movs r0, 0x64
adds r1, r7, 0 adds r1, r7, 0
muls r1, r0 muls r1, r0
ldr r0, _0804F7A4 @ =gUnknown_2024284 ldr r0, _0804F7A4 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2D movs r1, 0x2D
@@ -6088,7 +6088,7 @@ _0804F776:
b _0804F7D8 b _0804F7D8
.align 2, 0 .align 2, 0
_0804F7A0: .4byte gUnknown_2031DA8 _0804F7A0: .4byte gUnknown_2031DA8
_0804F7A4: .4byte gUnknown_2024284 _0804F7A4: .4byte gPlayerParty
_0804F7A8: _0804F7A8:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -6144,7 +6144,7 @@ _0804F80A:
movs r0, 0x64 movs r0, 0x64
adds r1, r7, 0 adds r1, r7, 0
muls r1, r0 muls r1, r0
ldr r0, _0804F838 @ =gUnknown_202402C ldr r0, _0804F838 @ =gEnemyParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2D movs r1, 0x2D
@@ -6163,7 +6163,7 @@ _0804F80A:
b _0804F86C b _0804F86C
.align 2, 0 .align 2, 0
_0804F834: .4byte gUnknown_2031DA8 _0804F834: .4byte gUnknown_2031DA8
_0804F838: .4byte gUnknown_202402C _0804F838: .4byte gEnemyParty
_0804F83C: _0804F83C:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -6234,7 +6234,7 @@ _0804F8B0:
movs r0, 0x64 movs r0, 0x64
adds r4, r6, 0 adds r4, r6, 0
muls r4, r0 muls r4, r0
ldr r0, _0804F8FC @ =gUnknown_2024284 ldr r0, _0804F8FC @ =gPlayerParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -6265,7 +6265,7 @@ _0804F8B0:
b _0804F954 b _0804F954
.align 2, 0 .align 2, 0
_0804F8F8: .4byte gUnknown_2031DA8 _0804F8F8: .4byte gUnknown_2031DA8
_0804F8FC: .4byte gUnknown_2024284 _0804F8FC: .4byte gPlayerParty
_0804F900: _0804F900:
movs r6, 0 movs r6, 0
ldr r1, _0804F95C @ =gUnknown_2031DA8 ldr r1, _0804F95C @ =gUnknown_2031DA8
@@ -6279,7 +6279,7 @@ _0804F910:
movs r0, 0x64 movs r0, 0x64
adds r4, r6, 0 adds r4, r6, 0
muls r4, r0 muls r4, r0
ldr r0, _0804F960 @ =gUnknown_202402C ldr r0, _0804F960 @ =gEnemyParty
adds r4, r0 adds r4, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -6313,7 +6313,7 @@ _0804F954:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0804F95C: .4byte gUnknown_2031DA8 _0804F95C: .4byte gUnknown_2031DA8
_0804F960: .4byte gUnknown_202402C _0804F960: .4byte gEnemyParty
thumb_func_end sub_804F890 thumb_func_end sub_804F890
thumb_func_start sub_804F964 thumb_func_start sub_804F964
@@ -6742,7 +6742,7 @@ _0804FC4E:
movs r0, 0x2 movs r0, 0x2
b _0804FCCE b _0804FCCE
_0804FC6E: _0804FC6E:
ldr r0, _0804FC88 @ =gUnknown_8254784 ldr r0, _0804FC88 @ =gBaseStats
lsls r1, r7, 3 lsls r1, r7, 3
subs r1, r7 subs r1, r7
lsls r1, 2 lsls r1, 2
@@ -6756,7 +6756,7 @@ _0804FC6E:
movs r0, 0x1 movs r0, 0x1
b _0804FCCE b _0804FCCE
.align 2, 0 .align 2, 0
_0804FC88: .4byte gUnknown_8254784 _0804FC88: .4byte gBaseStats
_0804FC8C: _0804FC8C:
movs r0, 0xCE movs r0, 0xCE
lsls r0, 1 lsls r0, 1
@@ -7243,7 +7243,7 @@ sub_804FFE4: @ 804FFE4
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r1, r0 muls r1, r0
ldr r0, _08050038 @ =gUnknown_2024284 ldr r0, _08050038 @ =gPlayerParty
adds r1, r0 adds r1, r0
mov r8, r1 mov r8, r1
movs r4, 0x1 movs r4, 0x1
@@ -7258,7 +7258,7 @@ _0805000A:
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r1, r0 muls r1, r0
ldr r0, _0805003C @ =gUnknown_202402C ldr r0, _0805003C @ =gEnemyParty
adds r1, r0 adds r1, r0
mov r8, r1 mov r8, r1
movs r4, 0x3 movs r4, 0x3
@@ -7270,8 +7270,8 @@ _08050028:
b _0805011E b _0805011E
.align 2, 0 .align 2, 0
_08050034: .4byte gUnknown_2031DA4 _08050034: .4byte gUnknown_2031DA4
_08050038: .4byte gUnknown_2024284 _08050038: .4byte gPlayerParty
_0805003C: .4byte gUnknown_202402C _0805003C: .4byte gEnemyParty
_08050040: _08050040:
mov r0, r8 mov r0, r8
movs r1, 0x41 movs r1, 0x41
@@ -7675,7 +7675,7 @@ _0805039C:
ldrb r0, [r4] ldrb r0, [r4]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r1, _0805041C @ =gUnknown_2024284 ldr r1, _0805041C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
bl GetMonData bl GetMonData
@@ -7689,7 +7689,7 @@ _0805039C:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
muls r0, r6 muls r0, r6
ldr r1, _08050424 @ =gUnknown_202402C ldr r1, _08050424 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x41 movs r1, 0x41
bl GetMonData bl GetMonData
@@ -7718,9 +7718,9 @@ _0805039C:
b _08050440 b _08050440
.align 2, 0 .align 2, 0
_08050418: .4byte gUnknown_2031DA4 _08050418: .4byte gUnknown_2031DA4
_0805041C: .4byte gUnknown_2024284 _0805041C: .4byte gPlayerParty
_08050420: .4byte gUnknown_2031DAC _08050420: .4byte gUnknown_2031DAC
_08050424: .4byte gUnknown_202402C _08050424: .4byte gEnemyParty
_08050428: .4byte gUnknown_2022744 _08050428: .4byte gUnknown_2022744
_0805042C: .4byte gMain _0805042C: .4byte gMain
_08050430: _08050430:
@@ -7952,7 +7952,7 @@ _08050628:
ldr r1, [r0] ldr r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r0, _080506DC @ =gUnknown_202402C ldr r0, _080506DC @ =gEnemyParty
movs r1, 0x7 movs r1, 0x7
mov r2, sp mov r2, sp
bl GetMonData bl GetMonData
@@ -8016,7 +8016,7 @@ _080506CC: .4byte gUnknown_2031DA4
_080506D0: .4byte gUnknown_20370C2 _080506D0: .4byte gUnknown_20370C2
_080506D4: .4byte gUnknown_2022744 _080506D4: .4byte gUnknown_2022744
_080506D8: .4byte gSaveBlock2Ptr _080506D8: .4byte gSaveBlock2Ptr
_080506DC: .4byte gUnknown_202402C _080506DC: .4byte gEnemyParty
_080506E0: .4byte gUnknown_2031DAC _080506E0: .4byte gUnknown_2031DAC
_080506E4: .4byte sub_804FF0C _080506E4: .4byte sub_804FF0C
_080506E8: .4byte gMain _080506E8: .4byte gMain
@@ -8105,7 +8105,7 @@ sub_80507A0: @ 80507A0
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r1, r0 muls r1, r0
ldr r0, _080507FC @ =gUnknown_2024284 ldr r0, _080507FC @ =gPlayerParty
adds r5, r1, r0 adds r5, r1, r0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x2D movs r1, 0x2D
@@ -8141,7 +8141,7 @@ _080507F4:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080507FC: .4byte gUnknown_2024284 _080507FC: .4byte gPlayerParty
thumb_func_end sub_80507A0 thumb_func_end sub_80507A0
thumb_func_start sub_8050800 thumb_func_start sub_8050800
@@ -8168,7 +8168,7 @@ sub_805080C: @ 805080C
movs r5, 0x64 movs r5, 0x64
mov r1, r9 mov r1, r9
muls r1, r5 muls r1, r5
ldr r0, _080508D8 @ =gUnknown_2024284 ldr r0, _080508D8 @ =gPlayerParty
adds r7, r1, r0 adds r7, r1, r0
adds r0, r7, 0 adds r0, r7, 0
movs r1, 0x40 movs r1, 0x40
@@ -8177,7 +8177,7 @@ sub_805080C: @ 805080C
lsrs r6, r0, 16 lsrs r6, r0, 16
adds r1, r4, 0 adds r1, r4, 0
muls r1, r5 muls r1, r5
ldr r0, _080508DC @ =gUnknown_202402C ldr r0, _080508DC @ =gEnemyParty
adds r5, r1, r0 adds r5, r1, r0
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x40 movs r1, 0x40
@@ -8250,8 +8250,8 @@ _080508CA:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080508D8: .4byte gUnknown_2024284 _080508D8: .4byte gPlayerParty
_080508DC: .4byte gUnknown_202402C _080508DC: .4byte gEnemyParty
_080508E0: .4byte gSaveBlock1Ptr _080508E0: .4byte gSaveBlock1Ptr
_080508E4: .4byte 0x00002cd0 _080508E4: .4byte 0x00002cd0
_080508E8: .4byte gUnknown_2031DAC _080508E8: .4byte gUnknown_2031DAC
@@ -8883,7 +8883,7 @@ sub_8050E24: @ 8050E24
lsrs r0, 24 lsrs r0, 24
movs r4, 0x64 movs r4, 0x64
muls r0, r4 muls r0, r4
ldr r1, _08050EA4 @ =gUnknown_202402C ldr r1, _08050EA4 @ =gEnemyParty
adds r0, r1 adds r0, r1
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
@@ -8893,7 +8893,7 @@ sub_8050E24: @ 8050E24
bl StringCopy10 bl StringCopy10
ldrb r0, [r5] ldrb r0, [r5]
muls r0, r4 muls r0, r4
ldr r1, _08050EAC @ =gUnknown_2024284 ldr r1, _08050EAC @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
@@ -8907,9 +8907,9 @@ _08050E94: .4byte gUnknown_2031DAC
_08050E98: .4byte gStringVar1 _08050E98: .4byte gStringVar1
_08050E9C: .4byte gUnknown_2022744 _08050E9C: .4byte gUnknown_2022744
_08050EA0: .4byte gUnknown_2031DA4 _08050EA0: .4byte gUnknown_2031DA4
_08050EA4: .4byte gUnknown_202402C _08050EA4: .4byte gEnemyParty
_08050EA8: .4byte gStringVar3 _08050EA8: .4byte gStringVar3
_08050EAC: .4byte gUnknown_2024284 _08050EAC: .4byte gPlayerParty
_08050EB0: .4byte gStringVar2 _08050EB0: .4byte gStringVar2
_08050EB4: _08050EB4:
ldr r0, _08050EF8 @ =gUnknown_20370C0 ldr r0, _08050EF8 @ =gUnknown_20370C0
@@ -8930,7 +8930,7 @@ _08050EB4:
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08050F0C @ =gUnknown_2024284 ldr r1, _08050F0C @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
@@ -8949,7 +8949,7 @@ _08050EFC: .4byte gUnknown_826CF8C
_08050F00: .4byte gStringVar1 _08050F00: .4byte gStringVar1
_08050F04: .4byte gStringVar3 _08050F04: .4byte gStringVar3
_08050F08: .4byte gUnknown_20370C2 _08050F08: .4byte gUnknown_20370C2
_08050F0C: .4byte gUnknown_2024284 _08050F0C: .4byte gPlayerParty
_08050F10: .4byte gStringVar2 _08050F10: .4byte gStringVar2
thumb_func_end sub_8050E24 thumb_func_end sub_8050E24
@@ -11059,7 +11059,7 @@ _0805223C:
ldrb r0, [r7] ldrb r0, [r7]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _08052290 @ =gUnknown_2024284 ldr r5, _08052290 @ =gPlayerParty
adds r0, r5 adds r0, r5
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
@@ -11084,7 +11084,7 @@ _08052280: .4byte gUnknown_20370C2
_08052284: .4byte gUnknown_300537C _08052284: .4byte gUnknown_300537C
_08052288: .4byte sub_8050948 _08052288: .4byte sub_8050948
_0805228C: .4byte gUnknown_2031DA4 _0805228C: .4byte gUnknown_2031DA4
_08052290: .4byte gUnknown_2024284 _08052290: .4byte gPlayerParty
_08052294: .4byte gUnknown_2031DAC _08052294: .4byte gUnknown_2031DAC
_08052298: _08052298:
movs r0, 0x1 movs r0, 0x1
@@ -13284,7 +13284,7 @@ _08053698:
ldrb r0, [r7] ldrb r0, [r7]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _080536EC @ =gUnknown_2024284 ldr r5, _080536EC @ =gPlayerParty
adds r0, r5 adds r0, r5
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
@@ -13309,7 +13309,7 @@ _080536DC: .4byte gUnknown_20370C2
_080536E0: .4byte gUnknown_300537C _080536E0: .4byte gUnknown_300537C
_080536E4: .4byte sub_8050948 _080536E4: .4byte sub_8050948
_080536E8: .4byte gUnknown_2031DA4 _080536E8: .4byte gUnknown_2031DA4
_080536EC: .4byte gUnknown_2024284 _080536EC: .4byte gPlayerParty
_080536F0: .4byte gUnknown_2031DAC _080536F0: .4byte gUnknown_2031DAC
_080536F4: _080536F4:
movs r0, 0x1 movs r0, 0x1
@@ -13412,7 +13412,7 @@ _080537B8:
ldrb r0, [r7] ldrb r0, [r7]
movs r6, 0x64 movs r6, 0x64
muls r0, r6 muls r0, r6
ldr r5, _08053800 @ =gUnknown_2024284 ldr r5, _08053800 @ =gPlayerParty
adds r0, r5 adds r0, r5
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
@@ -13436,7 +13436,7 @@ _080537B8:
_080537F4: .4byte gUnknown_300537C _080537F4: .4byte gUnknown_300537C
_080537F8: .4byte sub_8053E8C _080537F8: .4byte sub_8053E8C
_080537FC: .4byte gUnknown_2031DA4 _080537FC: .4byte gUnknown_2031DA4
_08053800: .4byte gUnknown_2024284 _08053800: .4byte gPlayerParty
_08053804: .4byte gUnknown_2031DAC _08053804: .4byte gUnknown_2031DAC
_08053808: _08053808:
mov r0, r8 mov r0, r8
@@ -13828,7 +13828,7 @@ sub_8053AE4: @ 8053AE4
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08053B38 @ =gUnknown_2024284 ldr r1, _08053B38 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
@@ -13851,7 +13851,7 @@ sub_8053AE4: @ 8053AE4
_08053B2C: .4byte gUnknown_20370C0 _08053B2C: .4byte gUnknown_20370C0
_08053B30: .4byte gUnknown_826CF8C _08053B30: .4byte gUnknown_826CF8C
_08053B34: .4byte gUnknown_20370C2 _08053B34: .4byte gUnknown_20370C2
_08053B38: .4byte gUnknown_2024284 _08053B38: .4byte gPlayerParty
_08053B3C: .4byte gStringVar1 _08053B3C: .4byte gStringVar1
_08053B40: .4byte gStringVar2 _08053B40: .4byte gStringVar2
_08053B44: .4byte gUnknown_8245EE0 _08053B44: .4byte gUnknown_8245EE0
@@ -13872,7 +13872,7 @@ sub_8053B48: @ 8053B48
adds r5, r2, r1 adds r5, r2, r1
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _08053CA8 @ =gUnknown_2024284 ldr r1, _08053CA8 @ =gPlayerParty
adds r0, r1 adds r0, r1
movs r1, 0x38 movs r1, 0x38
bl GetMonData bl GetMonData
@@ -13882,7 +13882,7 @@ sub_8053B48: @ 8053B48
add r4, sp, 0x34 add r4, sp, 0x34
movs r0, 0xFE movs r0, 0xFE
strb r0, [r4] strb r0, [r4]
ldr r6, _08053CAC @ =gUnknown_202402C ldr r6, _08053CAC @ =gEnemyParty
ldrh r1, [r5, 0xC] ldrh r1, [r5, 0xC]
movs r3, 0x1 movs r3, 0x1
str r3, [sp] str r3, [sp]
@@ -14011,8 +14011,8 @@ sub_8053B48: @ 8053B48
b _08053CC0 b _08053CC0
.align 2, 0 .align 2, 0
_08053CA4: .4byte gUnknown_826CF8C _08053CA4: .4byte gUnknown_826CF8C
_08053CA8: .4byte gUnknown_2024284 _08053CA8: .4byte gPlayerParty
_08053CAC: .4byte gUnknown_202402C _08053CAC: .4byte gEnemyParty
_08053CB0: .4byte gUnknown_2031CCC _08053CB0: .4byte gUnknown_2031CCC
_08053CB4: _08053CB4:
adds r2, r5, 0 adds r2, r5, 0
@@ -14021,14 +14021,14 @@ _08053CB4:
movs r1, 0xC movs r1, 0xC
bl sub_804037C bl sub_804037C
_08053CC0: _08053CC0:
ldr r0, _08053CD0 @ =gUnknown_202402C ldr r0, _08053CD0 @ =gEnemyParty
bl CalculateMonStats bl CalculateMonStats
add sp, 0x38 add sp, 0x38
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08053CD0: .4byte gUnknown_202402C _08053CD0: .4byte gEnemyParty
thumb_func_end sub_8053B48 thumb_func_end sub_8053B48
thumb_func_start sub_8053CD4 thumb_func_start sub_8053CD4
@@ -14085,7 +14085,7 @@ sub_8053D2C: @ 8053D2C
ldrh r0, [r6] ldrh r0, [r6]
movs r5, 0x64 movs r5, 0x64
muls r0, r5 muls r0, r5
ldr r4, _08053D5C @ =gUnknown_2024284 ldr r4, _08053D5C @ =gPlayerParty
adds r0, r4 adds r0, r4
movs r1, 0x2D movs r1, 0x2D
bl GetMonData bl GetMonData
@@ -14101,7 +14101,7 @@ sub_8053D2C: @ 8053D2C
b _08053D62 b _08053D62
.align 2, 0 .align 2, 0
_08053D58: .4byte gUnknown_20370C2 _08053D58: .4byte gUnknown_20370C2
_08053D5C: .4byte gUnknown_2024284 _08053D5C: .4byte gPlayerParty
_08053D60: _08053D60:
movs r0, 0 movs r0, 0
_08053D62: _08053D62:
@@ -14905,7 +14905,7 @@ _080544B2:
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
ldr r1, _080544F4 @ =gUnknown_202402C ldr r1, _080544F4 @ =gEnemyParty
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x43 adds r1, 0x43
@@ -14928,7 +14928,7 @@ _080544EA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080544F0: .4byte gUnknown_2031DA4 _080544F0: .4byte gUnknown_2031DA4
_080544F4: .4byte gUnknown_202402C _080544F4: .4byte gEnemyParty
_080544F8: .4byte 0x0000083b _080544F8: .4byte 0x0000083b
thumb_func_end sub_80544AC thumb_func_end sub_80544AC
+12 -12
View File
@@ -1288,7 +1288,7 @@ _0815E15C: .4byte sub_800FD9C
thumb_func_start sub_815E160 thumb_func_start sub_815E160
sub_815E160: @ 815E160 sub_815E160: @ 815E160
push {r4,lr} push {r4,lr}
ldr r4, _0815E1AC @ =gUnknown_2022B4C ldr r4, _0815E1AC @ =gBattleTypeFlags
ldr r3, _0815E1B0 @ =0x00080008 ldr r3, _0815E1B0 @ =0x00080008
str r3, [r4] str r3, [r4]
ldr r0, _0815E1B4 @ =gUnknown_203F458 ldr r0, _0815E1B4 @ =gUnknown_203F458
@@ -1304,7 +1304,7 @@ sub_815E160: @ 815E160
orrs r0, r3 orrs r0, r3
str r0, [r4] str r0, [r4]
_0815E180: _0815E180:
ldr r1, _0815E1B8 @ =gUnknown_20386AE ldr r1, _0815E1B8 @ =gTrainerBattleOpponent_A
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
bl sub_815E9FC bl sub_815E9FC
@@ -1321,10 +1321,10 @@ _0815E180:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815E1AC: .4byte gUnknown_2022B4C _0815E1AC: .4byte gBattleTypeFlags
_0815E1B0: .4byte 0x00080008 _0815E1B0: .4byte 0x00080008
_0815E1B4: .4byte gUnknown_203F458 _0815E1B4: .4byte gUnknown_203F458
_0815E1B8: .4byte gUnknown_20386AE _0815E1B8: .4byte gTrainerBattleOpponent_A
_0815E1BC: .4byte sub_815E124 _0815E1BC: .4byte sub_815E124
thumb_func_end sub_815E160 thumb_func_end sub_815E160
@@ -2434,7 +2434,7 @@ _0815EA6C:
strb r0, [r3] strb r0, [r3]
movs r0, 0x64 movs r0, 0x64
muls r0, r6 muls r0, r6
ldr r1, _0815EAD0 @ =gUnknown_202402C ldr r1, _0815EAD0 @ =gEnemyParty
adds r0, r1 adds r0, r1
ldr r1, [r5] ldr r1, [r5]
ldrb r3, [r1] ldrb r3, [r1]
@@ -2457,7 +2457,7 @@ _0815EAC0: .4byte gSaveBlock1Ptr
_0815EAC4: .4byte 0x00003d34 _0815EAC4: .4byte 0x00003d34
_0815EAC8: .4byte gUnknown_203F458 _0815EAC8: .4byte gUnknown_203F458
_0815EACC: .4byte gUnknown_847A2EE _0815EACC: .4byte gUnknown_847A2EE
_0815EAD0: .4byte gUnknown_202402C _0815EAD0: .4byte gEnemyParty
_0815EAD4: _0815EAD4:
ldr r4, _0815EB50 @ =gUnknown_847A2FE ldr r4, _0815EB50 @ =gUnknown_847A2FE
lsls r5, 1 lsls r5, 1
@@ -2472,7 +2472,7 @@ _0815EAD4:
adds r0, 0x5C adds r0, 0x5C
mov r2, r9 mov r2, r9
strb r2, [r0] strb r2, [r0]
ldr r6, _0815EB54 @ =gUnknown_202402C ldr r6, _0815EB54 @ =gEnemyParty
mov r0, r10 mov r0, r10
ldr r1, [r0] ldr r1, [r0]
ldrb r2, [r1] ldrb r2, [r1]
@@ -2521,7 +2521,7 @@ _0815EAD4:
b _0815EB9E b _0815EB9E
.align 2, 0 .align 2, 0
_0815EB50: .4byte gUnknown_847A2FE _0815EB50: .4byte gUnknown_847A2FE
_0815EB54: .4byte gUnknown_202402C _0815EB54: .4byte gEnemyParty
_0815EB58: _0815EB58:
ldr r1, _0815EBB0 @ =gUnknown_847A30E ldr r1, _0815EBB0 @ =gUnknown_847A30E
lsls r0, r5, 1 lsls r0, r5, 1
@@ -2543,7 +2543,7 @@ _0815EB58:
adds r0, 0x5C adds r0, 0x5C
mov r1, r9 mov r1, r9
strb r1, [r0] strb r1, [r0]
ldr r0, _0815EBB4 @ =gUnknown_202402C ldr r0, _0815EBB4 @ =gEnemyParty
mov r2, r10 mov r2, r10
ldr r1, [r2] ldr r1, [r2]
ldrb r4, [r1] ldrb r4, [r1]
@@ -2568,7 +2568,7 @@ _0815EB9E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815EBB0: .4byte gUnknown_847A30E _0815EBB0: .4byte gUnknown_847A30E
_0815EBB4: .4byte gUnknown_202402C _0815EBB4: .4byte gEnemyParty
thumb_func_end sub_815E9FC thumb_func_end sub_815E9FC
thumb_func_start sub_815EBB8 thumb_func_start sub_815EBB8
@@ -2580,7 +2580,7 @@ _0815EBBE:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _0815EC08 @ =gUnknown_2024284 ldr r0, _0815EC08 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0xB movs r1, 0xB
@@ -2612,7 +2612,7 @@ _0815EBF8:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0815EC08: .4byte gUnknown_2024284 _0815EC08: .4byte gPlayerParty
thumb_func_end sub_815EBB8 thumb_func_end sub_815EBB8
thumb_func_start sub_815EC0C thumb_func_start sub_815EC0C
+4 -4
View File
@@ -46,7 +46,7 @@ sub_8147AA8: @ 8147AA8
adds r0, r1 adds r0, r1
movs r1, 0x64 movs r1, 0x64
muls r1, r7 muls r1, r7
ldr r2, _08147B34 @ =gUnknown_2024284 ldr r2, _08147B34 @ =gPlayerParty
adds r1, r2 adds r1, r2
bl sub_8147D2C bl sub_8147D2C
ldr r0, [r5] ldr r0, [r5]
@@ -64,7 +64,7 @@ _08147B24: .4byte gUnknown_203F3D4
_08147B28: .4byte 0x000083b0 _08147B28: .4byte 0x000083b0
_08147B2C: .4byte sub_8147DA0 _08147B2C: .4byte sub_8147DA0
_08147B30: .4byte 0x000082a8 _08147B30: .4byte 0x000082a8
_08147B34: .4byte gUnknown_2024284 _08147B34: .4byte gPlayerParty
_08147B38: .4byte sub_8147D6C _08147B38: .4byte sub_8147D6C
_08147B3C: _08147B3C:
adds r0, r6, 0 adds r0, r6, 0
@@ -4252,7 +4252,7 @@ _08149A1C:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _08149A4C @ =gUnknown_2024284 ldr r0, _08149A4C @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x5 movs r1, 0x5
@@ -4271,7 +4271,7 @@ _08149A1C:
movs r0, 0x1 movs r0, 0x1
b _08149A5E b _08149A5E
.align 2, 0 .align 2, 0
_08149A4C: .4byte gUnknown_2024284 _08149A4C: .4byte gPlayerParty
_08149A50: .4byte gUnknown_20370D0 _08149A50: .4byte gUnknown_20370D0
_08149A54: _08149A54:
adds r5, 0x1 adds r5, 0x1
+4 -4
View File
@@ -57,7 +57,7 @@ sub_81507FC: @ 81507FC
adds r0, r1 adds r0, r1
movs r1, 0x64 movs r1, 0x64
muls r1, r6 muls r1, r6
ldr r2, _081508C0 @ =gUnknown_2024284 ldr r2, _081508C0 @ =gPlayerParty
adds r1, r2 adds r1, r2
bl sub_8152048 bl sub_8152048
ldr r0, _081508C4 @ =sub_8150A84 ldr r0, _081508C4 @ =sub_8150A84
@@ -87,7 +87,7 @@ _081508B0: .4byte 0x00003330
_081508B4: .4byte 0x000032cc _081508B4: .4byte 0x000032cc
_081508B8: .4byte 0x000031a0 _081508B8: .4byte 0x000031a0
_081508BC: .4byte 0x0000318c _081508BC: .4byte 0x0000318c
_081508C0: .4byte gUnknown_2024284 _081508C0: .4byte gPlayerParty
_081508C4: .4byte sub_8150A84 _081508C4: .4byte sub_8150A84
_081508C8: .4byte sub_815201C _081508C8: .4byte sub_815201C
_081508CC: _081508CC:
@@ -6315,7 +6315,7 @@ _081537C6:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _081537F4 @ =gUnknown_2024284 ldr r0, _081537F4 @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x5 movs r1, 0x5
@@ -6332,7 +6332,7 @@ _081537C6:
b _08153804 b _08153804
.align 2, 0 .align 2, 0
_081537F0: .4byte gUnknown_20370D0 _081537F0: .4byte gUnknown_20370D0
_081537F4: .4byte gUnknown_2024284 _081537F4: .4byte gPlayerParty
_081537F8: _081537F8:
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x5 cmp r5, 0x5
+6 -6
View File
@@ -16,7 +16,7 @@ sub_8159F40: @ 8159F40
movs r0, 0 movs r0, 0
mov r10, r0 mov r10, r0
mov r9, r0 mov r9, r0
ldr r1, _08159F90 @ =gUnknown_2022B4C ldr r1, _08159F90 @ =gBattleTypeFlags
movs r0, 0x80 movs r0, 0x80
lsls r0, 9 lsls r0, 9
str r0, [r1] str r0, [r1]
@@ -41,21 +41,21 @@ _08159F72:
movs r0, 0x64 movs r0, 0x64
mov r1, r10 mov r1, r10
muls r1, r0 muls r1, r0
ldr r0, _08159F9C @ =gUnknown_2024284 ldr r0, _08159F9C @ =gPlayerParty
adds r6, r1, r0 adds r6, r1, r0
movs r0, 0x1 movs r0, 0x1
add r10, r0 add r10, r0
b _08159FAE b _08159FAE
.align 2, 0 .align 2, 0
_08159F90: .4byte gUnknown_2022B4C _08159F90: .4byte gBattleTypeFlags
_08159F94: .4byte gUnknown_84792D0 _08159F94: .4byte gUnknown_84792D0
_08159F98: .4byte gUnknown_20370C0 _08159F98: .4byte gUnknown_20370C0
_08159F9C: .4byte gUnknown_2024284 _08159F9C: .4byte gPlayerParty
_08159FA0: _08159FA0:
movs r0, 0x64 movs r0, 0x64
mov r1, r9 mov r1, r9
muls r1, r0 muls r1, r0
ldr r0, _0815A004 @ =gUnknown_202402C ldr r0, _0815A004 @ =gEnemyParty
adds r6, r1, r0 adds r6, r1, r0
movs r2, 0x1 movs r2, 0x1
add r9, r2 add r9, r2
@@ -102,7 +102,7 @@ _08159FD4:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815A004: .4byte gUnknown_202402C _0815A004: .4byte gEnemyParty
thumb_func_end sub_8159F40 thumb_func_end sub_8159F40
thumb_func_start sub_815A008 thumb_func_start sub_815A008
+6 -6
View File
@@ -660,7 +660,7 @@ sub_810CB90: @ 810CB90
lsls r1, 4 lsls r1, 4
adds r4, r0, r1 adds r4, r0, r1
ldr r0, _0810CC58 @ =gUnknown_845318C ldr r0, _0810CC58 @ =gUnknown_845318C
ldr r1, _0810CC5C @ =gUnknown_20386AE ldr r1, _0810CC5C @ =gTrainerBattleOpponent_A
ldrh r1, [r1] ldrh r1, [r1]
bl sub_810CE10 bl sub_810CE10
mov r9, r0 mov r9, r0
@@ -741,7 +741,7 @@ _0810CBDE:
.align 2, 0 .align 2, 0
_0810CC54: .4byte gSaveBlock1Ptr _0810CC54: .4byte gSaveBlock1Ptr
_0810CC58: .4byte gUnknown_845318C _0810CC58: .4byte gUnknown_845318C
_0810CC5C: .4byte gUnknown_20386AE _0810CC5C: .4byte gTrainerBattleOpponent_A
_0810CC60: .4byte gUnknown_2036DFC _0810CC60: .4byte gUnknown_2036DFC
_0810CC64: .4byte gUnknown_2036E38 _0810CC64: .4byte gUnknown_2036E38
_0810CC68: .4byte gUnknown_8453F67 _0810CC68: .4byte gUnknown_8453F67
@@ -875,7 +875,7 @@ _0810CD48:
sub_810CD4C: @ 810CD4C sub_810CD4C: @ 810CD4C
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, _0810CD70 @ =gUnknown_845318C ldr r5, _0810CD70 @ =gUnknown_845318C
ldr r4, _0810CD74 @ =gUnknown_20386AE ldr r4, _0810CD74 @ =gTrainerBattleOpponent_A
ldrh r1, [r4] ldrh r1, [r4]
adds r0, r5, 0 adds r0, r5, 0
bl sub_810CD80 bl sub_810CD80
@@ -890,7 +890,7 @@ sub_810CD4C: @ 810CD4C
b _0810CD7A b _0810CD7A
.align 2, 0 .align 2, 0
_0810CD70: .4byte gUnknown_845318C _0810CD70: .4byte gUnknown_845318C
_0810CD74: .4byte gUnknown_20386AE _0810CD74: .4byte gTrainerBattleOpponent_A
_0810CD78: _0810CD78:
movs r0, 0x1 movs r0, 0x1
_0810CD7A: _0810CD7A:
@@ -1074,7 +1074,7 @@ _0810CEAA:
sub_810CEB4: @ 810CEB4 sub_810CEB4: @ 810CEB4
push {lr} push {lr}
ldr r0, _0810CEC8 @ =gUnknown_845318C ldr r0, _0810CEC8 @ =gUnknown_845318C
ldr r1, _0810CECC @ =gUnknown_20386AE ldr r1, _0810CECC @ =gTrainerBattleOpponent_A
ldrh r1, [r1] ldrh r1, [r1]
bl sub_810CED0 bl sub_810CED0
lsls r0, 24 lsls r0, 24
@@ -1083,7 +1083,7 @@ sub_810CEB4: @ 810CEB4
bx r1 bx r1
.align 2, 0 .align 2, 0
_0810CEC8: .4byte gUnknown_845318C _0810CEC8: .4byte gUnknown_845318C
_0810CECC: .4byte gUnknown_20386AE _0810CECC: .4byte gTrainerBattleOpponent_A
thumb_func_end sub_810CEB4 thumb_func_end sub_810CEB4
thumb_func_start sub_810CED0 thumb_func_start sub_810CED0
+10 -10
View File
@@ -420,7 +420,7 @@ sub_80829FC: @ 80829FC
bl __umodsi3 bl __umodsi3
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, _08082A38 @ =gUnknown_202402C ldr r1, _08082A38 @ =gEnemyParty
str r0, [sp] str r0, [sp]
adds r0, r1, 0 adds r0, r1, 0
adds r1, r4, 0 adds r1, r4, 0
@@ -429,7 +429,7 @@ sub_80829FC: @ 80829FC
bl CreateMonWithNature bl CreateMonWithNature
b _08082A74 b _08082A74
.align 2, 0 .align 2, 0
_08082A38: .4byte gUnknown_202402C _08082A38: .4byte gEnemyParty
_08082A3C: _08082A3C:
ldr r0, _08082A7C @ =gSaveBlock1Ptr ldr r0, _08082A7C @ =gSaveBlock1Ptr
ldr r0, [r0] ldr r0, [r0]
@@ -445,7 +445,7 @@ _08082A3C:
adds r0, r2 adds r0, r2
ldrb r0, [r0] ldrb r0, [r0]
bl sub_8082A88 bl sub_8082A88
ldr r2, _08082A84 @ =gUnknown_202402C ldr r2, _08082A84 @ =gEnemyParty
movs r1, 0x1 movs r1, 0x1
str r1, [sp] str r1, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
@@ -465,7 +465,7 @@ _08082A74:
.align 2, 0 .align 2, 0
_08082A7C: .4byte gSaveBlock1Ptr _08082A7C: .4byte gSaveBlock1Ptr
_08082A80: .4byte gUnknown_83CA71C _08082A80: .4byte gUnknown_83CA71C
_08082A84: .4byte gUnknown_202402C _08082A84: .4byte gEnemyParty
thumb_func_end sub_80829FC thumb_func_end sub_80829FC
thumb_func_start sub_8082A88 thumb_func_start sub_8082A88
@@ -722,7 +722,7 @@ sub_8082C58: @ 8082C58
ldr r5, _08082C90 @ =gUnknown_20386D0 ldr r5, _08082C90 @ =gUnknown_20386D0
movs r0, 0 movs r0, 0
strb r0, [r5, 0x9] strb r0, [r5, 0x9]
ldr r4, _08082C94 @ =gUnknown_2024284 ldr r4, _08082C94 @ =gPlayerParty
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x6 movs r1, 0x6
bl GetMonData bl GetMonData
@@ -747,7 +747,7 @@ _08082C84:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08082C90: .4byte gUnknown_20386D0 _08082C90: .4byte gUnknown_20386D0
_08082C94: .4byte gUnknown_2024284 _08082C94: .4byte gPlayerParty
thumb_func_end sub_8082C58 thumb_func_end sub_8082C58
thumb_func_start sub_8082C98 thumb_func_start sub_8082C98
@@ -1333,7 +1333,7 @@ _08083120:
movs r0, 0x64 movs r0, 0x64
adds r1, r5, 0 adds r1, r5, 0
muls r1, r0 muls r1, r0
ldr r0, _0808315C @ =gUnknown_2024284 ldr r0, _0808315C @ =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
@@ -1357,7 +1357,7 @@ _08083152:
b _0808316C b _0808316C
.align 2, 0 .align 2, 0
_08083158: .4byte 0x00004020 _08083158: .4byte 0x00004020
_0808315C: .4byte gUnknown_2024284 _0808315C: .4byte gPlayerParty
_08083160: _08083160:
adds r0, r5, 0x1 adds r0, r5, 0x1
lsls r0, 24 lsls r0, 24
@@ -1624,7 +1624,7 @@ _08083326:
lsls r4, 1 lsls r4, 1
lsrs r5, 1 lsrs r5, 1
_0808332A: _0808332A:
ldr r0, _08083368 @ =gUnknown_2024284 ldr r0, _08083368 @ =gPlayerParty
movs r1, 0xC movs r1, 0xC
bl GetMonData bl GetMonData
ldr r1, _0808336C @ =gUnknown_20386D0 ldr r1, _0808336C @ =gUnknown_20386D0
@@ -1652,7 +1652,7 @@ _08083356:
beq _08083376 beq _08083376
b _0808337A b _0808337A
.align 2, 0 .align 2, 0
_08083368: .4byte gUnknown_2024284 _08083368: .4byte gPlayerParty
_0808336C: .4byte gUnknown_20386D0 _0808336C: .4byte gUnknown_20386D0
_08083370: _08083370:
lsls r4, 1 lsls r4, 1
+1 -1
View File
@@ -1,4 +1,4 @@
.section script_data, "aw", %progbits .section script_data, "aw", %progbits
gUnknown_81D9BF4:: @ 81D9BF4 BattleAIs:: @ 81D9BF4
.incbin "baserom.gba", 0x1D9BF4, 0x20FC .incbin "baserom.gba", 0x1D9BF4, 0x20FC
+6 -12
View File
@@ -118,14 +118,8 @@ gUnknown_823A004:: @ 823A004
gUnknown_823E558:: @ 823E558 gUnknown_823E558:: @ 823E558
.incbin "baserom.gba", 0x23E558, 0x570 .incbin "baserom.gba", 0x23E558, 0x570
gUnknown_823EAC8:: @ 823EAC8 gTrainers:: @ 823EAD8
.incbin "baserom.gba", 0x23EAC8, 0x4 .incbin "baserom.gba", 0x23EAC8, 0x7418
gUnknown_823EACC:: @ 823EACC
.incbin "baserom.gba", 0x23EACC, 0xC
gUnknown_823EAD8:: @ 823EAD8
.incbin "baserom.gba", 0x23EAD8, 0x7408
gUnknown_8245EE0:: @ 8245EE0 gUnknown_8245EE0:: @ 8245EE0
.incbin "baserom.gba", 0x245EE0, 0xD05 .incbin "baserom.gba", 0x245EE0, 0xD05
@@ -301,7 +295,7 @@ gUnknown_8250A34:: @ 8250A34
gUnknown_8250B20:: @ 8250B20 gUnknown_8250B20:: @ 8250B20
.incbin "baserom.gba", 0x250B20, 0xE4 .incbin "baserom.gba", 0x250B20, 0xE4
gUnknown_8250C04:: @ 8250C04 gBattleMoves:: @ 8250C04
.incbin "baserom.gba", 0x250C04, 0x4 .incbin "baserom.gba", 0x250C04, 0x4
gUnknown_8250C08:: @ 8250C08 gUnknown_8250C08:: @ 8250C08
@@ -343,7 +337,7 @@ gUnknown_82539D4:: @ 82539D4
gUnknown_8253AE4:: @ 8253AE4 gUnknown_8253AE4:: @ 8253AE4
.incbin "baserom.gba", 0x253AE4, 0xCA0 .incbin "baserom.gba", 0x253AE4, 0xCA0
gUnknown_8254784:: @ 8254784 gBaseStats:: @ 8254784
.incbin "baserom.gba", 0x254784, 0x11 .incbin "baserom.gba", 0x254784, 0x11
gUnknown_8254795:: @ 8254795 gUnknown_8254795:: @ 8254795
@@ -409,7 +403,7 @@ gUnknown_825E074:: @ 825E074
gUnknown_825E2F4:: @ 825E2F4 gUnknown_825E2F4:: @ 825E2F4
.incbin "baserom.gba", 0x25E2F4, 0x168 .incbin "baserom.gba", 0x25E2F4, 0x168
gUnknown_825E45C:: @ 825E45C gBitTable:: @ 825E45C
.incbin "baserom.gba", 0x25E45C, 0x80 .incbin "baserom.gba", 0x25E45C, 0x80
gUnknown_825E4DC:: @ 825E4DC gUnknown_825E4DC:: @ 825E4DC
@@ -3026,7 +3020,7 @@ gUnknown_83F2EE0:: @ 83F2EE0
gUnknown_83F3024:: @ 83F3024 gUnknown_83F3024:: @ 83F3024
.incbin "baserom.gba", 0x3F3024, 0x2580 .incbin "baserom.gba", 0x3F3024, 0x2580
gUnknown_83F55A4:: @ 83F55A4 sBattleAICmdTable:: @ 83F55A4
.incbin "baserom.gba", 0x3F55A4, 0x178 .incbin "baserom.gba", 0x3F55A4, 0x178
gUnknown_83F571C:: @ 83F571C gUnknown_83F571C:: @ 83F571C
+61 -104
View File
@@ -2,6 +2,7 @@
#define GUARD_BATTLE_H #define GUARD_BATTLE_H
// should they be included here or included individually by every file? // should they be included here or included individually by every file?
#include "constants/battle.h"
#include "battle_util.h" #include "battle_util.h"
#include "battle_script_commands.h" #include "battle_script_commands.h"
#include "battle_2.h" #include "battle_2.h"
@@ -26,9 +27,6 @@
#define SIDE_PLAYER 0x0 #define SIDE_PLAYER 0x0
#define SIDE_OPPONENT 0x1 #define SIDE_OPPONENT 0x1
#define BIT_SIDE 0x1
#define BIT_MON 0x2
#define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank])) #define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank]))
#define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE)) #define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE))
#define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE)) #define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE))
@@ -72,9 +70,6 @@
#define STEVEN_PARTNER_ID 0xC03 #define STEVEN_PARTNER_ID 0xC03
#define SECRET_BASE_OPPONENT 0x400 #define SECRET_BASE_OPPONENT 0x400
#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID)
#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000)
#define BATTLE_WON 0x1 #define BATTLE_WON 0x1
#define BATTLE_LOST 0x2 #define BATTLE_LOST 0x2
#define BATTLE_DREW 0x3 #define BATTLE_DREW 0x3
@@ -100,76 +95,6 @@
#define STATUS_PSN_ANY ((STATUS_POISON | STATUS_TOXIC_POISON)) #define STATUS_PSN_ANY ((STATUS_POISON | STATUS_TOXIC_POISON))
#define STATUS_ANY ((STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON)) #define STATUS_ANY ((STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON))
#define STATUS2_CONFUSION 0x00000007
#define STATUS2_FLINCHED 0x00000008
#define STATUS2_UPROAR 0x00000070
#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200
#define STATUS2_LOCK_CONFUSE 0x00000C00
#define STATUS2_MULTIPLETURNS 0x00001000
#define STATUS2_WRAPPED 0x0000E000
#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every bank
#define STATUS2_INFATUATED_WITH(bank)((gBitTable[bank] << 16))
#define STATUS2_FOCUS_ENERGY 0x00100000
#define STATUS2_TRANSFORMED 0x00200000
#define STATUS2_RECHARGE 0x00400000
#define STATUS2_RAGE 0x00800000
#define STATUS2_SUBSTITUTE 0x01000000
#define STATUS2_DESTINY_BOND 0x02000000
#define STATUS2_ESCAPE_PREVENTION 0x04000000
#define STATUS2_NIGHTMARE 0x08000000
#define STATUS2_CURSED 0x10000000
#define STATUS2_FORESIGHT 0x20000000
#define STATUS2_DEFENSE_CURL 0x40000000
#define STATUS2_TORMENT 0x80000000
#define STATUS3_LEECHSEED_BANK 0x3
#define STATUS3_LEECHSEED 0x4
#define STATUS3_ALWAYS_HITS 0x18 // two bits
#define STATUS3_PERISH_SONG 0x20
#define STATUS3_ON_AIR 0x40
#define STATUS3_UNDERGROUND 0x80
#define STATUS3_MINIMIZED 0x100
#define STATUS3_ROOTED 0x400
#define STATUS3_CHARGED_UP 0x200
#define STATUS3_YAWN 0x1800 // two bits
#define STATUS3_IMPRISONED_OTHERS 0x2000
#define STATUS3_GRUDGE 0x4000
#define STATUS3_CANT_SCORE_A_CRIT 0x8000
#define STATUS3_MUDSPORT 0x10000
#define STATUS3_WATERSPORT 0x20000
#define STATUS3_UNDERWATER 0x40000
#define STATUS3_INTIMIDATE_POKES 0x80000
#define STATUS3_TRACE 0x100000
#define STATUS3_SEMI_INVULNERABLE ((STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER))
#define HITMARKER_x10 0x00000010
#define HITMARKER_x20 0x00000020
#define HITMARKER_DESTINYBOND 0x00000040
#define HITMARKER_NO_ANIMATIONS 0x00000080
#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100
#define HITMARKER_NO_ATTACKSTRING 0x00000200
#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400
#define HITMARKER_NO_PPDEDUCT 0x00000800
#define HITMARKER_PURSUIT_TRAP 0x00001000
#define HITMARKER_IGNORE_SAFEGUARD 0x00002000
#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000
#define HITMARKER_RUN 0x00008000
#define HITMARKER_IGNORE_ON_AIR 0x00010000
#define HITMARKER_IGNORE_UNDERGROUND 0x00020000
#define HITMARKER_IGNORE_UNDERWATER 0x00040000
#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000
#define HITMARKER_x100000 0x00100000
#define HITMARKER_x200000 0x00200000
#define HITMARKER_x400000 0x00400000
#define HITMARKER_x800000 0x00800000
#define HITMARKER_GRUDGE 0x01000000
#define HITMARKER_OBEYS 0x02000000
#define HITMARKER_x4000000 0x04000000
#define HITMARKER_x8000000 0x08000000
#define HITMARKER_FAINTED(bank) ((gBitTable[bank] << 0x1C))
#define HITMARKER_UNK(bank) ((0x10000000 << bank))
#define SIDE_STATUS_REFLECT (1 << 0) #define SIDE_STATUS_REFLECT (1 << 0)
#define SIDE_STATUS_LIGHTSCREEN (1 << 1) #define SIDE_STATUS_LIGHTSCREEN (1 << 1)
#define SIDE_STATUS_X4 (1 << 2) #define SIDE_STATUS_X4 (1 << 2)
@@ -209,20 +134,6 @@
#define MAX_TRAINER_ITEMS 4 #define MAX_TRAINER_ITEMS 4
#define MAX_MON_MOVES 4 #define MAX_MON_MOVES 4
#define WEATHER_RAIN_TEMPORARY (1 << 0)
#define WEATHER_RAIN_DOWNPOUR (1 << 1)
#define WEATHER_RAIN_PERMANENT (1 << 2)
#define WEATHER_RAIN_ANY ((WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT))
#define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
#define WEATHER_SANDSTORM_PERMANENT (1 << 4)
#define WEATHER_SANDSTORM_ANY ((WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT))
#define WEATHER_SUN_TEMPORARY (1 << 5)
#define WEATHER_SUN_PERMANENT (1 << 6)
#define WEATHER_SUN_ANY ((WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT))
#define WEATHER_HAIL (1 << 7)
#define WEATHER_HAIL_ANY ((WEATHER_HAIL))
#define WEATHER_ANY ((WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY))
#define BATTLE_TERRAIN_GRASS 0 #define BATTLE_TERRAIN_GRASS 0
#define BATTLE_TERRAIN_LONG_GRASS 1 #define BATTLE_TERRAIN_LONG_GRASS 1
#define BATTLE_TERRAIN_SAND 2 #define BATTLE_TERRAIN_SAND 2
@@ -507,19 +418,39 @@ struct AI_ThinkingStruct
u8 simulatedRNG[4]; u8 simulatedRNG[4];
}; };
struct UsedMoves extern u8 gActiveBattler;
{ extern u8 gBattlerTarget;
u16 moves[BATTLE_BANKS_COUNT]; extern u8 gAbsentBattlerFlags;
u16 unknown[BATTLE_BANKS_COUNT];
}; // TODO: move these to constants/battle.h
#define MAX_BATTLERS_COUNT 4
#define BIT_FLANK 2
// script's table id to bit
#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0)
#define AI_SCRIPT_TRY_TO_FAINT (1 << 1)
#define AI_SCRIPT_CHECK_VIABILITY (1 << 2)
#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3)
#define AI_SCRIPT_RISKY (1 << 4)
#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5)
#define AI_SCRIPT_PREFER_BATON_PASS (1 << 6)
#define AI_SCRIPT_DOUBLE_BATTLE (1 << 7)
#define AI_SCRIPT_HP_AWARE (1 << 8)
#define AI_SCRIPT_UNKNOWN (1 << 9)
// 10 - 28 are not used
#define AI_SCRIPT_ROAMING (1 << 29)
#define AI_SCRIPT_SAFARI (1 << 30)
#define AI_SCRIPT_FIRST_BATTLE (1 << 31)
extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
struct BattleHistory struct BattleHistory
{ {
struct UsedMoves usedMoves[BATTLE_BANKS_COUNT]; /*0x00*/ u16 usedMoves[2][8]; // 0xFFFF means move not used (confuse self hit, etc)
u8 abilities[BATTLE_BANKS_COUNT]; /*0x20*/ u8 abilities[MAX_BATTLERS_COUNT / 2];
u8 itemEffects[BATTLE_BANKS_COUNT]; /*0x22*/ u8 itemEffects[MAX_BATTLERS_COUNT / 2];
u16 trainerItems[BATTLE_BANKS_COUNT]; /*0x24*/ u16 trainerItems[MAX_BATTLERS_COUNT];
u8 itemsNo; /*0x2C*/ u8 itemsNo;
}; };
struct BattleScriptsStack struct BattleScriptsStack
@@ -631,10 +562,10 @@ struct BattleStruct
u8 runTries; u8 runTries;
u8 caughtMonNick[11]; u8 caughtMonNick[11];
u8 field_78; u8 field_78;
u8 field_79; u8 safariGoNearCounter;
u8 field_7A; u8 safariPkblThrowCounter;
u8 field_7B; u8 safariEscapeFactor;
u8 field_7C; u8 safariCatchFactor;
u8 field_7D; u8 field_7D;
u8 field_7E; u8 field_7E;
u8 formToChangeInto; u8 formToChangeInto;
@@ -835,6 +766,32 @@ extern struct BattleStruct* gBattleStruct;
#define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + (stage << 4) + (goesDown << 7)) #define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + (stage << 4) + (goesDown << 7))
// used in many battle files, it seems as though Hisashi Sogabe wrote
// some sort of macro to replace the use of actually calling memset.
// Perhaps it was thought calling memset was much slower?
// The compiler wont allow us to locally declare ptr in this macro; some
// functions that invoke this macro will not match without this egregeous
// assumption about the variable names, so in order to avoid this assumption,
// we opt to pass the variables themselves, even though it is likely that
// Sogabe assumed the variables were named src and dest. Trust me: I tried to
// avoid assuming variable names, but the ROM just will not match without the
// assumptions. Therefore, these macros are bad practice, but I'm putting them
// here anyway.
#define MEMSET_ALT(data, c, size, var, dest) \
{ \
dest = (u8 *)data; \
for(var = 0; var < (u32)size; var++) \
dest[var] = c; \
} \
#define MEMCPY_ALT(data, dest, size, var, src) \
{ \
src = (u8 *)data; \
for(var = 0; var < (u32)size; var++) \
dest[var] = src[var]; \
} \
struct BattleScripting struct BattleScripting
{ {
s32 painSplitHp; s32 painSplitHp;
+284
View File
@@ -0,0 +1,284 @@
#ifndef GUARD_CONSTANTS_BATTLE_H
#define GUARD_CONSTANTS_BATTLE_H
/*
* A battler may be in one of four positions on the field. The first bit determines
* what side the battler is on, either the player's side or the opponent's side.
* The second bit determines what flank the battler is on, either the left or right.
* Note that the opponent's flanks are drawn corresponding to their perspective, so
* their right mon appears on the left, and their left mon appears on the right.
* The battler ID is usually the same as the position, except in the case of link battles.
*
* + ------------------------- +
* | Opponent's side |
* | Right Left |
* | 3 1 |
* | |
* | Player's side |
* | Left Right |
* | 0 2 |
* ----------------------------+
* | |
* | |
* +---------------------------+
*/
#define MAX_BATTLERS_COUNT 4
#define B_POSITION_PLAYER_LEFT 0
#define B_POSITION_OPPONENT_LEFT 1
#define B_POSITION_PLAYER_RIGHT 2
#define B_POSITION_OPPONENT_RIGHT 3
// These macros can be used with either battler ID or positions to get the partner or the opposite mon
#define BATTLE_OPPOSITE(id) ((id) ^ 1)
#define BATTLE_PARTNER(id) ((id) ^ 2)
#define B_SIDE_PLAYER 0
#define B_SIDE_OPPONENT 1
#define B_FLANK_LEFT 0
#define B_FLANK_RIGHT 1
#define BIT_SIDE 1
#define BIT_FLANK 2
// Battle Type Flags
#define BATTLE_TYPE_DOUBLE 0x0001
#define BATTLE_TYPE_LINK 0x0002
#define BATTLE_TYPE_IS_MASTER 0x0004 // In not-link battles, it's always set.
#define BATTLE_TYPE_TRAINER 0x0008
#define BATTLE_TYPE_FIRST_BATTLE 0x0010
#define BATTLE_TYPE_20 0x0020
#define BATTLE_TYPE_MULTI 0x0040
#define BATTLE_TYPE_SAFARI 0x0080
#define BATTLE_TYPE_BATTLE_TOWER 0x0100
#define BATTLE_TYPE_WALLY_TUTORIAL 0x0200
#define BATTLE_TYPE_ROAMER 0x0400
#define BATTLE_TYPE_EREADER_TRAINER 0x0800
#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000
#define BATTLE_TYPE_LEGENDARY 0x2000
#define BATTLE_TYPE_REGI 0x4000
#define BATTLE_TYPE_TWO_OPPONENTS 0x8000
#define BATTLE_TYPE_DOME 0x10000
#define BATTLE_TYPE_PALACE 0x20000
#define BATTLE_TYPE_ARENA 0x40000
#define BATTLE_TYPE_FACTORY 0x80000
#define BATTLE_TYPE_PIKE 0x100000
#define BATTLE_TYPE_PYRAMID 0x200000
#define BATTLE_TYPE_INGAME_PARTNER 0x400000
#define BATTLE_TYPE_x800000 0x800000
#define BATTLE_TYPE_RECORDED 0x1000000
#define BATTLE_TYPE_x2000000 0x2000000
#define BATTLE_TYPE_TRAINER_HILL 0x4000000
#define BATTLE_TYPE_SECRET_BASE 0x8000000
#define BATTLE_TYPE_GROUDON 0x10000000
#define BATTLE_TYPE_KYOGRE 0x20000000
#define BATTLE_TYPE_RAYQUAZA 0x40000000
#define BATTLE_TYPE_x80000000 0x80000000
#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID)
#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE)
// Battle Outcome defines
#define B_OUTCOME_WON 0x1
#define B_OUTCOME_LOST 0x2
#define B_OUTCOME_DREW 0x3
#define B_OUTCOME_RAN 0x4
#define B_OUTCOME_PLAYER_TELEPORTED 0x5
#define B_OUTCOME_MON_FLED 0x6
#define B_OUTCOME_CAUGHT 0x7
#define B_OUTCOME_NO_SAFARI_BALLS 0x8
#define B_OUTCOME_FORFEITED 0x9
#define B_OUTCOME_MON_TELEPORTED 0xA
#define B_OUTCOME_LINK_BATTLE_RAN 0x80
// Non-volatile status conditions
// These persist remain outside of battle and after switching out
#define STATUS1_NONE 0x0
#define STATUS1_SLEEP 0x7
#define STATUS1_POISON 0x8
#define STATUS1_BURN 0x10
#define STATUS1_FREEZE 0x20
#define STATUS1_PARALYSIS 0x40
#define STATUS1_TOXIC_POISON 0x80
#define STATUS1_TOXIC_COUNTER 0xF00
#define STATUS1_PSN_ANY (STATUS1_POISON | STATUS1_TOXIC_POISON)
#define STATUS1_ANY (STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)
// Volatile status ailments
// These are removed after exiting the battle or switching out
#define STATUS2_CONFUSION 0x00000007
#define STATUS2_FLINCHED 0x00000008
#define STATUS2_UPROAR 0x00000070
#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200
#define STATUS2_LOCK_CONFUSE 0x00000C00
#define STATUS2_MULTIPLETURNS 0x00001000
#define STATUS2_WRAPPED 0x0000E000
#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every battler
#define STATUS2_INFATUATED_WITH(battler) (gBitTable[battler] << 16)
#define STATUS2_FOCUS_ENERGY 0x00100000
#define STATUS2_TRANSFORMED 0x00200000
#define STATUS2_RECHARGE 0x00400000
#define STATUS2_RAGE 0x00800000
#define STATUS2_SUBSTITUTE 0x01000000
#define STATUS2_DESTINY_BOND 0x02000000
#define STATUS2_ESCAPE_PREVENTION 0x04000000
#define STATUS2_NIGHTMARE 0x08000000
#define STATUS2_CURSED 0x10000000
#define STATUS2_FORESIGHT 0x20000000
#define STATUS2_DEFENSE_CURL 0x40000000
#define STATUS2_TORMENT 0x80000000
// Seems like per-battler statuses. Not quite sure how to categorize these
#define STATUS3_LEECHSEED_BATTLER 0x3
#define STATUS3_LEECHSEED 0x4
#define STATUS3_ALWAYS_HITS 0x18 // two bits
#define STATUS3_PERISH_SONG 0x20
#define STATUS3_ON_AIR 0x40
#define STATUS3_UNDERGROUND 0x80
#define STATUS3_MINIMIZED 0x100
#define STATUS3_ROOTED 0x400
#define STATUS3_CHARGED_UP 0x200
#define STATUS3_YAWN 0x1800 // two bits
#define STATUS3_IMPRISONED_OTHERS 0x2000
#define STATUS3_GRUDGE 0x4000
#define STATUS3_CANT_SCORE_A_CRIT 0x8000
#define STATUS3_MUDSPORT 0x10000
#define STATUS3_WATERSPORT 0x20000
#define STATUS3_UNDERWATER 0x40000
#define STATUS3_INTIMIDATE_POKES 0x80000
#define STATUS3_TRACE 0x100000
#define STATUS3_SEMI_INVULNERABLE (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER)
// Not really sure what a "hitmarker" is.
#define HITMARKER_x10 0x00000010
#define HITMARKER_x20 0x00000020
#define HITMARKER_DESTINYBOND 0x00000040
#define HITMARKER_NO_ANIMATIONS 0x00000080
#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100
#define HITMARKER_NO_ATTACKSTRING 0x00000200
#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400
#define HITMARKER_NO_PPDEDUCT 0x00000800
#define HITMARKER_SWAP_ATTACKER_TARGET 0x00001000
#define HITMARKER_IGNORE_SAFEGUARD 0x00002000
#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000
#define HITMARKER_RUN 0x00008000
#define HITMARKER_IGNORE_ON_AIR 0x00010000
#define HITMARKER_IGNORE_UNDERGROUND 0x00020000
#define HITMARKER_IGNORE_UNDERWATER 0x00040000
#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000
#define HITMARKER_x100000 0x00100000
#define HITMARKER_x200000 0x00200000
#define HITMARKER_x400000 0x00400000
#define HITMARKER_x800000 0x00800000
#define HITMARKER_GRUDGE 0x01000000
#define HITMARKER_OBEYS 0x02000000
#define HITMARKER_x4000000 0x04000000
#define HITMARKER_x8000000 0x08000000
#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C)
#define HITMARKER_UNK(battler) (0x10000000 << battler)
// Per-side statuses that affect an entire party
#define SIDE_STATUS_REFLECT (1 << 0)
#define SIDE_STATUS_LIGHTSCREEN (1 << 1)
#define SIDE_STATUS_X4 (1 << 2)
#define SIDE_STATUS_SPIKES (1 << 4)
#define SIDE_STATUS_SAFEGUARD (1 << 5)
#define SIDE_STATUS_FUTUREATTACK (1 << 6)
#define SIDE_STATUS_MIST (1 << 8)
#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9)
// Flags describing move's result
#define MOVE_RESULT_MISSED (1 << 0)
#define MOVE_RESULT_SUPER_EFFECTIVE (1 << 1)
#define MOVE_RESULT_NOT_VERY_EFFECTIVE (1 << 2)
#define MOVE_RESULT_DOESNT_AFFECT_FOE (1 << 3)
#define MOVE_RESULT_ONE_HIT_KO (1 << 4)
#define MOVE_RESULT_FAILED (1 << 5)
#define MOVE_RESULT_FOE_ENDURED (1 << 6)
#define MOVE_RESULT_FOE_HUNG_ON (1 << 7)
#define MOVE_RESULT_NO_EFFECT (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)
// Battle Weather flags
#define WEATHER_RAIN_TEMPORARY (1 << 0)
#define WEATHER_RAIN_DOWNPOUR (1 << 1) // unused
#define WEATHER_RAIN_PERMANENT (1 << 2)
#define WEATHER_RAIN_ANY (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)
#define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
#define WEATHER_SANDSTORM_PERMANENT (1 << 4)
#define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)
#define WEATHER_SUN_TEMPORARY (1 << 5)
#define WEATHER_SUN_PERMANENT (1 << 6)
#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)
#define WEATHER_HAIL (1 << 7)
#define WEATHER_HAIL_ANY (WEATHER_HAIL)
#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
// Move Effects
#define MOVE_EFFECT_SLEEP 0x1
#define MOVE_EFFECT_POISON 0x2
#define MOVE_EFFECT_BURN 0x3
#define MOVE_EFFECT_FREEZE 0x4
#define MOVE_EFFECT_PARALYSIS 0x5
#define MOVE_EFFECT_TOXIC 0x6
#define MOVE_EFFECT_CONFUSION 0x7
#define MOVE_EFFECT_FLINCH 0x8
#define MOVE_EFFECT_TRI_ATTACK 0x9
#define MOVE_EFFECT_UPROAR 0xA
#define MOVE_EFFECT_PAYDAY 0xB
#define MOVE_EFFECT_CHARGING 0xC
#define MOVE_EFFECT_WRAP 0xD
#define MOVE_EFFECT_RECOIL_25 0xE
#define MOVE_EFFECT_ATK_PLUS_1 0xF
#define MOVE_EFFECT_DEF_PLUS_1 0x10
#define MOVE_EFFECT_SPD_PLUS_1 0x11
#define MOVE_EFFECT_SP_ATK_PLUS_1 0x12
#define MOVE_EFFECT_SP_DEF_PLUS_1 0x13
#define MOVE_EFFECT_ACC_PLUS_1 0x14
#define MOVE_EFFECT_EVS_PLUS_1 0x15
#define MOVE_EFFECT_ATK_MINUS_1 0x16
#define MOVE_EFFECT_DEF_MINUS_1 0x17
#define MOVE_EFFECT_SPD_MINUS_1 0x18
#define MOVE_EFFECT_SP_ATK_MINUS_1 0x19
#define MOVE_EFFECT_SP_DEF_MINUS_1 0x1A
#define MOVE_EFFECT_ACC_MINUS_1 0x1B
#define MOVE_EFFECT_EVS_MINUS_1 0x1C
#define MOVE_EFFECT_RECHARGE 0x1D
#define MOVE_EFFECT_RAGE 0x1E
#define MOVE_EFFECT_STEAL_ITEM 0x1F
#define MOVE_EFFECT_PREVENT_ESCAPE 0x20
#define MOVE_EFFECT_NIGHTMARE 0x21
#define MOVE_EFFECT_ALL_STATS_UP 0x22
#define MOVE_EFFECT_RAPIDSPIN 0x23
#define MOVE_EFFECT_REMOVE_PARALYSIS 0x24
#define MOVE_EFFECT_ATK_DEF_DOWN 0x25
#define MOVE_EFFECT_RECOIL_33 0x26
#define MOVE_EFFECT_ATK_PLUS_2 0x27
#define MOVE_EFFECT_DEF_PLUS_2 0x28
#define MOVE_EFFECT_SPD_PLUS_2 0x29
#define MOVE_EFFECT_SP_ATK_PLUS_2 0x2A
#define MOVE_EFFECT_SP_DEF_PLUS_2 0x2B
#define MOVE_EFFECT_ACC_PLUS_2 0x2C
#define MOVE_EFFECT_EVS_PLUS_2 0x2D
#define MOVE_EFFECT_ATK_MINUS_2 0x2E
#define MOVE_EFFECT_DEF_MINUS_2 0x2F
#define MOVE_EFFECT_SPD_MINUS_2 0x30
#define MOVE_EFFECT_SP_ATK_MINUS_2 0x31
#define MOVE_EFFECT_SP_DEF_MINUS_2 0x32
#define MOVE_EFFECT_ACC_MINUS_2 0x33
#define MOVE_EFFECT_EVS_MINUS_2 0x34
#define MOVE_EFFECT_THRASH 0x35
#define MOVE_EFFECT_KNOCK_OFF 0x36
#define MOVE_EFFECT_NOTHING_37 0x37
#define MOVE_EFFECT_NOTHING_38 0x38
#define MOVE_EFFECT_NOTHING_39 0x39
#define MOVE_EFFECT_NOTHING_3A 0x3A
#define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x3B
#define MOVE_EFFECT_NOTHING_3C 0x3C
#define MOVE_EFFECT_NOTHING_3D 0x3D
#define MOVE_EFFECT_NOTHING_3E 0x3E
#define MOVE_EFFECT_NOTHING_3F 0x3F
#define MOVE_EFFECT_AFFECTS_USER 0x40
#define MOVE_EFFECT_CERTAIN 0x80
#endif // GUARD_CONSTANTS_BATTLE_H
+52
View File
@@ -0,0 +1,52 @@
#ifndef GUARD_CONSTANTS_BATTLE_AI_H
#define GUARD_CONSTANTS_BATTLE_AI_H
// battlers
#define AI_TARGET 0
#define AI_USER 1
#define AI_TARGET_PARTNER 2
#define AI_USER_PARTNER 3
// get_type command
#define AI_TYPE1_TARGET 0
#define AI_TYPE1_USER 1
#define AI_TYPE2_TARGET 2
#define AI_TYPE2_USER 3
#define AI_TYPE_MOVE 4
// type effectiveness
#define AI_EFFECTIVENESS_x4 160
#define AI_EFFECTIVENESS_x2 80
#define AI_EFFECTIVENESS_x1 40
#define AI_EFFECTIVENESS_x0_5 20
#define AI_EFFECTIVENESS_x0_25 10
#define AI_EFFECTIVENESS_x0 0
// ai weather
#define AI_WEATHER_SUN 0
#define AI_WEATHER_RAIN 1
#define AI_WEATHER_SANDSTORM 2
#define AI_WEATHER_HAIL 3
// get_how_powerful_move_is
#define MOVE_POWER_DISCOURAGED 0
#define MOVE_NOT_MOST_POWERFUL 1
#define MOVE_MOST_POWERFUL 2
// script's table id to bit
#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0)
#define AI_SCRIPT_TRY_TO_FAINT (1 << 1)
#define AI_SCRIPT_CHECK_VIABILITY (1 << 2)
#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3)
#define AI_SCRIPT_RISKY (1 << 4)
#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5)
#define AI_SCRIPT_PREFER_BATON_PASS (1 << 6)
#define AI_SCRIPT_DOUBLE_BATTLE (1 << 7)
#define AI_SCRIPT_HP_AWARE (1 << 8)
#define AI_SCRIPT_UNKNOWN (1 << 9)
// 10 - 28 are not used
#define AI_SCRIPT_ROAMING (1 << 29)
#define AI_SCRIPT_SAFARI (1 << 30)
#define AI_SCRIPT_FIRST_BATTLE (1 << 31)
#endif // GUARD_CONSTANTS_BATTLE_AI_H
+2
View File
@@ -68,4 +68,6 @@
#define WIN_RANGE(a, b) (((a) << 8) | (b)) #define WIN_RANGE(a, b) (((a) << 8) | (b))
#define NAKED __attribute__((naked))
#endif // GUARD_GBA_DEFINES #endif // GUARD_GBA_DEFINES
+18
View File
@@ -31,6 +31,24 @@ char* strcpy(char *dst0, const char *src0);
#define POKEMON_NAME_LENGTH 10 #define POKEMON_NAME_LENGTH 10
#define OT_NAME_LENGTH 7 #define OT_NAME_LENGTH 7
// There are many quirks in the source code which have overarching behavioral differences from
// a number of other files. For example, diploma.c seems to declare rodata before each use while
// other files declare out of order and must be at the beginning. There are also a number of
// macros which differ from one file to the next due to the method of obtaining the result, such
// as these below. Because of this, there is a theory (Two Team Theory) that states that these
// programming projects had more than 1 "programming team" which utilized different macros for
// each of the files that were worked on.
#define T1_READ_8(ptr) ((ptr)[0])
#define T1_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8))
#define T1_READ_32(ptr) ((ptr)[0] | ((ptr)[1] << 8) | ((ptr)[2] << 16) | ((ptr)[3] << 24))
#define T1_READ_PTR(ptr) (u8*) T1_READ_32(ptr)
// T2_READ_8 is a duplicate to remain consistent with each group.
#define T2_READ_8(ptr) ((ptr)[0])
#define T2_READ_16(ptr) ((ptr)[0] + ((ptr)[1] << 8))
#define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24))
#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr)
extern u8 gStringVar1[]; extern u8 gStringVar1[];
extern u8 gStringVar2[]; extern u8 gStringVar2[];
extern u8 gStringVar3[]; extern u8 gStringVar3[];
+1 -1
View File
@@ -168,7 +168,7 @@ SECTIONS {
asm/script_pokemon_util_80BF8FC.o(.text); asm/script_pokemon_util_80BF8FC.o(.text);
asm/heal_location.o(.text); asm/heal_location.o(.text);
asm/region_map.o(.text); asm/region_map.o(.text);
asm/battle_ai_script_commands.o(.text); src/battle_ai_script_commands.o(.text);
asm/rom6.o(.text); asm/rom6.o(.text);
asm/fldeff_flash.o(.text); asm/fldeff_flash.o(.text);
asm/post_battle_event_funcs.o(.text); asm/post_battle_event_funcs.o(.text);
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -111,7 +111,7 @@ gUnknown_3004F80: @ 3004F80
gUnknown_3004F84: @ 3004F84 gUnknown_3004F84: @ 3004F84
.space 0xC .space 0xC
gUnknown_3004F90: @ 3004F90 gBattleResults: @ 3004F90
.space 0x44 .space 0x44
gUnknown_3004FD4: @ 3004FD4 gUnknown_3004FD4: @ 3004FD4
+24 -24
View File
@@ -167,7 +167,7 @@ gUnknown_2022AD8: @ 2022AD8
gUnknown_2022AE8: @ 2022AE8 gUnknown_2022AE8: @ 2022AE8
.space 0x64 .space 0x64
gUnknown_2022B4C: @ 2022B4C gBattleTypeFlags: @ 2022B4C
.space 0x4 .space 0x4
gUnknown_2022B50: @ 2022B50 gUnknown_2022B50: @ 2022B50
@@ -206,7 +206,7 @@ gUnknown_20233C4: @ 20233C4
gUnknown_20233C8: @ 20233C8 gUnknown_20233C8: @ 20233C8
.space 0x7FC .space 0x7FC
gUnknown_2023BC4: @ 2023BC4 gActiveBattler: @ 2023BC4
.space 0x4 .space 0x4
gUnknown_2023BC8: @ 2023BC8 gUnknown_2023BC8: @ 2023BC8
@@ -215,7 +215,7 @@ gUnknown_2023BC8: @ 2023BC8
gUnknown_2023BCC: @ 2023BCC gUnknown_2023BCC: @ 2023BCC
.space 0x2 .space 0x2
gUnknown_2023BCE: @ 2023BCE gBattlerPartyIndexes: @ 2023BCE
.space 0x8 .space 0x8
gUnknown_2023BD6: @ 2023BD6 gUnknown_2023BD6: @ 2023BD6
@@ -233,7 +233,7 @@ gUnknown_2023BE2: @ 2023BE2
gUnknown_2023BE3: @ 2023BE3 gUnknown_2023BE3: @ 2023BE3
.space 0x1 .space 0x1
gUnknown_2023BE4: @ 2023BE4 gBattleMons: @ 2023BE4
.space 0xC .space 0xC
gUnknown_2023BF0: @ 2023BF0 gUnknown_2023BF0: @ 2023BF0
@@ -263,7 +263,7 @@ gUnknown_2023D48: @ 2023D48
gUnknown_2023D49: @ 2023D49 gUnknown_2023D49: @ 2023D49
.space 0x1 .space 0x1
gUnknown_2023D4A: @ 2023D4A gCurrentMove: @ 2023D4A
.space 0x2 .space 0x2
gUnknown_2023D4C: @ 2023D4C gUnknown_2023D4C: @ 2023D4C
@@ -272,7 +272,7 @@ gUnknown_2023D4C: @ 2023D4C
gUnknown_2023D4E: @ 2023D4E gUnknown_2023D4E: @ 2023D4E
.space 0x2 .space 0x2
gUnknown_2023D50: @ 2023D50 gBattleMoveDamage: @ 2023D50
.space 0x4 .space 0x4
gUnknown_2023D54: @ 2023D54 gUnknown_2023D54: @ 2023D54
@@ -287,10 +287,10 @@ gUnknown_2023D68: @ 2023D68
gUnknown_2023D6A: @ 2023D6A gUnknown_2023D6A: @ 2023D6A
.space 0x1 .space 0x1
gUnknown_2023D6B: @ 2023D6B sBattler_AI: @ 2023D6B
.space 0x1 .space 0x1
gUnknown_2023D6C: @ 2023D6C gBattlerTarget: @ 2023D6C
.space 0x1 .space 0x1
gUnknown_2023D6D: @ 2023D6D gUnknown_2023D6D: @ 2023D6D
@@ -302,10 +302,10 @@ gUnknown_2023D6E: @ 2023D6E
gUnknown_2023D6F: @ 2023D6F gUnknown_2023D6F: @ 2023D6F
.space 0x1 .space 0x1
gUnknown_2023D70: @ 2023D70 gAbsentBattlerFlags: @ 2023D70
.space 0x1 .space 0x1
gUnknown_2023D71: @ 2023D71 gCritMultiplier: @ 2023D71
.space 0x1 .space 0x1
gUnknown_2023D72: @ 2023D72 gUnknown_2023D72: @ 2023D72
@@ -323,7 +323,7 @@ gUnknown_2023D80: @ 2023D80
gUnknown_2023D90: @ 2023D90 gUnknown_2023D90: @ 2023D90
.space 0x8 .space 0x8
gUnknown_2023D98: @ 2023D98 gLastUsedMove: @ 2023D98
.space 0x8 .space 0x8
gUnknown_2023DA0: @ 2023DA0 gUnknown_2023DA0: @ 2023DA0
@@ -344,7 +344,7 @@ gUnknown_2023DC0: @ 2023DC0
gUnknown_2023DC4: @ 2023DC4 gUnknown_2023DC4: @ 2023DC4
.space 0x8 .space 0x8
gUnknown_2023DCC: @ 2023DCC gMoveResultFlags: @ 2023DCC
.space 0x4 .space 0x4
gUnknown_2023DD0: @ 2023DD0 gUnknown_2023DD0: @ 2023DD0
@@ -359,16 +359,16 @@ gUnknown_2023DD8: @ 2023DD8
gUnknown_2023DDC: @ 2023DDC gUnknown_2023DDC: @ 2023DDC
.space 0x2 .space 0x2
gUnknown_2023DDE: @ 2023DDE gSideAffecting: @ 2023DDE
.space 0x6 .space 0x6
gUnknown_2023DE4: @ 2023DE4 gUnknown_2023DE4: @ 2023DE4
.space 0x18 .space 0x18
gUnknown_2023DFC: @ 2023DFC gStatuses3: @ 2023DFC
.space 0x10 .space 0x10
gUnknown_2023E0C: @ 2023E0C gDisableStructs: @ 2023E0C
.space 0x70 .space 0x70
gUnknown_2023E7C: @ 2023E7C gUnknown_2023E7C: @ 2023E7C
@@ -395,7 +395,7 @@ gUnknown_2023E8C: @ 2023E8C
gUnknown_2023ECC: @ 2023ECC gUnknown_2023ECC: @ 2023ECC
.space 0x50 .space 0x50
gUnknown_2023F1C: @ 2023F1C gBattleWeather: @ 2023F1C
.space 0x4 .space 0x4
gUnknown_2023F20: @ 2023F20 gUnknown_2023F20: @ 2023F20
@@ -407,7 +407,7 @@ gUnknown_2023F4C: @ 2023F4C
gUnknown_2023F4E: @ 2023F4E gUnknown_2023F4E: @ 2023F4E
.space 0x2 .space 0x2
gUnknown_2023F50: @ 2023F50 gDynamicBasePower: @ 2023F50
.space 0x2 .space 0x2
gUnknown_2023F52: @ 2023F52 gUnknown_2023F52: @ 2023F52
@@ -419,13 +419,13 @@ gUnknown_2023F54: @ 2023F54
gUnknown_2023F5C: @ 2023F5C gUnknown_2023F5C: @ 2023F5C
.space 0x68 .space 0x68
gUnknown_2023FC4: @ 2023FC4 gBattleScripting: @ 2023FC4
.space 0x4 .space 0x4
gUnknown_2023FC8: @ 2023FC8 gUnknown_2023FC8: @ 2023FC8
.space 0x20 .space 0x20
gUnknown_2023FE8: @ 2023FE8 gBattleStruct: @ 2023FE8
.space 0x4 .space 0x4
gUnknown_2023FEC: @ 2023FEC gUnknown_2023FEC: @ 2023FEC
@@ -434,7 +434,7 @@ gUnknown_2023FEC: @ 2023FEC
gUnknown_2023FF0: @ 2023FF0 gUnknown_2023FF0: @ 2023FF0
.space 0x4 .space 0x4
gUnknown_2023FF4: @ 2023FF4 gBattleResources: @ 2023FF4
.space 0x4 .space 0x4
gUnknown_2023FF8: @ 2023FF8 gUnknown_2023FF8: @ 2023FF8
@@ -479,7 +479,7 @@ gUnknown_2024029: @ 2024029
gUnknown_202402A: @ 202402A gUnknown_202402A: @ 202402A
.space 0x2 .space 0x2
gUnknown_202402C: @ 202402C gEnemyParty: @ 202402C
.space 0xC8 .space 0xC8
gUnknown_20240F4: @ 20240F4 gUnknown_20240F4: @ 20240F4
@@ -494,7 +494,7 @@ gUnknown_20241BC: @ 20241BC
gUnknown_2024220: @ 2024220 gUnknown_2024220: @ 2024220
.space 0x64 .space 0x64
gUnknown_2024284: @ 2024284 gPlayerParty: @ 2024284
.space 0x64 .space 0x64
gUnknown_20242E8: @ 20242E8 gUnknown_20242E8: @ 20242E8
@@ -920,7 +920,7 @@ gUnknown_20386A8: @ 20386A8
gUnknown_20386AC: @ 20386AC gUnknown_20386AC: @ 20386AC
.space 0x2 .space 0x2
gUnknown_20386AE: @ 20386AE gTrainerBattleOpponent_A: @ 20386AE
.space 0x2 .space 0x2
gUnknown_20386B0: @ 20386B0 gUnknown_20386B0: @ 20386B0
@@ -1205,7 +1205,7 @@ gUnknown_20399F0: @ 20399F0
gUnknown_20399FC: @ 20399FC gUnknown_20399FC: @ 20399FC
.space 0x4 .space 0x4
gUnknown_2039A00: @ 2039A00 gAIScriptPtr: @ 2039A00
.space 0x4 .space 0x4
gUnknown_2039A04: @ 2039A04 gUnknown_2039A04: @ 2039A04