ported battle_controller_safari from pokeem

This commit is contained in:
jiangzhengwenjz
2019-07-29 06:47:34 +08:00
parent 935f93a075
commit a4263a6bd8
30 changed files with 2386 additions and 2770 deletions
+13 -13
View File
@@ -523,7 +523,7 @@ sub_800F5CC: @ 800F5CC
bne _0800F5E8
ldr r0, _0800F5E4 @ =gUnknown_83FE883
movs r1, 0x15
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0800F6F0
.align 2, 0
_0800F5E0: .4byte gBattleOutcome
@@ -609,10 +609,10 @@ _0800F666:
_0800F682:
ldr r0, _0800F69C @ =gUnknown_83FE874
movs r1, 0x17
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _0800F6A0 @ =gUnknown_83FE87B
movs r1, 0x16
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0800F6F0
.align 2, 0
_0800F694: .4byte gLinkPlayers
@@ -635,10 +635,10 @@ _0800F6A4:
_0800F6BC:
ldr r0, _0800F6D8 @ =gUnknown_83FE874
movs r1, 0x16
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _0800F6DC @ =gUnknown_83FE87B
movs r1, 0x17
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0800F6F0
.align 2, 0
_0800F6D0: .4byte gLinkPlayers
@@ -648,10 +648,10 @@ _0800F6DC: .4byte gUnknown_83FE87B
_0800F6E0:
ldr r0, _0800F6F4 @ =gUnknown_83FE874
movs r1, 0x17
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _0800F6F8 @ =gUnknown_83FE87B
movs r1, 0x16
bl sub_80D87BC
bl BattlePutTextOnWindow
_0800F6F0:
pop {r0}
bx r0
@@ -727,14 +727,14 @@ _0800F764:
_0800F76E:
adds r0, r1, 0
movs r1, 0x11
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x4
b _0800F79C
_0800F77C:
adds r0, r1, 0
movs r1, 0x12
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x4
str r0, [sp]
@@ -744,7 +744,7 @@ _0800F77C:
_0800F790:
adds r0, r1, 0
movs r1, 0x13
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x8
_0800F79C:
@@ -758,7 +758,7 @@ _0800F7A2:
_0800F7AA:
adds r0, r1, 0
movs r1, 0x14
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r1, [r4, 0x18]
movs r0, 0x8
str r0, [sp]
@@ -799,14 +799,14 @@ _0800F7F0:
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0xF
bl sub_80D87BC
bl BattlePutTextOnWindow
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
adds r1, r0, r4
adds r0, r1, 0
movs r1, 0x10
bl sub_80D87BC
bl BattlePutTextOnWindow
movs r4, 0x7
str r4, [sp]
adds r0, r7, 0
+77 -77
View File
@@ -1295,13 +1295,13 @@ _0801084C:
lsls r0, 24
cmp r0, 0
beq _080108B8
ldr r2, _08010884 @ =gUnknown_3004F80
ldr r2, _08010884 @ =gPreBattleCallback1
ldr r1, _08010888 @ =gMain
ldr r0, [r1]
str r0, [r2]
ldr r0, _0801088C @ =sub_80123E4
str r0, [r1]
ldr r0, _08010890 @ =sub_8011100
ldr r0, _08010890 @ =BattleMainCB2
bl SetMainCallback2
ldr r2, _08010894 @ =gBattleTypeFlags
ldr r1, [r2]
@@ -1315,10 +1315,10 @@ _0801084C:
b _080108B8
.align 2, 0
_08010880: .4byte gUnknown_2023E83
_08010884: .4byte gUnknown_3004F80
_08010884: .4byte gPreBattleCallback1
_08010888: .4byte gMain
_0801088C: .4byte sub_80123E4
_08010890: .4byte sub_8011100
_08010890: .4byte BattleMainCB2
_08010894: .4byte gBattleTypeFlags
_08010898:
ldr r0, _080108C0 @ =gUnknown_2023E82
@@ -2299,13 +2299,13 @@ _08011084:
lsls r0, 24
cmp r0, 0
beq _080110F0
ldr r2, _080110BC @ =gUnknown_3004F80
ldr r2, _080110BC @ =gPreBattleCallback1
ldr r1, _080110C0 @ =gMain
ldr r0, [r1]
str r0, [r2]
ldr r0, _080110C4 @ =sub_80123E4
str r0, [r1]
ldr r0, _080110C8 @ =sub_8011100
ldr r0, _080110C8 @ =BattleMainCB2
bl SetMainCallback2
ldr r2, _080110CC @ =gBattleTypeFlags
ldr r1, [r2]
@@ -2319,10 +2319,10 @@ _08011084:
b _080110F0
.align 2, 0
_080110B8: .4byte gUnknown_2023E83
_080110BC: .4byte gUnknown_3004F80
_080110BC: .4byte gPreBattleCallback1
_080110C0: .4byte gMain
_080110C4: .4byte sub_80123E4
_080110C8: .4byte sub_8011100
_080110C8: .4byte BattleMainCB2
_080110CC: .4byte gBattleTypeFlags
_080110D0:
ldr r0, _080110FC @ =gUnknown_2023E82
@@ -2353,8 +2353,8 @@ _080110F0:
_080110FC: .4byte gUnknown_2023E82
thumb_func_end sub_8010BA0
thumb_func_start sub_8011100
sub_8011100: @ 8011100
thumb_func_start BattleMainCB2
BattleMainCB2: @ 8011100
push {lr}
sub sp, 0x4
bl AnimateSprites
@@ -2401,13 +2401,13 @@ _08011164: .4byte gBattleTypeFlags
_08011168: .4byte gSpecialVar_Result
_0801116C: .4byte gBattleOutcome
_08011170: .4byte CB2_QuitRecordedBattle
thumb_func_end sub_8011100
thumb_func_end BattleMainCB2
thumb_func_start FreeRestoreBattleData
FreeRestoreBattleData: @ 8011174
push {lr}
ldr r1, _080111AC @ =gMain
ldr r0, _080111B0 @ =gUnknown_3004F80
ldr r0, _080111B0 @ =gPreBattleCallback1
ldr r0, [r0]
str r0, [r1]
ldr r2, _080111B4 @ =gScanlineEffect
@@ -2430,7 +2430,7 @@ FreeRestoreBattleData: @ 8011174
bx r0
.align 2, 0
_080111AC: .4byte gMain
_080111B0: .4byte gUnknown_3004F80
_080111B0: .4byte gPreBattleCallback1
_080111B4: .4byte gScanlineEffect
_080111B8: .4byte 0x00000439
thumb_func_end FreeRestoreBattleData
@@ -4803,7 +4803,7 @@ sub_80123E4: @ 80123E4
ldrb r0, [r0]
cmp r0, 0
beq _0801241E
ldr r5, _08012430 @ =gUnknown_3004FE0
ldr r5, _08012430 @ =gBattlerControllerFuncs
adds r4, r1, 0
_08012400:
ldrb r0, [r4]
@@ -4828,7 +4828,7 @@ _0801241E:
_08012424: .4byte gUnknown_3004F84
_08012428: .4byte gActiveBattler
_0801242C: .4byte gBattlersCount
_08012430: .4byte gUnknown_3004FE0
_08012430: .4byte gBattlerControllerFuncs
thumb_func_end sub_80123E4
thumb_func_start sub_8012434
@@ -4968,7 +4968,7 @@ _08012522:
strb r1, [r0]
ldr r2, _08012728 @ =gBattleOutcome
strb r1, [r2]
ldr r0, _0801272C @ =gUnknown_2023BC8
ldr r0, _0801272C @ =gBattleControllerExecFlags
str r1, [r0]
movs r2, 0
ldr r0, _08012730 @ =gUnknown_2023E7E
@@ -5195,7 +5195,7 @@ _0801271C: .4byte gSaveBlock2Ptr
_08012720: .4byte gBattleScripting
_08012724: .4byte gUnknown_2023D72
_08012728: .4byte gBattleOutcome
_0801272C: .4byte gUnknown_2023BC8
_0801272C: .4byte gBattleControllerExecFlags
_08012730: .4byte gUnknown_2023E7E
_08012734: .4byte gUnknown_2023E82
_08012738: .4byte gUnknown_2023E7C
@@ -5425,7 +5425,7 @@ _080128F0:
_0801290C:
movs r5, 0
ldr r7, _08012B80 @ =gBattleStruct
ldr r3, _08012B84 @ =gUnknown_2023FF8
ldr r3, _08012B84 @ =gActionSelectionCursor
mov r10, r3
ldr r6, _08012B88 @ =gBattlersCount
ldrb r6, [r6]
@@ -5747,7 +5747,7 @@ _08012B3C:
.align 2, 0
_08012B7C: .4byte gBattleMons
_08012B80: .4byte gBattleStruct
_08012B84: .4byte gUnknown_2023FF8
_08012B84: .4byte gActionSelectionCursor
_08012B88: .4byte gBattlersCount
_08012B8C: .4byte gUnknown_2023C34
_08012B90: .4byte gBitTable
@@ -5776,7 +5776,7 @@ sub_8012BC8: @ 8012BC8
movs r3, 0
ldr r7, _08012F5C @ =gActiveBattler
ldr r6, _08012F60 @ =gStatuses3
ldr r0, _08012F64 @ =gUnknown_2023FF8
ldr r0, _08012F64 @ =gActionSelectionCursor
mov r8, r0
ldr r1, _08012F68 @ =gUnknown_2023FFC
mov r9, r1
@@ -6239,7 +6239,7 @@ _08012F04:
.align 2, 0
_08012F5C: .4byte gActiveBattler
_08012F60: .4byte gStatuses3
_08012F64: .4byte gUnknown_2023FF8
_08012F64: .4byte gActionSelectionCursor
_08012F68: .4byte gUnknown_2023FFC
_08012F6C: .4byte gUnknown_2023E8C
_08012F70: .4byte gBattleMons
@@ -6288,7 +6288,7 @@ _08012FC0:
.align 2, 0
_08012FE0: .4byte gActiveBattler
_08012FE4:
ldr r0, _08013008 @ =gUnknown_2023BC8
ldr r0, _08013008 @ =gBattleControllerExecFlags
ldr r2, [r0]
cmp r2, 0
bne _0801301A
@@ -6306,7 +6306,7 @@ _08012FE4:
str r0, [r1]
b _0801301A
.align 2, 0
_08013008: .4byte gUnknown_2023BC8
_08013008: .4byte gBattleControllerExecFlags
_0801300C: .4byte gBattlersCount
_08013010: .4byte gUnknown_3004F84
_08013014: .4byte BattleIntroPrepareBackgroundSlide
@@ -6321,7 +6321,7 @@ _0801301A:
thumb_func_start BattleIntroPrepareBackgroundSlide
BattleIntroPrepareBackgroundSlide: @ 8013020
push {r4,r5,lr}
ldr r0, _08013058 @ =gUnknown_2023BC8
ldr r0, _08013058 @ =gBattleControllerExecFlags
ldr r5, [r0]
cmp r5, 0
bne _08013050
@@ -6346,7 +6346,7 @@ _08013050:
pop {r0}
bx r0
.align 2, 0
_08013058: .4byte gUnknown_2023BC8
_08013058: .4byte gBattleControllerExecFlags
_0801305C: .4byte gActiveBattler
_08013060: .4byte gUnknown_2022B50
_08013064: .4byte gUnknown_3004F84
@@ -6361,7 +6361,7 @@ sub_8013070: @ 8013070
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r0, _080130D4 @ =gUnknown_2023BC8
ldr r0, _080130D4 @ =gBattleControllerExecFlags
ldr r1, [r0]
cmp r1, 0
beq _08013084
@@ -6409,7 +6409,7 @@ _080130C6:
bls _080130C6
b _080131B6
.align 2, 0
_080130D4: .4byte gUnknown_2023BC8
_080130D4: .4byte gBattleControllerExecFlags
_080130D8: .4byte gActiveBattler
_080130DC: .4byte gBattlersCount
_080130E0: .4byte gBattleMons
@@ -6699,7 +6699,7 @@ BattleIntroDrawPartySummaryScreens: @ 801333C
mov r7, r8
push {r7}
sub sp, 0x30
ldr r0, _08013394 @ =gUnknown_2023BC8
ldr r0, _08013394 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _0801334E
@@ -6742,7 +6742,7 @@ _0801338C:
movs r0, 0
b _080133B6
.align 2, 0
_08013394: .4byte gUnknown_2023BC8
_08013394: .4byte gBattleControllerExecFlags
_08013398: .4byte gBattleTypeFlags
_0801339C: .4byte gEnemyParty
_080133A0: .4byte 0x0000ffff
@@ -6897,7 +6897,7 @@ _080134D8: .4byte sub_8013514
thumb_func_start BattleIntroPrintTrainerWantsToBattle
BattleIntroPrintTrainerWantsToBattle: @ 80134DC
push {lr}
ldr r0, _08013504 @ =gUnknown_2023BC8
ldr r0, _08013504 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _080134FE
@@ -6915,7 +6915,7 @@ _080134FE:
pop {r0}
bx r0
.align 2, 0
_08013504: .4byte gUnknown_2023BC8
_08013504: .4byte gBattleControllerExecFlags
_08013508: .4byte gActiveBattler
_0801350C: .4byte gUnknown_3004F84
_08013510: .4byte sub_8013568
@@ -6924,7 +6924,7 @@ _08013510: .4byte sub_8013568
thumb_func_start sub_8013514
sub_8013514: @ 8013514
push {lr}
ldr r0, _08013550 @ =gUnknown_2023BC8
ldr r0, _08013550 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801354A
@@ -6951,7 +6951,7 @@ _0801354A:
pop {r0}
bx r0
.align 2, 0
_08013550: .4byte gUnknown_2023BC8
_08013550: .4byte gBattleControllerExecFlags
_08013554: .4byte gUnknown_3004F84
_08013558: .4byte sub_80136E4
_0801355C: .4byte gBattleTypeFlags
@@ -6962,7 +6962,7 @@ _08013564: .4byte gUnknown_81D91A1
thumb_func_start sub_8013568
sub_8013568: @ 8013568
push {lr}
ldr r0, _08013590 @ =gUnknown_2023BC8
ldr r0, _08013590 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801358A
@@ -6980,7 +6980,7 @@ _0801358A:
pop {r0}
bx r0
.align 2, 0
_08013590: .4byte gUnknown_2023BC8
_08013590: .4byte gBattleControllerExecFlags
_08013594: .4byte gUnknown_3004F84
_08013598: .4byte sub_801359C
thumb_func_end sub_8013568
@@ -6988,7 +6988,7 @@ _08013598: .4byte sub_801359C
thumb_func_start sub_801359C
sub_801359C: @ 801359C
push {r4,lr}
ldr r0, _08013614 @ =gUnknown_2023BC8
ldr r0, _08013614 @ =gBattleControllerExecFlags
ldr r1, [r0]
cmp r1, 0
bne _0801360C
@@ -7046,7 +7046,7 @@ _0801360C:
pop {r0}
bx r0
.align 2, 0
_08013614: .4byte gUnknown_2023BC8
_08013614: .4byte gBattleControllerExecFlags
_08013618: .4byte gActiveBattler
_0801361C: .4byte gBattlersCount
_08013620: .4byte gBattleTypeFlags
@@ -7057,7 +7057,7 @@ _08013628: .4byte sub_801362C
thumb_func_start sub_801362C
sub_801362C: @ 801362C
push {r4-r7,lr}
ldr r0, _080136A4 @ =gUnknown_2023BC8
ldr r0, _080136A4 @ =gBattleControllerExecFlags
ldr r1, [r0]
cmp r1, 0
bne _0801369C
@@ -7117,7 +7117,7 @@ _0801369C:
pop {r0}
bx r0
.align 2, 0
_080136A4: .4byte gUnknown_2023BC8
_080136A4: .4byte gBattleControllerExecFlags
_080136A8: .4byte gActiveBattler
_080136AC: .4byte gBattlersCount
_080136B0: .4byte gBattleMons
@@ -7130,7 +7130,7 @@ _080136C0: .4byte sub_80136E4
thumb_func_start sub_80136C4
sub_80136C4: @ 80136C4
push {lr}
ldr r0, _080136D8 @ =gUnknown_2023BC8
ldr r0, _080136D8 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _080136D4
@@ -7141,7 +7141,7 @@ _080136D4:
pop {r0}
bx r0
.align 2, 0
_080136D8: .4byte gUnknown_2023BC8
_080136D8: .4byte gBattleControllerExecFlags
_080136DC: .4byte gUnknown_3004F84
_080136E0: .4byte sub_80136E4
thumb_func_end sub_80136C4
@@ -7149,7 +7149,7 @@ _080136E0: .4byte sub_80136E4
thumb_func_start sub_80136E4
sub_80136E4: @ 80136E4
push {lr}
ldr r0, _08013718 @ =gUnknown_2023BC8
ldr r0, _08013718 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08013712
@@ -7174,7 +7174,7 @@ _08013712:
pop {r0}
bx r0
.align 2, 0
_08013718: .4byte gUnknown_2023BC8
_08013718: .4byte gBattleControllerExecFlags
_0801371C: .4byte gBattleTypeFlags
_08013720: .4byte gUnknown_3004F84
_08013724: .4byte sub_8013728
@@ -7183,7 +7183,7 @@ _08013724: .4byte sub_8013728
thumb_func_start sub_8013728
sub_8013728: @ 8013728
push {r4,lr}
ldr r0, _080137B4 @ =gUnknown_2023BC8
ldr r0, _080137B4 @ =gBattleControllerExecFlags
ldr r1, [r0]
cmp r1, 0
bne _080137AC
@@ -7251,7 +7251,7 @@ _080137AC:
pop {r0}
bx r0
.align 2, 0
_080137B4: .4byte gUnknown_2023BC8
_080137B4: .4byte gBattleControllerExecFlags
_080137B8: .4byte gActiveBattler
_080137BC: .4byte gBattlersCount
_080137C0: .4byte gBattleTypeFlags
@@ -7263,7 +7263,7 @@ _080137CC: .4byte sub_801385C
thumb_func_start sub_80137D0
sub_80137D0: @ 80137D0
push {r4,r5,lr}
ldr r0, _08013840 @ =gUnknown_2023BC8
ldr r0, _08013840 @ =gBattleControllerExecFlags
ldr r1, [r0]
cmp r1, 0
bne _0801383A
@@ -7320,7 +7320,7 @@ _0801383A:
pop {r0}
bx r0
.align 2, 0
_08013840: .4byte gUnknown_2023BC8
_08013840: .4byte gBattleControllerExecFlags
_08013844: .4byte gActiveBattler
_08013848: .4byte gBattlersCount
_0801384C: .4byte gBattlerPartyIndexes
@@ -7338,7 +7338,7 @@ sub_801385C: @ 801385C
sub sp, 0x8
movs r0, 0
mov r9, r0
ldr r0, _080138A0 @ =gUnknown_2023BC8
ldr r0, _080138A0 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _08013874
@@ -7368,7 +7368,7 @@ _0801389A:
movs r5, 0
b _080138F0
.align 2, 0
_080138A0: .4byte gUnknown_2023BC8
_080138A0: .4byte gBattleControllerExecFlags
_080138A4: .4byte gBattleStruct
_080138A8: .4byte gBattlersCount
_080138AC: .4byte gUnknown_2023BDE
@@ -7685,7 +7685,7 @@ _08013B18: .4byte gUnknown_2023E80
thumb_func_start sub_8013B1C
sub_8013B1C: @ 8013B1C
push {r4-r6,lr}
ldr r0, _08013BB4 @ =gUnknown_2023BC8
ldr r0, _08013BB4 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08013BAC
@@ -7764,7 +7764,7 @@ _08013BAC:
pop {r0}
bx r0
.align 2, 0
_08013BB4: .4byte gUnknown_2023BC8
_08013BB4: .4byte gBattleControllerExecFlags
_08013BB8: .4byte gUnknown_3004F84
_08013BBC: .4byte sub_8013BD4
_08013BC0: .4byte gBattlersCount
@@ -8515,7 +8515,7 @@ _080141BC:
_080141D4: .4byte gUnknown_2023D7C
_080141D8: .4byte gUnknown_20233C4
_080141DC:
ldr r4, _08014234 @ =gUnknown_2023BC8
ldr r4, _08014234 @ =gBattleControllerExecFlags
ldr r1, _08014238 @ =gBitTable
ldr r3, _0801423C @ =gActiveBattler
ldrb r5, [r3]
@@ -8560,7 +8560,7 @@ _08014228:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08014234: .4byte gUnknown_2023BC8
_08014234: .4byte gBattleControllerExecFlags
_08014238: .4byte gBitTable
_0801423C: .4byte gActiveBattler
_08014240: .4byte gUnknown_2023D7C
@@ -9162,7 +9162,7 @@ _08014750:
_0801475C: .4byte gUnknown_2023E82
_08014760: .4byte gActiveBattler
_08014764:
ldr r4, _080147A8 @ =gUnknown_2023BC8
ldr r4, _080147A8 @ =gBattleControllerExecFlags
ldr r1, _080147AC @ =gBitTable
ldr r3, _080147B0 @ =gActiveBattler
ldrb r5, [r3]
@@ -9199,7 +9199,7 @@ _0801479E:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080147A8: .4byte gUnknown_2023BC8
_080147A8: .4byte gBattleControllerExecFlags
_080147AC: .4byte gBitTable
_080147B0: .4byte gActiveBattler
_080147B4: .4byte gUnknown_2023D7C
@@ -9552,7 +9552,7 @@ _08014A8C:
_08014A98: .4byte gUnknown_2023E82
_08014A9C: .4byte gActiveBattler
_08014AA0:
ldr r3, _08014B08 @ =gUnknown_2023BC8
ldr r3, _08014B08 @ =gBattleControllerExecFlags
ldr r4, _08014B0C @ =gBitTable
ldr r0, _08014B10 @ =gActiveBattler
ldrb r0, [r0]
@@ -9605,7 +9605,7 @@ _08014AFE:
bl EmitLinkStandbyMsg
b _08014B24
.align 2, 0
_08014B08: .4byte gUnknown_2023BC8
_08014B08: .4byte gBattleControllerExecFlags
_08014B0C: .4byte gBitTable
_08014B10: .4byte gActiveBattler
_08014B14: .4byte gBattleTypeFlags
@@ -9632,7 +9632,7 @@ _08014B32:
_08014B3C: .4byte gActiveBattler
_08014B40: .4byte gUnknown_2023E82
_08014B44:
ldr r3, _08014B78 @ =gUnknown_2023BC8
ldr r3, _08014B78 @ =gBattleControllerExecFlags
ldr r1, _08014B7C @ =gBitTable
ldr r0, _08014B80 @ =gActiveBattler
ldrb r0, [r0]
@@ -9658,7 +9658,7 @@ _08014B44:
strb r0, [r1, 0x4]
b _08014C4E
.align 2, 0
_08014B78: .4byte gUnknown_2023BC8
_08014B78: .4byte gBattleControllerExecFlags
_08014B7C: .4byte gBitTable
_08014B80: .4byte gActiveBattler
_08014B84: .4byte gUnknown_2023E82
@@ -9693,7 +9693,7 @@ _08014BB4:
adds r0, r6
ldr r4, [r0]
str r4, [r7]
ldr r3, _08014C14 @ =gUnknown_2023BC8
ldr r3, _08014C14 @ =gBattleControllerExecFlags
ldr r1, _08014C18 @ =gBitTable
ldrb r0, [r5]
lsls r0, 2
@@ -9729,11 +9729,11 @@ _08014BFA:
_08014C08: .4byte sBattler_AI
_08014C0C: .4byte gUnknown_2023D74
_08014C10: .4byte gUnknown_2023D80
_08014C14: .4byte gUnknown_2023BC8
_08014C14: .4byte gBattleControllerExecFlags
_08014C18: .4byte gBitTable
_08014C1C: .4byte gUnknown_825011C
_08014C20:
ldr r3, _08014C88 @ =gUnknown_2023BC8
ldr r3, _08014C88 @ =gBattleControllerExecFlags
ldr r1, _08014C8C @ =gBitTable
ldr r0, _08014C90 @ =gActiveBattler
ldrb r4, [r0]
@@ -9789,7 +9789,7 @@ _08014C78:
pop {r0}
bx r0
.align 2, 0
_08014C88: .4byte gUnknown_2023BC8
_08014C88: .4byte gBattleControllerExecFlags
_08014C8C: .4byte gBitTable
_08014C90: .4byte gActiveBattler
_08014C94: .4byte gUnknown_2023E82
@@ -11449,7 +11449,7 @@ _080159D0:
ldr r0, _080159F8 @ =sub_8015A30
str r0, [r1]
ldr r1, _080159FC @ =gUnknown_300537C
ldr r0, _08015A00 @ =sub_8011100
ldr r0, _08015A00 @ =BattleMainCB2
str r0, [r1]
b _08015A1E
.align 2, 0
@@ -11458,9 +11458,9 @@ _080159F0: .4byte gBattleTypeFlags
_080159F4: .4byte gUnknown_3004F84
_080159F8: .4byte sub_8015A30
_080159FC: .4byte gUnknown_300537C
_08015A00: .4byte sub_8011100
_08015A00: .4byte BattleMainCB2
_08015A04:
ldr r0, _08015A24 @ =gUnknown_2023BC8
ldr r0, _08015A24 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08015A1E
@@ -11477,7 +11477,7 @@ _08015A1E:
pop {r0}
bx r0
.align 2, 0
_08015A24: .4byte gUnknown_2023BC8
_08015A24: .4byte gBattleControllerExecFlags
_08015A28: .4byte gUnknown_825011C
_08015A2C: .4byte gUnknown_2023D74
thumb_func_end sub_8015910
@@ -11611,7 +11611,7 @@ sub_8015B30: @ 8015B30
push {lr}
ldr r0, _08015B48 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _08015B4C @ =sub_8011100
ldr r0, _08015B4C @ =BattleMainCB2
cmp r1, r0
bne _08015B42
ldr r1, _08015B50 @ =gUnknown_3004F84
@@ -11622,7 +11622,7 @@ _08015B42:
bx r0
.align 2, 0
_08015B48: .4byte gMain
_08015B4C: .4byte sub_8011100
_08015B4C: .4byte BattleMainCB2
_08015B50: .4byte gUnknown_3004F84
_08015B54: .4byte sub_8015AA0
thumb_func_end sub_8015B30
@@ -11664,7 +11664,7 @@ _08015B86:
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r0, _08015BF8 @ =gUnknown_3004F80
ldr r0, _08015BF8 @ =gPreBattleCallback1
ldr r0, [r0]
str r0, [r3]
movs r0, 0x80
@@ -11701,7 +11701,7 @@ _08015BE8: .4byte gSpecialVar_Result
_08015BEC: .4byte gBattleOutcome
_08015BF0: .4byte gMain
_08015BF4: .4byte 0x00000439
_08015BF8: .4byte gUnknown_3004F80
_08015BF8: .4byte gPreBattleCallback1
_08015BFC: .4byte gEnemyParty
thumb_func_end ReturnFromBattleToOverworld
@@ -11742,7 +11742,7 @@ _08015C3C: .4byte gUnknown_2023BE3
_08015C40: .4byte gBattleResources
_08015C44: .4byte gUnknown_3004F84
_08015C48:
ldr r0, _08015C68 @ =gUnknown_2023BC8
ldr r0, _08015C68 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08015C62
@@ -11758,7 +11758,7 @@ _08015C62:
pop {r0}
bx r0
.align 2, 0
_08015C68: .4byte gUnknown_2023BC8
_08015C68: .4byte gBattleControllerExecFlags
_08015C6C: .4byte gUnknown_825011C
_08015C70: .4byte gUnknown_2023D74
thumb_func_end RunBattleScriptCommands_PopCallbacksStack
@@ -11766,7 +11766,7 @@ _08015C70: .4byte gUnknown_2023D74
thumb_func_start sub_8015C74
sub_8015C74: @ 8015C74
push {lr}
ldr r0, _08015C94 @ =gUnknown_2023BC8
ldr r0, _08015C94 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08015C90
@@ -11782,7 +11782,7 @@ _08015C90:
pop {r0}
bx r0
.align 2, 0
_08015C94: .4byte gUnknown_2023BC8
_08015C94: .4byte gBattleControllerExecFlags
_08015C98: .4byte gUnknown_825011C
_08015C9C: .4byte gUnknown_2023D74
thumb_func_end sub_8015C74
@@ -12615,7 +12615,7 @@ sub_8016374: @ 8016374
strh r2, [r0]
ldr r0, _080163F0 @ =gBattle_BG0_Y
strh r2, [r0]
ldr r1, _080163F4 @ =gUnknown_2023FF8
ldr r1, _080163F4 @ =gActionSelectionCursor
ldrb r0, [r3]
adds r0, r1
strb r2, [r0]
@@ -12663,7 +12663,7 @@ _080163E4: .4byte gUnknown_2023BDE
_080163E8: .4byte gUnknown_2023BE2
_080163EC: .4byte gBattle_BG0_X
_080163F0: .4byte gBattle_BG0_Y
_080163F4: .4byte gUnknown_2023FF8
_080163F4: .4byte gActionSelectionCursor
_080163F8: .4byte gUnknown_2023FFC
_080163FC: .4byte gBattleTextBuff1
_08016400: .4byte gBattleStruct
+8 -8
View File
@@ -2538,7 +2538,7 @@ _080F0008:
_080F0026:
cmp r1, 0x5F
bne _080F004C
ldr r0, _080F0044 @ =gUnknown_2024005
ldr r0, _080F0044 @ =gDoingBattleAnim
movs r1, 0
strb r1, [r0]
movs r0, 0x1
@@ -2548,7 +2548,7 @@ _080F0026:
bl PlaySE
b _080F0088
.align 2, 0
_080F0044: .4byte gUnknown_2024005
_080F0044: .4byte gDoingBattleAnim
_080F0048: .4byte 0x0000013f
_080F004C:
ldr r0, _080F0094 @ =0x0000013b
@@ -3062,7 +3062,7 @@ _080F03F0:
strh r5, [r7, 0x2E]
ldr r0, _080F0470 @ =sub_80F018C
str r0, [r7, 0x1C]
ldr r0, _080F0474 @ =gUnknown_2024005
ldr r0, _080F0474 @ =gDoingBattleAnim
strb r6, [r0]
movs r0, 0x1
bl UpdateOamPriorityInAllHealthboxes
@@ -3077,7 +3077,7 @@ _080F0464: .4byte gBattlerSpriteIds
_080F0468: .4byte gBattleAnimTarget
_080F046C: .4byte gBattleSpritesDataPtr
_080F0470: .4byte sub_80F018C
_080F0474: .4byte gUnknown_2024005
_080F0474: .4byte gDoingBattleAnim
thumb_func_end sub_80F0378
thumb_func_start sub_80F0478
@@ -3164,7 +3164,7 @@ _080F050A:
strh r0, [r4, 0x2E]
ldr r0, _080F0524 @ =sub_80F018C
str r0, [r4, 0x1C]
ldr r1, _080F0528 @ =gUnknown_2024005
ldr r1, _080F0528 @ =gDoingBattleAnim
movs r0, 0
strb r0, [r1]
movs r0, 0x1
@@ -3175,7 +3175,7 @@ _080F051E:
bx r0
.align 2, 0
_080F0524: .4byte sub_80F018C
_080F0528: .4byte gUnknown_2024005
_080F0528: .4byte gDoingBattleAnim
thumb_func_end sub_80F04B4
thumb_func_start sub_80F052C
@@ -3237,7 +3237,7 @@ _080F0590:
strh r0, [r4, 0x2E]
ldr r0, _080F05AC @ =sub_80F018C
str r0, [r4, 0x1C]
ldr r0, _080F05B0 @ =gUnknown_2024005
ldr r0, _080F05B0 @ =gDoingBattleAnim
strb r1, [r0]
movs r0, 0x1
bl UpdateOamPriorityInAllHealthboxes
@@ -3247,7 +3247,7 @@ _080F05A4:
bx r0
.align 2, 0
_080F05AC: .4byte sub_80F018C
_080F05B0: .4byte gUnknown_2024005
_080F05B0: .4byte gDoingBattleAnim
thumb_func_end sub_80F0574
thumb_func_start sub_80F05B4
+3 -3
View File
@@ -3488,8 +3488,8 @@ _080BC396:
bx r1
thumb_func_end sub_80BC30C
thumb_func_start sub_80BC3A0
sub_80BC3A0: @ 80BC3A0
thumb_func_start HandleIntroSlide
HandleIntroSlide: @ 80BC3A0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3549,7 +3549,7 @@ _080BC3E8:
.align 2, 0
_080BC414: .4byte gUnknown_83E7CD4
_080BC418: .4byte gTasks
thumb_func_end sub_80BC3A0
thumb_func_end HandleIntroSlide
thumb_func_start sub_80BC41C
sub_80BC41C: @ 80BC41C
+114 -114
View File
@@ -12,7 +12,7 @@ nullsub_19: @ 803A664
thumb_func_start sub_803A668
sub_803A668: @ 803A668
ldr r1, _0803A678 @ =gUnknown_3004FE0
ldr r1, _0803A678 @ =gBattlerControllerFuncs
ldr r0, _0803A67C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -21,7 +21,7 @@ sub_803A668: @ 803A668
str r1, [r0]
bx lr
.align 2, 0
_0803A678: .4byte gUnknown_3004FE0
_0803A678: .4byte gBattlerControllerFuncs
_0803A67C: .4byte gActiveBattler
_0803A680: .4byte sub_803A684
thumb_func_end sub_803A668
@@ -29,7 +29,7 @@ _0803A680: .4byte sub_803A684
thumb_func_start sub_803A684
sub_803A684: @ 803A684
push {lr}
ldr r2, _0803A6B8 @ =gUnknown_2023BC8
ldr r2, _0803A6B8 @ =gBattleControllerExecFlags
ldr r1, _0803A6BC @ =gBitTable
ldr r0, _0803A6C0 @ =gActiveBattler
ldrb r3, [r0]
@@ -40,7 +40,7 @@ sub_803A684: @ 803A684
ands r1, r0
cmp r1, 0
beq _0803A6D0
ldr r0, _0803A6C4 @ =gUnknown_2022BC4
ldr r0, _0803A6C4 @ =gBattleBufferA
lsls r1, r3, 9
adds r1, r0
ldrb r0, [r1]
@@ -54,10 +54,10 @@ sub_803A684: @ 803A684
bl _call_via_r0
b _0803A6D0
.align 2, 0
_0803A6B8: .4byte gUnknown_2023BC8
_0803A6B8: .4byte gBattleControllerExecFlags
_0803A6BC: .4byte gBitTable
_0803A6C0: .4byte gActiveBattler
_0803A6C4: .4byte gUnknown_2022BC4
_0803A6C4: .4byte gBattleBufferA
_0803A6C8: .4byte gUnknown_8250B20
_0803A6CC:
bl RecordedOpponentBufferExecCompleted
@@ -411,7 +411,7 @@ _0803A988:
adds r0, r2
movs r1, 0x3
strb r1, [r0, 0x9]
ldr r1, _0803A9C4 @ =gUnknown_3004FE0
ldr r1, _0803A9C4 @ =gBattlerControllerFuncs
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
@@ -428,7 +428,7 @@ _0803A9B4: .4byte gMPlayInfo_BGM
_0803A9B8: .4byte 0x0000ffff
_0803A9BC: .4byte gBattleSpritesDataPtr
_0803A9C0: .4byte gActiveBattler
_0803A9C4: .4byte gUnknown_3004FE0
_0803A9C4: .4byte gBattlerControllerFuncs
_0803A9C8: .4byte sub_803A79C
thumb_func_end sub_803A7E4
@@ -683,7 +683,7 @@ _0803AB50:
negs r0, r0
ands r0, r1
strb r0, [r2, 0x9]
ldr r1, _0803AC0C @ =gUnknown_3004FE0
ldr r1, _0803AC0C @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -706,7 +706,7 @@ _0803ABFC: .4byte gBattleTypeFlags
_0803AC00: .4byte gUnknown_3004FFC
_0803AC04: .4byte gSprites
_0803AC08: .4byte gHealthboxSpriteIds
_0803AC0C: .4byte gUnknown_3004FE0
_0803AC0C: .4byte gBattlerControllerFuncs
_0803AC10: .4byte sub_803A7E4
thumb_func_end sub_803A9CC
@@ -965,7 +965,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
subs r0, 0x5
ands r0, r1
strb r0, [r2]
ldr r0, _0803AE38 @ =gUnknown_2024005
ldr r0, _0803AE38 @ =gDoingBattleAnim
strb r3, [r0]
bl RecordedOpponentBufferExecCompleted
b _0803AE66
@@ -973,7 +973,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
_0803AE2C: .4byte gBattlerSpriteIds
_0803AE30: .4byte gActiveBattler
_0803AE34: .4byte gSprites
_0803AE38: .4byte gUnknown_2024005
_0803AE38: .4byte gDoingBattleAnim
_0803AE3C:
ldrh r0, [r4, 0x30]
movs r1, 0x3
@@ -1037,7 +1037,7 @@ sub_803AE6C: @ 803AE6C
movs r3, 0x6
bl InitAndLaunchSpecialAnimation
_0803AEAC:
ldr r0, _0803AED4 @ =gUnknown_3004FE0
ldr r0, _0803AED4 @ =gBattlerControllerFuncs
ldrb r1, [r4]
lsls r1, 2
adds r1, r0
@@ -1053,7 +1053,7 @@ _0803AEC4: .4byte gHealthboxSpriteIds
_0803AEC8: .4byte gActiveBattler
_0803AECC: .4byte SpriteCallbackDummy
_0803AED0: .4byte gBattleSpritesDataPtr
_0803AED4: .4byte gUnknown_3004FE0
_0803AED4: .4byte gBattlerControllerFuncs
_0803AED8: .4byte sub_803AEDC
thumb_func_end sub_803AE6C
@@ -1165,7 +1165,7 @@ sub_803AF28: @ 803AF28
bl SetHealthboxSpriteVisible
ldrb r0, [r5]
bl CopyBattleSpriteInvisibility
ldr r1, _0803AFF4 @ =gUnknown_3004FE0
ldr r1, _0803AFF4 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -1184,7 +1184,7 @@ _0803AFE4: .4byte gSprites
_0803AFE8: .4byte gHealthboxSpriteIds
_0803AFEC: .4byte gBattlerPartyIndexes
_0803AFF0: .4byte gEnemyParty
_0803AFF4: .4byte gUnknown_3004FE0
_0803AFF4: .4byte gBattlerControllerFuncs
_0803AFF8: .4byte sub_803AE6C
thumb_func_end sub_803AF28
@@ -1259,7 +1259,7 @@ _0803B02E:
lsrs r1, 16
adds r0, r4, 0
bl SetBattlerShadowSpriteCallback
ldr r1, _0803B0BC @ =gUnknown_3004FE0
ldr r1, _0803B0BC @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -1277,7 +1277,7 @@ _0803B0AC: .4byte gEnemyParty
_0803B0B0: .4byte gSprites
_0803B0B4: .4byte gUnknown_3004FFC
_0803B0B8: .4byte SpriteCallbackDummy
_0803B0BC: .4byte gUnknown_3004FE0
_0803B0BC: .4byte gBattlerControllerFuncs
_0803B0C0: .4byte sub_803AF28
thumb_func_end sub_803AFFC
@@ -1337,7 +1337,7 @@ _0803B120: .4byte gActiveBattler
RecordedOpponentBufferExecCompleted: @ 803B124
push {r4,lr}
sub sp, 0x4
ldr r1, _0803B164 @ =gUnknown_3004FE0
ldr r1, _0803B164 @ =gBattlerControllerFuncs
ldr r4, _0803B168 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 2
@@ -1357,7 +1357,7 @@ RecordedOpponentBufferExecCompleted: @ 803B124
movs r1, 0x4
mov r2, sp
bl PrepareBufferDataTransferLink
ldr r1, _0803B174 @ =gUnknown_2022BC4
ldr r1, _0803B174 @ =gBattleBufferA
ldrb r0, [r4]
lsls r0, 9
adds r0, r1
@@ -1365,13 +1365,13 @@ RecordedOpponentBufferExecCompleted: @ 803B124
strb r1, [r0]
b _0803B18A
.align 2, 0
_0803B164: .4byte gUnknown_3004FE0
_0803B164: .4byte gBattlerControllerFuncs
_0803B168: .4byte gActiveBattler
_0803B16C: .4byte sub_803A684
_0803B170: .4byte gBattleTypeFlags
_0803B174: .4byte gUnknown_2022BC4
_0803B174: .4byte gBattleBufferA
_0803B178:
ldr r2, _0803B194 @ =gUnknown_2023BC8
ldr r2, _0803B194 @ =gBattleControllerExecFlags
ldr r1, _0803B198 @ =gBitTable
ldrb r0, [r4]
lsls r0, 2
@@ -1386,7 +1386,7 @@ _0803B18A:
pop {r0}
bx r0
.align 2, 0
_0803B194: .4byte gUnknown_2023BC8
_0803B194: .4byte gBattleControllerExecFlags
_0803B198: .4byte gBitTable
thumb_func_end RecordedOpponentBufferExecCompleted
@@ -1395,7 +1395,7 @@ RecordedOpponentHandleGetMonData: @ 803B19C
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
ldr r1, _0803B1C8 @ =gUnknown_2022BC4
ldr r1, _0803B1C8 @ =gBattleBufferA
ldr r0, _0803B1CC @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -1413,7 +1413,7 @@ RecordedOpponentHandleGetMonData: @ 803B19C
adds r6, r0, 0
b _0803B1F6
.align 2, 0
_0803B1C8: .4byte gUnknown_2022BC4
_0803B1C8: .4byte gBattleBufferA
_0803B1CC: .4byte gActiveBattler
_0803B1D0: .4byte gBattlerPartyIndexes
_0803B1D4:
@@ -1460,7 +1460,7 @@ CopyRecordedOpponentMonData: @ 803B210
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
ldr r2, _0803B244 @ =gUnknown_2022BC4
ldr r2, _0803B244 @ =gBattleBufferA
ldr r3, _0803B248 @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 9
@@ -1477,7 +1477,7 @@ _0803B23A:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0803B244: .4byte gUnknown_2022BC4
_0803B244: .4byte gBattleBufferA
_0803B248: .4byte gActiveBattler
_0803B24C: .4byte _0803B250
.align 2, 0
@@ -2393,7 +2393,7 @@ sub_803B9BC: @ 803B9BC
thumb_func_start RecordedOpponentHandleSetMonData
RecordedOpponentHandleSetMonData: @ 803B9C8
push {r4,r5,lr}
ldr r1, _0803B9EC @ =gUnknown_2022BC4
ldr r1, _0803B9EC @ =gBattleBufferA
ldr r0, _0803B9F0 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -2409,7 +2409,7 @@ RecordedOpponentHandleSetMonData: @ 803B9C8
bl SetRecordedOpponentMonData
b _0803BA16
.align 2, 0
_0803B9EC: .4byte gUnknown_2022BC4
_0803B9EC: .4byte gBattleBufferA
_0803B9F0: .4byte gActiveBattler
_0803B9F4: .4byte gBattlerPartyIndexes
_0803B9F8:
@@ -2786,7 +2786,7 @@ _0803BD78:
muls r0, r5
ldr r1, _0803BD90 @ =gEnemyParty
adds r0, r1
ldr r3, _0803BD94 @ =gUnknown_2022BC4
ldr r3, _0803BD94 @ =gBattleBufferA
ldrb r2, [r6]
lsls r2, 9
adds r1, r3, 0x1
@@ -2796,7 +2796,7 @@ _0803BD78:
b _0803BE16
.align 2, 0
_0803BD90: .4byte gEnemyParty
_0803BD94: .4byte gUnknown_2022BC4
_0803BD94: .4byte gBattleBufferA
_0803BD98:
movs r0, 0x64
adds r4, r5, 0
@@ -2850,7 +2850,7 @@ _0803BE00:
muls r0, r5
ldr r1, _0803BE20 @ =gEnemyParty
adds r0, r1
ldr r3, _0803BE24 @ =gUnknown_2022BC4
ldr r3, _0803BE24 @ =gBattleBufferA
ldrb r2, [r6]
lsls r2, 9
adds r1, r3, 0x1
@@ -2864,7 +2864,7 @@ _0803BE16:
b _0803C32C
.align 2, 0
_0803BE20: .4byte gEnemyParty
_0803BE24: .4byte gUnknown_2022BC4
_0803BE24: .4byte gBattleBufferA
_0803BE28:
movs r0, 0x64
muls r0, r5
@@ -3488,7 +3488,7 @@ RecordedOpponentHandleSetRawMonData: @ 803C340
movs r0, 0x64
adds r3, r1, 0
muls r3, r0
ldr r4, _0803C3AC @ =gUnknown_2022BC4
ldr r4, _0803C3AC @ =gBattleBufferA
lsls r2, 9
adds r0, r4, 0x1
adds r0, r2, r0
@@ -3531,7 +3531,7 @@ _0803C398:
.align 2, 0
_0803C3A4: .4byte gBattlerPartyIndexes
_0803C3A8: .4byte gActiveBattler
_0803C3AC: .4byte gUnknown_2022BC4
_0803C3AC: .4byte gBattleBufferA
_0803C3B0: .4byte gEnemyParty
thumb_func_end RecordedOpponentHandleSetRawMonData
@@ -3660,7 +3660,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
lsrs r1, 16
adds r0, r4, 0
bl SetBattlerShadowSpriteCallback
ldr r1, _0803C4FC @ =gUnknown_3004FE0
ldr r1, _0803C4FC @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -3682,7 +3682,7 @@ _0803C4EC: .4byte gBattlerSpriteIds
_0803C4F0: .4byte gSprites
_0803C4F4: .4byte 0x0000ff10
_0803C4F8: .4byte gBattleMonForms
_0803C4FC: .4byte gUnknown_3004FE0
_0803C4FC: .4byte gBattlerControllerFuncs
_0803C500: .4byte sub_803AC14
thumb_func_end LinkOpponentHandleLoadPokeSprite
@@ -3694,7 +3694,7 @@ LinkOpponentHandleSendOutPoke: @ 803C504
ldrb r0, [r4]
lsls r2, r0, 1
adds r2, r1
ldr r3, _0803C544 @ =gUnknown_2022BC4
ldr r3, _0803C544 @ =gBattleBufferA
lsls r0, 9
adds r1, r3, 0x1
adds r0, r1
@@ -3706,7 +3706,7 @@ LinkOpponentHandleSendOutPoke: @ 803C504
adds r1, r3
ldrb r1, [r1]
bl sub_803C550
ldr r1, _0803C548 @ =gUnknown_3004FE0
ldr r1, _0803C548 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -3718,8 +3718,8 @@ LinkOpponentHandleSendOutPoke: @ 803C504
.align 2, 0
_0803C53C: .4byte gBattlerPartyIndexes
_0803C540: .4byte gActiveBattler
_0803C544: .4byte gUnknown_2022BC4
_0803C548: .4byte gUnknown_3004FE0
_0803C544: .4byte gBattleBufferA
_0803C548: .4byte gBattlerControllerFuncs
_0803C54C: .4byte sub_803AFFC
thumb_func_end LinkOpponentHandleSendOutPoke
@@ -3740,7 +3740,7 @@ sub_803C550: @ 803C550
ldr r0, _0803C6AC @ =gBattlerPartyIndexes
lsls r4, r6, 1
adds r4, r0
ldr r0, _0803C6B0 @ =gUnknown_2022BC4
ldr r0, _0803C6B0 @ =gBattleBufferA
lsls r1, r6, 9
adds r0, 0x1
adds r1, r0
@@ -3888,7 +3888,7 @@ sub_803C550: @ 803C550
bx r0
.align 2, 0
_0803C6AC: .4byte gBattlerPartyIndexes
_0803C6B0: .4byte gUnknown_2022BC4
_0803C6B0: .4byte gBattleBufferA
_0803C6B4: .4byte gEnemyParty
_0803C6B8: .4byte sub_8033E3C
_0803C6BC: .4byte gUnknown_3004FFC
@@ -3902,7 +3902,7 @@ _0803C6D0: .4byte SpriteCallbackDummy
thumb_func_start LinkOpponentHandleReturnPokeToBall
LinkOpponentHandleReturnPokeToBall: @ 803C6D4
push {r4-r6,lr}
ldr r1, _0803C708 @ =gUnknown_2022BC4
ldr r1, _0803C708 @ =gBattleBufferA
ldr r6, _0803C70C @ =gActiveBattler
ldrb r2, [r6]
lsls r0, r2, 9
@@ -3919,7 +3919,7 @@ LinkOpponentHandleReturnPokeToBall: @ 803C6D4
lsls r0, 2
adds r0, r1
strb r3, [r0, 0x4]
ldr r1, _0803C714 @ =gUnknown_3004FE0
ldr r1, _0803C714 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -3927,10 +3927,10 @@ LinkOpponentHandleReturnPokeToBall: @ 803C6D4
str r1, [r0]
b _0803C758
.align 2, 0
_0803C708: .4byte gUnknown_2022BC4
_0803C708: .4byte gBattleBufferA
_0803C70C: .4byte gActiveBattler
_0803C710: .4byte gBattleSpritesDataPtr
_0803C714: .4byte gUnknown_3004FE0
_0803C714: .4byte gBattlerControllerFuncs
_0803C718: .4byte sub_803C76C
_0803C71C:
ldr r5, _0803C760 @ =gBattlerSpriteIds
@@ -4027,7 +4027,7 @@ _0803C7C2:
adds r1, r2, 0
movs r3, 0x2
bl InitAndLaunchSpecialAnimation
ldr r1, _0803C7F0 @ =gUnknown_3004FE0
ldr r1, _0803C7F0 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -4038,7 +4038,7 @@ _0803C7EA:
pop {r0}
bx r0
.align 2, 0
_0803C7F0: .4byte gUnknown_3004FE0
_0803C7F0: .4byte gBattlerControllerFuncs
_0803C7F4: .4byte sub_803AD64
thumb_func_end sub_803C76C
@@ -4374,7 +4374,7 @@ _0803C992:
adds r0, r4
ldr r1, _0803CAF4 @ =sub_8033EEC
str r1, [r0]
ldr r1, _0803CAF8 @ =gUnknown_3004FE0
ldr r1, _0803CAF8 @ =gBattlerControllerFuncs
mov r2, r8
ldrb r0, [r2]
lsls r0, 2
@@ -4400,7 +4400,7 @@ _0803CAE8: .4byte gTrainerFrontPicTable
_0803CAEC: .4byte 0x000003ff
_0803CAF0: .4byte 0xfffffc00
_0803CAF4: .4byte sub_8033EEC
_0803CAF8: .4byte gUnknown_3004FE0
_0803CAF8: .4byte gBattlerControllerFuncs
_0803CAFC: .4byte sub_803A6D4
thumb_func_end sub_803C7F8
@@ -4474,7 +4474,7 @@ sub_803CB0C: @ 803CB0C
adds r0, r5
ldr r1, _0803CBAC @ =SpriteCallbackDummy
bl StoreSpriteCallbackInData6
ldr r1, _0803CBB0 @ =gUnknown_3004FE0
ldr r1, _0803CBB0 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -4489,7 +4489,7 @@ _0803CBA0: .4byte gActiveBattler
_0803CBA4: .4byte gSprites
_0803CBA8: .4byte sub_8075590
_0803CBAC: .4byte SpriteCallbackDummy
_0803CBB0: .4byte gUnknown_3004FE0
_0803CBB0: .4byte gBattlerControllerFuncs
_0803CBB4: .4byte sub_803A70C
thumb_func_end sub_803CB0C
@@ -4559,7 +4559,7 @@ _0803CC0C:
adds r0, r2
ldr r1, _0803CC58 @ =sub_8011EA0
str r1, [r0]
ldr r1, _0803CC5C @ =gUnknown_3004FE0
ldr r1, _0803CC5C @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -4573,7 +4573,7 @@ _0803CC48:
_0803CC50: .4byte gSprites
_0803CC54: .4byte gBattlerSpriteIds
_0803CC58: .4byte sub_8011EA0
_0803CC5C: .4byte gUnknown_3004FE0
_0803CC5C: .4byte gBattlerControllerFuncs
_0803CC60: .4byte sub_803AD20
thumb_func_end sub_803CBB8
@@ -4620,7 +4620,7 @@ RecordedOpponentHandleMoveAnimation: @ 803CC94
beq _0803CCA6
b _0803CDBA
_0803CCA6:
ldr r0, _0803CD7C @ =gUnknown_2022BC4
ldr r0, _0803CD7C @ =gBattleBufferA
mov r12, r0
ldrb r2, [r6]
lsls r2, 9
@@ -4724,7 +4724,7 @@ _0803CCA6:
b _0803CDBA
.align 2, 0
_0803CD78: .4byte gActiveBattler
_0803CD7C: .4byte gUnknown_2022BC4
_0803CD7C: .4byte gBattleBufferA
_0803CD80: .4byte gAnimMoveTurn
_0803CD84: .4byte gAnimMovePower
_0803CD88: .4byte gAnimMoveDmg
@@ -4742,7 +4742,7 @@ _0803CD9C:
lsls r0, 2
adds r0, r2
strb r3, [r0, 0x4]
ldr r1, _0803CDC4 @ =gUnknown_3004FE0
ldr r1, _0803CDC4 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -4754,7 +4754,7 @@ _0803CDBA:
bx r0
.align 2, 0
_0803CDC0: .4byte gBattleSpritesDataPtr
_0803CDC4: .4byte gUnknown_3004FE0
_0803CDC4: .4byte gBattlerControllerFuncs
_0803CDC8: .4byte RecordedOpponentDoMoveAnimation
thumb_func_end RecordedOpponentHandleMoveAnimation
@@ -4765,7 +4765,7 @@ RecordedOpponentDoMoveAnimation: @ 803CDCC
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r2, _0803CE18 @ =gUnknown_2022BC4
ldr r2, _0803CE18 @ =gBattleBufferA
ldr r6, _0803CE1C @ =gActiveBattler
ldrb r3, [r6]
lsls r1, r3, 9
@@ -4799,7 +4799,7 @@ RecordedOpponentDoMoveAnimation: @ 803CDCC
beq _0803CE2E
b _0803CF40
.align 2, 0
_0803CE18: .4byte gUnknown_2022BC4
_0803CE18: .4byte gBattleBufferA
_0803CE1C: .4byte gActiveBattler
_0803CE20: .4byte gBattleSpritesDataPtr
_0803CE24:
@@ -4963,7 +4963,7 @@ sub_803CF50: @ 803CF50
ldr r0, _0803CF90 @ =gUnknown_2022BC6
adds r4, r0
ldrh r0, [r4]
bl sub_80D7274
bl BufferStringBattle
ldrh r0, [r4]
bl sub_80D89B0
lsls r0, 24
@@ -4971,7 +4971,7 @@ sub_803CF50: @ 803CF50
beq _0803CF98
ldr r0, _0803CF94 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0803CFA0
.align 2, 0
_0803CF84: .4byte gBattle_BG0_X
@@ -4982,9 +4982,9 @@ _0803CF94: .4byte gDisplayedStringBattle
_0803CF98:
ldr r0, _0803CFB4 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
_0803CFA0:
ldr r1, _0803CFB8 @ =gUnknown_3004FE0
ldr r1, _0803CFB8 @ =gBattlerControllerFuncs
ldr r0, _0803CFBC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -4996,7 +4996,7 @@ _0803CFA0:
bx r0
.align 2, 0
_0803CFB4: .4byte gDisplayedStringBattle
_0803CFB8: .4byte gUnknown_3004FE0
_0803CFB8: .4byte gBattlerControllerFuncs
_0803CFBC: .4byte gActiveBattler
_0803CFC0: .4byte CompleteOnInactiveTextPrinter_5
thumb_func_end sub_803CF50
@@ -5066,7 +5066,7 @@ sub_803D018: @ 803D018
sub sp, 0x4
movs r0, 0
bl LoadBattleBarGfx
ldr r3, _0803D090 @ =gUnknown_2022BC4
ldr r3, _0803D090 @ =gBattleBufferA
ldr r0, _0803D094 @ =gActiveBattler
mov r9, r0
ldrb r4, [r0]
@@ -5115,7 +5115,7 @@ sub_803D018: @ 803D018
bl SetBattleBarStruct
b _0803D0D2
.align 2, 0
_0803D090: .4byte gUnknown_2022BC4
_0803D090: .4byte gBattleBufferA
_0803D094: .4byte gActiveBattler
_0803D098: .4byte 0x00007fff
_0803D09C: .4byte gBattlerPartyIndexes
@@ -5142,7 +5142,7 @@ _0803D0A8:
movs r3, 0
bl SetBattleBarStruct
_0803D0D2:
ldr r1, _0803D0FC @ =gUnknown_3004FE0
ldr r1, _0803D0FC @ =gBattlerControllerFuncs
ldr r0, _0803D100 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -5160,7 +5160,7 @@ _0803D0D2:
_0803D0F0: .4byte gBattlerPartyIndexes
_0803D0F4: .4byte gEnemyParty
_0803D0F8: .4byte gHealthboxSpriteIds
_0803D0FC: .4byte gUnknown_3004FE0
_0803D0FC: .4byte gBattlerControllerFuncs
_0803D100: .4byte gActiveBattler
_0803D104: .4byte CompleteOnHealthbarDone_4
thumb_func_end sub_803D018
@@ -5209,7 +5209,7 @@ sub_803D114: @ 803D114
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r1, _0803D184 @ =gUnknown_3004FE0
ldr r1, _0803D184 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -5225,7 +5225,7 @@ _0803D174: .4byte gHealthboxSpriteIds
_0803D178: .4byte gBattlerPartyIndexes
_0803D17C: .4byte gEnemyParty
_0803D180: .4byte gBattleSpritesDataPtr
_0803D184: .4byte gUnknown_3004FE0
_0803D184: .4byte gBattlerControllerFuncs
_0803D188: .4byte CompleteOnFinishedStatusAnimation_5
thumb_func_end sub_803D114
@@ -5238,7 +5238,7 @@ sub_803D18C: @ 803D18C
lsls r0, 24
cmp r0, 0
bne _0803D1DC
ldr r4, _0803D1E8 @ =gUnknown_2022BC4
ldr r4, _0803D1E8 @ =gBattleBufferA
ldrb r3, [r5]
lsls r3, 9
adds r0, r4, 0x1
@@ -5263,7 +5263,7 @@ sub_803D18C: @ 803D18C
lsls r2, 24
orrs r1, r2
bl InitAndLaunchChosenStatusAnimation
ldr r1, _0803D1EC @ =gUnknown_3004FE0
ldr r1, _0803D1EC @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -5275,8 +5275,8 @@ _0803D1DC:
bx r0
.align 2, 0
_0803D1E4: .4byte gActiveBattler
_0803D1E8: .4byte gUnknown_2022BC4
_0803D1EC: .4byte gUnknown_3004FE0
_0803D1E8: .4byte gBattleBufferA
_0803D1EC: .4byte gBattlerControllerFuncs
_0803D1F0: .4byte CompleteOnFinishedStatusAnimation_5
thumb_func_end sub_803D18C
@@ -5372,7 +5372,7 @@ _0803D278: .4byte gUnknown_2022870
RecordedOpponentHandleCmd38: @ 803D27C
push {lr}
ldr r3, _0803D2A8 @ =gUnknown_2022870
ldr r1, _0803D2AC @ =gUnknown_2022BC4
ldr r1, _0803D2AC @ =gBattleBufferA
ldr r0, _0803D2B0 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -5392,7 +5392,7 @@ RecordedOpponentHandleCmd38: @ 803D27C
bx r0
.align 2, 0
_0803D2A8: .4byte gUnknown_2022870
_0803D2AC: .4byte gUnknown_2022BC4
_0803D2AC: .4byte gBattleBufferA
_0803D2B0: .4byte gActiveBattler
thumb_func_end RecordedOpponentHandleCmd38
@@ -5458,7 +5458,7 @@ _0803D31C: .4byte gSprites
_0803D320: .4byte gBattlerSpriteIds
_0803D324: .4byte gActiveBattler
_0803D328:
ldr r1, _0803D358 @ =gUnknown_2024005
ldr r1, _0803D358 @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldrb r0, [r4]
@@ -5472,7 +5472,7 @@ _0803D328:
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl DoHitAnimHealthboxEffect
ldr r1, _0803D35C @ =gUnknown_3004FE0
ldr r1, _0803D35C @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -5483,8 +5483,8 @@ _0803D352:
pop {r0}
bx r0
.align 2, 0
_0803D358: .4byte gUnknown_2024005
_0803D35C: .4byte gUnknown_3004FE0
_0803D358: .4byte gDoingBattleAnim
_0803D35C: .4byte gBattlerControllerFuncs
_0803D360: .4byte DoHitAnimBlinkSpriteEffect_4
thumb_func_end RecordedOpponentHandleHitAnimation
@@ -5508,7 +5508,7 @@ RecordedOpponentHandlePlaySE: @ 803D370
bne _0803D384
movs r3, 0xC0
_0803D384:
ldr r2, _0803D3B0 @ =gUnknown_2022BC4
ldr r2, _0803D3B0 @ =gBattleBufferA
ldrb r1, [r4]
lsls r1, 9
adds r0, r2, 0x1
@@ -5528,13 +5528,13 @@ _0803D384:
bx r0
.align 2, 0
_0803D3AC: .4byte gActiveBattler
_0803D3B0: .4byte gUnknown_2022BC4
_0803D3B0: .4byte gBattleBufferA
thumb_func_end RecordedOpponentHandlePlaySE
thumb_func_start LinkOpponentHandlecmd44
LinkOpponentHandlecmd44: @ 803D3B4
push {lr}
ldr r2, _0803D3DC @ =gUnknown_2022BC4
ldr r2, _0803D3DC @ =gBattleBufferA
ldr r0, _0803D3E0 @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
@@ -5551,7 +5551,7 @@ LinkOpponentHandlecmd44: @ 803D3B4
pop {r0}
bx r0
.align 2, 0
_0803D3DC: .4byte gUnknown_2022BC4
_0803D3DC: .4byte gBattleBufferA
_0803D3E0: .4byte gActiveBattler
thumb_func_end LinkOpponentHandlecmd44
@@ -5587,14 +5587,14 @@ _0803D41C: .4byte gEnemyParty
thumb_func_start RecordedOpponentHandleIntroSlide
RecordedOpponentHandleIntroSlide: @ 803D420
push {lr}
ldr r1, _0803D448 @ =gUnknown_2022BC4
ldr r1, _0803D448 @ =gBattleBufferA
ldr r0, _0803D44C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl sub_80BC3A0
bl HandleIntroSlide
ldr r2, _0803D450 @ =gIntroSlideFlags
ldrh r0, [r2]
movs r1, 0x1
@@ -5604,7 +5604,7 @@ RecordedOpponentHandleIntroSlide: @ 803D420
pop {r0}
bx r0
.align 2, 0
_0803D448: .4byte gUnknown_2022BC4
_0803D448: .4byte gBattleBufferA
_0803D44C: .4byte gActiveBattler
_0803D450: .4byte gIntroSlideFlags
thumb_func_end RecordedOpponentHandleIntroSlide
@@ -5712,7 +5712,7 @@ _0803D516:
movs r1, 0x1
orrs r0, r1
strb r0, [r2, 0x9]
ldr r1, _0803D55C @ =gUnknown_3004FE0
ldr r1, _0803D55C @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -5732,7 +5732,7 @@ _0803D54C: .4byte gTasks
_0803D550: .4byte gBattleSpritesDataPtr
_0803D554: .4byte gUnknown_2024000
_0803D558: .4byte sub_80491B0
_0803D55C: .4byte gUnknown_3004FE0
_0803D55C: .4byte gBattlerControllerFuncs
_0803D560: .4byte nullsub_19
thumb_func_end sub_803D454
@@ -5767,7 +5767,7 @@ sub_803D564: @ 803D564
cmp r0, 0
beq _0803D5D0
_0803D59E:
ldr r0, _0803D5C8 @ =gUnknown_2022BC4
ldr r0, _0803D5C8 @ =gBattleBufferA
ldrb r1, [r7]
lsls r2, r1, 9
adds r0, 0x1
@@ -5785,10 +5785,10 @@ _0803D59E:
_0803D5BC: .4byte gActiveBattler
_0803D5C0: .4byte gTasks
_0803D5C4: .4byte gBattleTypeFlags
_0803D5C8: .4byte gUnknown_2022BC4
_0803D5C8: .4byte gBattleBufferA
_0803D5CC: .4byte gBattlerPartyIndexes
_0803D5D0:
ldr r4, _0803D634 @ =gUnknown_2022BC4
ldr r4, _0803D634 @ =gBattleBufferA
ldrb r0, [r7]
lsls r1, r0, 9
adds r4, 0x1
@@ -5819,7 +5819,7 @@ _0803D5D0:
eors r0, r5
strb r0, [r7]
_0803D610:
ldr r1, _0803D63C @ =gUnknown_3004FE0
ldr r1, _0803D63C @ =gBattlerControllerFuncs
ldr r2, _0803D640 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -5837,9 +5837,9 @@ _0803D610:
pop {r0}
bx r0
.align 2, 0
_0803D634: .4byte gUnknown_2022BC4
_0803D634: .4byte gBattleBufferA
_0803D638: .4byte gBattlerPartyIndexes
_0803D63C: .4byte gUnknown_3004FE0
_0803D63C: .4byte gBattlerControllerFuncs
_0803D640: .4byte gActiveBattler
_0803D644: .4byte sub_803A9CC
thumb_func_end sub_803D564
@@ -5873,7 +5873,7 @@ _0803D678: .4byte 0xfffffc00
thumb_func_start RecordedOpponentHandleDrawPartyStatusSummary
RecordedOpponentHandleDrawPartyStatusSummary: @ 803D67C
push {r4-r7,lr}
ldr r1, _0803D6A4 @ =gUnknown_2022BC4
ldr r1, _0803D6A4 @ =gBattleBufferA
ldr r0, _0803D6A8 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -5890,7 +5890,7 @@ RecordedOpponentHandleDrawPartyStatusSummary: @ 803D67C
bl RecordedOpponentBufferExecCompleted
b _0803D776
.align 2, 0
_0803D6A4: .4byte gUnknown_2022BC4
_0803D6A4: .4byte gBattleBufferA
_0803D6A8: .4byte gActiveBattler
_0803D6AC:
ldr r4, _0803D704 @ =gBattleSpritesDataPtr
@@ -5906,7 +5906,7 @@ _0803D6AC:
movs r2, 0x1
orrs r1, r2
strb r1, [r0]
ldr r1, _0803D70C @ =gUnknown_2022BC4
ldr r1, _0803D70C @ =gBattleBufferA
ldrb r2, [r3]
lsls r0, r2, 9
adds r1, 0x2
@@ -5939,7 +5939,7 @@ _0803D6AC:
.align 2, 0
_0803D704: .4byte gBattleSpritesDataPtr
_0803D708: .4byte gActiveBattler
_0803D70C: .4byte gUnknown_2022BC4
_0803D70C: .4byte gBattleBufferA
_0803D710:
movs r0, 0x3F
negs r0, r0
@@ -5987,7 +5987,7 @@ _0803D718:
movs r1, 0x5D
strb r1, [r0, 0x5]
_0803D76A:
ldr r0, _0803D788 @ =gUnknown_3004FE0
ldr r0, _0803D788 @ =gBattlerControllerFuncs
ldrb r1, [r7]
lsls r1, 2
adds r1, r0
@@ -6001,7 +6001,7 @@ _0803D776:
_0803D77C: .4byte gUnknown_2022BC8
_0803D780: .4byte gUnknown_2024000
_0803D784: .4byte gBattleSpritesDataPtr
_0803D788: .4byte gUnknown_3004FE0
_0803D788: .4byte gBattlerControllerFuncs
_0803D78C: .4byte sub_803D790
thumb_func_end RecordedOpponentHandleDrawPartyStatusSummary
@@ -6108,7 +6108,7 @@ RecordedOpponentHandleSpriteInvisibility: @ 803D834
adds r2, r0
lsls r2, 2
adds r2, r3
ldr r0, _0803D890 @ =gUnknown_2022BC4
ldr r0, _0803D890 @ =gBattleBufferA
lsls r1, 9
adds r0, 0x1
adds r1, r0
@@ -6134,7 +6134,7 @@ _0803D87A:
_0803D884: .4byte gActiveBattler
_0803D888: .4byte gSprites
_0803D88C: .4byte gBattlerSpriteIds
_0803D890: .4byte gUnknown_2022BC4
_0803D890: .4byte gBattleBufferA
thumb_func_end RecordedOpponentHandleSpriteInvisibility
thumb_func_start RecordedOpponentHandleBattleAnimation
@@ -6147,7 +6147,7 @@ RecordedOpponentHandleBattleAnimation: @ 803D894
lsls r0, 24
cmp r0, 0
bne _0803D8EC
ldr r5, _0803D8DC @ =gUnknown_2022BC4
ldr r5, _0803D8DC @ =gBattleBufferA
ldrb r2, [r6]
lsls r1, r2, 9
adds r0, r5, 0x1
@@ -6172,9 +6172,9 @@ RecordedOpponentHandleBattleAnimation: @ 803D894
b _0803D8EC
.align 2, 0
_0803D8D8: .4byte gActiveBattler
_0803D8DC: .4byte gUnknown_2022BC4
_0803D8DC: .4byte gBattleBufferA
_0803D8E0:
ldr r0, _0803D8F4 @ =gUnknown_3004FE0
ldr r0, _0803D8F4 @ =gBattlerControllerFuncs
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -6186,7 +6186,7 @@ _0803D8EC:
pop {r0}
bx r0
.align 2, 0
_0803D8F4: .4byte gUnknown_3004FE0
_0803D8F4: .4byte gBattlerControllerFuncs
_0803D8F8: .4byte CompleteOnFinishedBattleAnimation_5
thumb_func_end RecordedOpponentHandleBattleAnimation
@@ -6209,7 +6209,7 @@ sub_803D908: @ 803D908
thumb_func_start RecordedOpponentHandleCmd55
RecordedOpponentHandleCmd55: @ 803D914
push {lr}
ldr r1, _0803D930 @ =gUnknown_2022BC4
ldr r1, _0803D930 @ =gBattleBufferA
ldr r0, _0803D934 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -6222,7 +6222,7 @@ RecordedOpponentHandleCmd55: @ 803D914
strb r2, [r0]
b _0803D944
.align 2, 0
_0803D930: .4byte gUnknown_2022BC4
_0803D930: .4byte gBattleBufferA
_0803D934: .4byte gActiveBattler
_0803D938: .4byte gBattleOutcome
_0803D93C:
@@ -6236,7 +6236,7 @@ _0803D944:
movs r0, 0x3
bl BeginFastPaletteFade
bl RecordedOpponentBufferExecCompleted
ldr r1, _0803D96C @ =gUnknown_3004FE0
ldr r1, _0803D96C @ =gBattlerControllerFuncs
ldr r0, _0803D970 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -6247,7 +6247,7 @@ _0803D944:
bx r0
.align 2, 0
_0803D968: .4byte gBattleOutcome
_0803D96C: .4byte gUnknown_3004FE0
_0803D96C: .4byte gBattlerControllerFuncs
_0803D970: .4byte gActiveBattler
_0803D974: .4byte sub_802F6A8
thumb_func_end RecordedOpponentHandleCmd55
+114 -114
View File
@@ -12,7 +12,7 @@ nullsub_77: @ 80D4200
thumb_func_start sub_80D4204
sub_80D4204: @ 80D4204
ldr r1, _080D4214 @ =gUnknown_3004FE0
ldr r1, _080D4214 @ =gBattlerControllerFuncs
ldr r0, _080D4218 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -21,7 +21,7 @@ sub_80D4204: @ 80D4204
str r1, [r0]
bx lr
.align 2, 0
_080D4214: .4byte gUnknown_3004FE0
_080D4214: .4byte gBattlerControllerFuncs
_080D4218: .4byte gActiveBattler
_080D421C: .4byte LinkPartnerBufferRunCommand
thumb_func_end sub_80D4204
@@ -29,7 +29,7 @@ _080D421C: .4byte LinkPartnerBufferRunCommand
thumb_func_start LinkPartnerBufferRunCommand
LinkPartnerBufferRunCommand: @ 80D4220
push {lr}
ldr r2, _080D4254 @ =gUnknown_2023BC8
ldr r2, _080D4254 @ =gBattleControllerExecFlags
ldr r1, _080D4258 @ =gBitTable
ldr r0, _080D425C @ =gActiveBattler
ldrb r3, [r0]
@@ -40,7 +40,7 @@ LinkPartnerBufferRunCommand: @ 80D4220
ands r1, r0
cmp r1, 0
beq _080D426C
ldr r0, _080D4260 @ =gUnknown_2022BC4
ldr r0, _080D4260 @ =gBattleBufferA
lsls r1, r3, 9
adds r1, r0
ldrb r0, [r1]
@@ -54,10 +54,10 @@ LinkPartnerBufferRunCommand: @ 80D4220
bl _call_via_r0
b _080D426C
.align 2, 0
_080D4254: .4byte gUnknown_2023BC8
_080D4254: .4byte gBattleControllerExecFlags
_080D4258: .4byte gBitTable
_080D425C: .4byte gActiveBattler
_080D4260: .4byte gUnknown_2022BC4
_080D4260: .4byte gBattleBufferA
_080D4264: .4byte gUnknown_83FB134
_080D4268:
bl sub_80D49E8
@@ -273,7 +273,7 @@ _080D43F4:
adds r0, r2
movs r1, 0x3
strb r1, [r0, 0x9]
ldr r1, _080D4434 @ =gUnknown_3004FE0
ldr r1, _080D4434 @ =gBattlerControllerFuncs
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
@@ -289,7 +289,7 @@ _080D4424: .4byte gHealthboxSpriteIds
_080D4428: .4byte gActiveBattler
_080D442C: .4byte SpriteCallbackDummy
_080D4430: .4byte gBattleSpritesDataPtr
_080D4434: .4byte gUnknown_3004FE0
_080D4434: .4byte gBattlerControllerFuncs
_080D4438: .4byte sub_80D4310
thumb_func_end sub_80D4358
@@ -429,7 +429,7 @@ _080D4500:
negs r0, r0
ands r0, r1
strb r0, [r2, 0x9]
ldr r1, _080D4588 @ =gUnknown_3004FE0
ldr r1, _080D4588 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -448,7 +448,7 @@ _080D4578: .4byte gSprites
_080D457C: .4byte gHealthboxSpriteIds
_080D4580: .4byte gBattlerPartyIndexes
_080D4584: .4byte gPlayerParty
_080D4588: .4byte gUnknown_3004FE0
_080D4588: .4byte gBattlerControllerFuncs
_080D458C: .4byte sub_80D4358
thumb_func_end sub_80D443C
@@ -680,7 +680,7 @@ sub_80D4730: @ 80D4730
subs r0, 0x5
ands r0, r1
strb r0, [r2]
ldr r0, _080D4778 @ =gUnknown_2024005
ldr r0, _080D4778 @ =gDoingBattleAnim
strb r3, [r0]
bl sub_80D49E8
b _080D47A6
@@ -688,7 +688,7 @@ sub_80D4730: @ 80D4730
_080D476C: .4byte gBattlerSpriteIds
_080D4770: .4byte gActiveBattler
_080D4774: .4byte gSprites
_080D4778: .4byte gUnknown_2024005
_080D4778: .4byte gDoingBattleAnim
_080D477C:
ldrh r0, [r4, 0x30]
movs r1, 0x3
@@ -752,7 +752,7 @@ sub_80D47AC: @ 80D47AC
movs r3, 0x6
bl InitAndLaunchSpecialAnimation
_080D47EC:
ldr r0, _080D4814 @ =gUnknown_3004FE0
ldr r0, _080D4814 @ =gBattlerControllerFuncs
ldrb r1, [r4]
lsls r1, 2
adds r1, r0
@@ -768,7 +768,7 @@ _080D4804: .4byte gHealthboxSpriteIds
_080D4808: .4byte gActiveBattler
_080D480C: .4byte SpriteCallbackDummy
_080D4810: .4byte gBattleSpritesDataPtr
_080D4814: .4byte gUnknown_3004FE0
_080D4814: .4byte gBattlerControllerFuncs
_080D4818: .4byte sub_80D481C
thumb_func_end sub_80D47AC
@@ -882,7 +882,7 @@ sub_80D484C: @ 80D484C
bl SetHealthboxSpriteVisible
ldrb r0, [r7]
bl CopyBattleSpriteInvisibility
ldr r1, _080D493C @ =gUnknown_3004FE0
ldr r1, _080D493C @ =gBattlerControllerFuncs
ldrb r0, [r7]
lsls r0, 2
adds r0, r1
@@ -904,7 +904,7 @@ _080D492C: .4byte gPlayerParty
_080D4930: .4byte gBattlerSpriteIds
_080D4934: .4byte gSprites
_080D4938: .4byte gHealthboxSpriteIds
_080D493C: .4byte gUnknown_3004FE0
_080D493C: .4byte gBattlerControllerFuncs
_080D4940: .4byte sub_80D47AC
thumb_func_end sub_80D484C
@@ -963,7 +963,7 @@ _080D4976:
bne _080D49BC
adds r0, r3, r5
bl DestroySprite
ldr r1, _080D49E0 @ =gUnknown_3004FE0
ldr r1, _080D49E0 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -981,7 +981,7 @@ _080D49D0: .4byte gPlayerParty
_080D49D4: .4byte gSprites
_080D49D8: .4byte gUnknown_3004FFC
_080D49DC: .4byte SpriteCallbackDummy
_080D49E0: .4byte gUnknown_3004FE0
_080D49E0: .4byte gBattlerControllerFuncs
_080D49E4: .4byte sub_80D484C
thumb_func_end sub_80D4944
@@ -989,7 +989,7 @@ _080D49E4: .4byte sub_80D484C
sub_80D49E8: @ 80D49E8
push {r4,lr}
sub sp, 0x4
ldr r1, _080D4A28 @ =gUnknown_3004FE0
ldr r1, _080D4A28 @ =gBattlerControllerFuncs
ldr r4, _080D4A2C @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 2
@@ -1009,7 +1009,7 @@ sub_80D49E8: @ 80D49E8
movs r1, 0x4
mov r2, sp
bl PrepareBufferDataTransferLink
ldr r1, _080D4A38 @ =gUnknown_2022BC4
ldr r1, _080D4A38 @ =gBattleBufferA
ldrb r0, [r4]
lsls r0, 9
adds r0, r1
@@ -1017,13 +1017,13 @@ sub_80D49E8: @ 80D49E8
strb r1, [r0]
b _080D4A4E
.align 2, 0
_080D4A28: .4byte gUnknown_3004FE0
_080D4A28: .4byte gBattlerControllerFuncs
_080D4A2C: .4byte gActiveBattler
_080D4A30: .4byte LinkPartnerBufferRunCommand
_080D4A34: .4byte gBattleTypeFlags
_080D4A38: .4byte gUnknown_2022BC4
_080D4A38: .4byte gBattleBufferA
_080D4A3C:
ldr r2, _080D4A58 @ =gUnknown_2023BC8
ldr r2, _080D4A58 @ =gBattleControllerExecFlags
ldr r1, _080D4A5C @ =gBitTable
ldrb r0, [r4]
lsls r0, 2
@@ -1038,7 +1038,7 @@ _080D4A4E:
pop {r0}
bx r0
.align 2, 0
_080D4A58: .4byte gUnknown_2023BC8
_080D4A58: .4byte gBattleControllerExecFlags
_080D4A5C: .4byte gBitTable
thumb_func_end sub_80D49E8
@@ -1099,7 +1099,7 @@ LinkPartnerHandleGetAttributes: @ 80D4AC0
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
ldr r1, _080D4AEC @ =gUnknown_2022BC4
ldr r1, _080D4AEC @ =gBattleBufferA
ldr r0, _080D4AF0 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -1117,7 +1117,7 @@ LinkPartnerHandleGetAttributes: @ 80D4AC0
adds r6, r0, 0
b _080D4B1A
.align 2, 0
_080D4AEC: .4byte gUnknown_2022BC4
_080D4AEC: .4byte gBattleBufferA
_080D4AF0: .4byte gActiveBattler
_080D4AF4: .4byte gBattlerPartyIndexes
_080D4AF8:
@@ -1164,7 +1164,7 @@ dp01_getattr_by_ch1_for_player_pokemon: @ 80D4B34
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
ldr r2, _080D4B68 @ =gUnknown_2022BC4
ldr r2, _080D4B68 @ =gBattleBufferA
ldr r3, _080D4B6C @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 9
@@ -1181,7 +1181,7 @@ _080D4B5E:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080D4B68: .4byte gUnknown_2022BC4
_080D4B68: .4byte gBattleBufferA
_080D4B6C: .4byte gActiveBattler
_080D4B70: .4byte _080D4B74
.align 2, 0
@@ -2097,7 +2097,7 @@ sub_80D52E0: @ 80D52E0
thumb_func_start LinkPartnerHandleSetAttributes
LinkPartnerHandleSetAttributes: @ 80D52EC
push {r4,r5,lr}
ldr r1, _080D5310 @ =gUnknown_2022BC4
ldr r1, _080D5310 @ =gBattleBufferA
ldr r0, _080D5314 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -2113,7 +2113,7 @@ LinkPartnerHandleSetAttributes: @ 80D52EC
bl sub_80D5344
b _080D533A
.align 2, 0
_080D5310: .4byte gUnknown_2022BC4
_080D5310: .4byte gBattleBufferA
_080D5314: .4byte gActiveBattler
_080D5318: .4byte gBattlerPartyIndexes
_080D531C:
@@ -2494,7 +2494,7 @@ _080D56A8:
muls r0, r5
ldr r1, _080D56C4 @ =gPlayerParty
adds r0, r1
ldr r3, _080D56C8 @ =gUnknown_2022BC4
ldr r3, _080D56C8 @ =gBattleBufferA
ldr r1, _080D56CC @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
@@ -2505,7 +2505,7 @@ _080D56A8:
b _080D574C
.align 2, 0
_080D56C4: .4byte gPlayerParty
_080D56C8: .4byte gUnknown_2022BC4
_080D56C8: .4byte gBattleBufferA
_080D56CC: .4byte gActiveBattler
_080D56D0:
movs r0, 0x64
@@ -2557,7 +2557,7 @@ _080D5734:
muls r0, r5
ldr r1, _080D5758 @ =gPlayerParty
adds r0, r1
ldr r3, _080D575C @ =gUnknown_2022BC4
ldr r3, _080D575C @ =gBattleBufferA
ldr r1, _080D5760 @ =gActiveBattler
ldrb r2, [r1]
lsls r2, 9
@@ -2572,7 +2572,7 @@ _080D574C:
b _080D5D0A
.align 2, 0
_080D5758: .4byte gPlayerParty
_080D575C: .4byte gUnknown_2022BC4
_080D575C: .4byte gBattleBufferA
_080D5760: .4byte gActiveBattler
_080D5764:
movs r0, 0x64
@@ -3289,7 +3289,7 @@ LinkPartnerHandlecmd3: @ 80D5D40
movs r0, 0x64
adds r3, r1, 0
muls r3, r0
ldr r4, _080D5DAC @ =gUnknown_2022BC4
ldr r4, _080D5DAC @ =gBattleBufferA
lsls r2, 9
adds r0, r4, 0x1
adds r0, r2, r0
@@ -3332,7 +3332,7 @@ _080D5D98:
.align 2, 0
_080D5DA4: .4byte gBattlerPartyIndexes
_080D5DA8: .4byte gActiveBattler
_080D5DAC: .4byte gUnknown_2022BC4
_080D5DAC: .4byte gBattleBufferA
_080D5DB0: .4byte gPlayerParty
thumb_func_end LinkPartnerHandlecmd3
@@ -3439,7 +3439,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
adds r2, r1
ldrb r1, [r2]
bl StartSpriteAnim
ldr r1, _080D5EC8 @ =gUnknown_3004FE0
ldr r1, _080D5EC8 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -3459,7 +3459,7 @@ _080D5EB8: .4byte gBattlerSpriteIds
_080D5EBC: .4byte gSprites
_080D5EC0: .4byte 0x0000ff10
_080D5EC4: .4byte gBattleMonForms
_080D5EC8: .4byte gUnknown_3004FE0
_080D5EC8: .4byte gBattlerControllerFuncs
_080D5ECC: .4byte sub_80D4590
thumb_func_end LinkPartnerHandleLoadPokeSprite
@@ -3468,7 +3468,7 @@ LinkPartnerHandleSendOutPoke: @ 80D5ED0
push {r4-r6,lr}
ldr r5, _080D5F28 @ =gActiveBattler
ldrb r0, [r5]
ldr r4, _080D5F2C @ =gUnknown_2022BC4
ldr r4, _080D5F2C @ =gBattleBufferA
lsls r1, r0, 9
adds r6, r4, 0x2
adds r1, r6
@@ -3497,7 +3497,7 @@ LinkPartnerHandleSendOutPoke: @ 80D5ED0
adds r1, r6
ldrb r1, [r1]
bl sub_80D5F40
ldr r1, _080D5F38 @ =gUnknown_3004FE0
ldr r1, _080D5F38 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -3508,10 +3508,10 @@ LinkPartnerHandleSendOutPoke: @ 80D5ED0
bx r0
.align 2, 0
_080D5F28: .4byte gActiveBattler
_080D5F2C: .4byte gUnknown_2022BC4
_080D5F2C: .4byte gBattleBufferA
_080D5F30: .4byte gBattlerPartyIndexes
_080D5F34: .4byte gPlayerParty
_080D5F38: .4byte gUnknown_3004FE0
_080D5F38: .4byte gBattlerControllerFuncs
_080D5F3C: .4byte sub_80D4944
thumb_func_end LinkPartnerHandleSendOutPoke
@@ -3532,7 +3532,7 @@ sub_80D5F40: @ 80D5F40
ldr r0, _080D6084 @ =gBattlerPartyIndexes
lsls r2, r6, 1
adds r2, r0
ldr r0, _080D6088 @ =gUnknown_2022BC4
ldr r0, _080D6088 @ =gBattleBufferA
lsls r1, r6, 9
adds r0, 0x1
adds r1, r0
@@ -3670,7 +3670,7 @@ sub_80D5F40: @ 80D5F40
bx r0
.align 2, 0
_080D6084: .4byte gBattlerPartyIndexes
_080D6088: .4byte gUnknown_2022BC4
_080D6088: .4byte gBattleBufferA
_080D608C: .4byte gPlayerParty
_080D6090: .4byte sub_8033E3C
_080D6094: .4byte gUnknown_3004FFC
@@ -3684,7 +3684,7 @@ _080D60A8: .4byte SpriteCallbackDummy
thumb_func_start LinkPartnerHandleReturnPokeToBall
LinkPartnerHandleReturnPokeToBall: @ 80D60AC
push {r4-r6,lr}
ldr r1, _080D60E0 @ =gUnknown_2022BC4
ldr r1, _080D60E0 @ =gBattleBufferA
ldr r6, _080D60E4 @ =gActiveBattler
ldrb r2, [r6]
lsls r0, r2, 9
@@ -3701,7 +3701,7 @@ LinkPartnerHandleReturnPokeToBall: @ 80D60AC
lsls r0, 2
adds r0, r1
strb r3, [r0, 0x4]
ldr r1, _080D60EC @ =gUnknown_3004FE0
ldr r1, _080D60EC @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -3709,10 +3709,10 @@ LinkPartnerHandleReturnPokeToBall: @ 80D60AC
str r1, [r0]
b _080D612A
.align 2, 0
_080D60E0: .4byte gUnknown_2022BC4
_080D60E0: .4byte gBattleBufferA
_080D60E4: .4byte gActiveBattler
_080D60E8: .4byte gBattleSpritesDataPtr
_080D60EC: .4byte gUnknown_3004FE0
_080D60EC: .4byte gBattlerControllerFuncs
_080D60F0: .4byte sub_80D613C
_080D60F4:
ldr r5, _080D6130 @ =gBattlerSpriteIds
@@ -3807,7 +3807,7 @@ _080D6192:
adds r1, r2, 0
movs r3, 0x1
bl InitAndLaunchSpecialAnimation
ldr r1, _080D61C0 @ =gUnknown_3004FE0
ldr r1, _080D61C0 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -3818,7 +3818,7 @@ _080D61BA:
pop {r0}
bx r0
.align 2, 0
_080D61C0: .4byte gUnknown_3004FE0
_080D61C0: .4byte gBattlerControllerFuncs
_080D61C4: .4byte sub_80D46A8
thumb_func_end sub_80D613C
@@ -3906,7 +3906,7 @@ _080D6258:
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r6, _080D631C @ =gMultiuseSpriteTemplate
mov r8, r7
ldr r0, _080D6320 @ =gUnknown_8239F8C
ldr r0, _080D6320 @ =gTrainerBackPicCoords
lsls r4, 2
adds r4, r0
ldrb r0, [r4]
@@ -3972,7 +3972,7 @@ _080D6258:
adds r0, r4
ldr r1, _080D6330 @ =sub_8033EEC
str r1, [r0]
ldr r1, _080D6334 @ =gUnknown_3004FE0
ldr r1, _080D6334 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -3986,12 +3986,12 @@ _080D6258:
.align 2, 0
_080D6318: .4byte gActiveBattler
_080D631C: .4byte gMultiuseSpriteTemplate
_080D6320: .4byte gUnknown_8239F8C
_080D6320: .4byte gTrainerBackPicCoords
_080D6324: .4byte gBattlerSpriteIds
_080D6328: .4byte gSprites
_080D632C: .4byte 0x0000fffe
_080D6330: .4byte sub_8033EEC
_080D6334: .4byte gUnknown_3004FE0
_080D6334: .4byte gBattlerControllerFuncs
_080D6338: .4byte sub_80D4270
thumb_func_end sub_80D61C8
@@ -4064,7 +4064,7 @@ sub_80D6348: @ 80D6348
adds r0, r5
ldr r1, _080D63E8 @ =SpriteCallbackDummy
bl StoreSpriteCallbackInData6
ldr r1, _080D63EC @ =gUnknown_3004FE0
ldr r1, _080D63EC @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -4080,7 +4080,7 @@ _080D63DC: .4byte gSprites
_080D63E0: .4byte 0x0000ffd8
_080D63E4: .4byte sub_8075590
_080D63E8: .4byte SpriteCallbackDummy
_080D63EC: .4byte gUnknown_3004FE0
_080D63EC: .4byte gBattlerControllerFuncs
_080D63F0: .4byte sub_80D42A8
thumb_func_end sub_80D6348
@@ -4178,7 +4178,7 @@ _080D6448:
adds r0, r2
ldr r1, _080D64D4 @ =sub_8012110
str r1, [r0]
ldr r1, _080D64D8 @ =gUnknown_3004FE0
ldr r1, _080D64D8 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -4194,7 +4194,7 @@ _080D64C8: .4byte gPlayerParty
_080D64CC: .4byte gSprites
_080D64D0: .4byte gBattlerSpriteIds
_080D64D4: .4byte sub_8012110
_080D64D8: .4byte gUnknown_3004FE0
_080D64D8: .4byte gBattlerControllerFuncs
_080D64DC: .4byte sub_80D4640
thumb_func_end sub_80D63F4
@@ -4241,7 +4241,7 @@ sub_80D6510: @ 80D6510
beq _080D6522
b _080D6636
_080D6522:
ldr r0, _080D65F8 @ =gUnknown_2022BC4
ldr r0, _080D65F8 @ =gBattleBufferA
mov r12, r0
ldrb r2, [r6]
lsls r2, 9
@@ -4345,7 +4345,7 @@ _080D6522:
b _080D6636
.align 2, 0
_080D65F4: .4byte gActiveBattler
_080D65F8: .4byte gUnknown_2022BC4
_080D65F8: .4byte gBattleBufferA
_080D65FC: .4byte gAnimMoveTurn
_080D6600: .4byte gAnimMovePower
_080D6604: .4byte gAnimMoveDmg
@@ -4363,7 +4363,7 @@ _080D6618:
lsls r0, 2
adds r0, r2
strb r3, [r0, 0x4]
ldr r1, _080D6640 @ =gUnknown_3004FE0
ldr r1, _080D6640 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -4375,7 +4375,7 @@ _080D6636:
bx r0
.align 2, 0
_080D663C: .4byte gBattleSpritesDataPtr
_080D6640: .4byte gUnknown_3004FE0
_080D6640: .4byte gBattlerControllerFuncs
_080D6644: .4byte sub_80D6648
thumb_func_end sub_80D6510
@@ -4386,7 +4386,7 @@ sub_80D6648: @ 80D6648
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r2, _080D6694 @ =gUnknown_2022BC4
ldr r2, _080D6694 @ =gBattleBufferA
ldr r6, _080D6698 @ =gActiveBattler
ldrb r3, [r6]
lsls r1, r3, 9
@@ -4420,7 +4420,7 @@ sub_80D6648: @ 80D6648
beq _080D66AA
b _080D67BC
.align 2, 0
_080D6694: .4byte gUnknown_2022BC4
_080D6694: .4byte gBattleBufferA
_080D6698: .4byte gActiveBattler
_080D669C: .4byte gBattleSpritesDataPtr
_080D66A0:
@@ -4584,7 +4584,7 @@ sub_80D67CC: @ 80D67CC
ldr r0, _080D680C @ =gUnknown_2022BC6
adds r4, r0
ldrh r0, [r4]
bl sub_80D7274
bl BufferStringBattle
ldrh r0, [r4]
bl sub_80D89B0
lsls r0, 24
@@ -4592,7 +4592,7 @@ sub_80D67CC: @ 80D67CC
beq _080D6814
ldr r0, _080D6810 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
bl BattlePutTextOnWindow
b _080D681C
.align 2, 0
_080D6800: .4byte gBattle_BG0_X
@@ -4603,9 +4603,9 @@ _080D6810: .4byte gDisplayedStringBattle
_080D6814:
ldr r0, _080D6830 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
_080D681C:
ldr r1, _080D6834 @ =gUnknown_3004FE0
ldr r1, _080D6834 @ =gBattlerControllerFuncs
ldr r0, _080D6838 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -4617,7 +4617,7 @@ _080D681C:
bx r0
.align 2, 0
_080D6830: .4byte gDisplayedStringBattle
_080D6834: .4byte gUnknown_3004FE0
_080D6834: .4byte gBattlerControllerFuncs
_080D6838: .4byte gActiveBattler
_080D683C: .4byte sub_80D4718
thumb_func_end sub_80D67CC
@@ -4687,7 +4687,7 @@ sub_80D6894: @ 80D6894
sub sp, 0x4
movs r0, 0
bl LoadBattleBarGfx
ldr r3, _080D690C @ =gUnknown_2022BC4
ldr r3, _080D690C @ =gBattleBufferA
ldr r0, _080D6910 @ =gActiveBattler
mov r9, r0
ldrb r4, [r0]
@@ -4736,7 +4736,7 @@ sub_80D6894: @ 80D6894
bl SetBattleBarStruct
b _080D694E
.align 2, 0
_080D690C: .4byte gUnknown_2022BC4
_080D690C: .4byte gBattleBufferA
_080D6910: .4byte gActiveBattler
_080D6914: .4byte 0x00007fff
_080D6918: .4byte gBattlerPartyIndexes
@@ -4763,7 +4763,7 @@ _080D6924:
movs r3, 0
bl SetBattleBarStruct
_080D694E:
ldr r1, _080D6978 @ =gUnknown_3004FE0
ldr r1, _080D6978 @ =gBattlerControllerFuncs
ldr r0, _080D697C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -4781,7 +4781,7 @@ _080D694E:
_080D696C: .4byte gBattlerPartyIndexes
_080D6970: .4byte gPlayerParty
_080D6974: .4byte gHealthboxSpriteIds
_080D6978: .4byte gUnknown_3004FE0
_080D6978: .4byte gBattlerControllerFuncs
_080D697C: .4byte gActiveBattler
_080D6980: .4byte sub_80D45D0
thumb_func_end sub_80D6894
@@ -4830,7 +4830,7 @@ sub_80D6990: @ 80D6990
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r1, _080D6A00 @ =gUnknown_3004FE0
ldr r1, _080D6A00 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -4846,7 +4846,7 @@ _080D69F0: .4byte gHealthboxSpriteIds
_080D69F4: .4byte gBattlerPartyIndexes
_080D69F8: .4byte gPlayerParty
_080D69FC: .4byte gBattleSpritesDataPtr
_080D6A00: .4byte gUnknown_3004FE0
_080D6A00: .4byte gBattlerControllerFuncs
_080D6A04: .4byte sub_80D4A60
thumb_func_end sub_80D6990
@@ -4859,7 +4859,7 @@ sub_80D6A08: @ 80D6A08
lsls r0, 24
cmp r0, 0
bne _080D6A58
ldr r4, _080D6A64 @ =gUnknown_2022BC4
ldr r4, _080D6A64 @ =gBattleBufferA
ldrb r3, [r5]
lsls r3, 9
adds r0, r4, 0x1
@@ -4884,7 +4884,7 @@ sub_80D6A08: @ 80D6A08
lsls r2, 24
orrs r1, r2
bl InitAndLaunchChosenStatusAnimation
ldr r1, _080D6A68 @ =gUnknown_3004FE0
ldr r1, _080D6A68 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -4896,8 +4896,8 @@ _080D6A58:
bx r0
.align 2, 0
_080D6A60: .4byte gActiveBattler
_080D6A64: .4byte gUnknown_2022BC4
_080D6A68: .4byte gUnknown_3004FE0
_080D6A64: .4byte gBattleBufferA
_080D6A68: .4byte gBattlerControllerFuncs
_080D6A6C: .4byte sub_80D4A60
thumb_func_end sub_80D6A08
@@ -4993,7 +4993,7 @@ _080D6AF4: .4byte gUnknown_2022870
LinkPartnerHandlecmd38: @ 80D6AF8
push {lr}
ldr r3, _080D6B24 @ =gUnknown_2022870
ldr r1, _080D6B28 @ =gUnknown_2022BC4
ldr r1, _080D6B28 @ =gBattleBufferA
ldr r0, _080D6B2C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -5013,7 +5013,7 @@ LinkPartnerHandlecmd38: @ 80D6AF8
bx r0
.align 2, 0
_080D6B24: .4byte gUnknown_2022870
_080D6B28: .4byte gUnknown_2022BC4
_080D6B28: .4byte gBattleBufferA
_080D6B2C: .4byte gActiveBattler
thumb_func_end LinkPartnerHandlecmd38
@@ -5079,7 +5079,7 @@ _080D6B98: .4byte gSprites
_080D6B9C: .4byte gBattlerSpriteIds
_080D6BA0: .4byte gActiveBattler
_080D6BA4:
ldr r1, _080D6BD4 @ =gUnknown_2024005
ldr r1, _080D6BD4 @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldrb r0, [r4]
@@ -5093,7 +5093,7 @@ _080D6BA4:
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl DoHitAnimHealthboxEffect
ldr r1, _080D6BD8 @ =gUnknown_3004FE0
ldr r1, _080D6BD8 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -5104,8 +5104,8 @@ _080D6BCE:
pop {r0}
bx r0
.align 2, 0
_080D6BD4: .4byte gUnknown_2024005
_080D6BD8: .4byte gUnknown_3004FE0
_080D6BD4: .4byte gDoingBattleAnim
_080D6BD8: .4byte gBattlerControllerFuncs
_080D6BDC: .4byte sub_80D4730
thumb_func_end LinkPartnerHandleHitAnimation
@@ -5129,7 +5129,7 @@ LinkPartnerHandleEffectivenessSound: @ 80D6BEC
bne _080D6C00
movs r3, 0xC0
_080D6C00:
ldr r2, _080D6C2C @ =gUnknown_2022BC4
ldr r2, _080D6C2C @ =gBattleBufferA
ldrb r1, [r4]
lsls r1, 9
adds r0, r2, 0x1
@@ -5149,13 +5149,13 @@ _080D6C00:
bx r0
.align 2, 0
_080D6C28: .4byte gActiveBattler
_080D6C2C: .4byte gUnknown_2022BC4
_080D6C2C: .4byte gBattleBufferA
thumb_func_end LinkPartnerHandleEffectivenessSound
thumb_func_start LinkPartnerHandlecmd44
LinkPartnerHandlecmd44: @ 80D6C30
push {lr}
ldr r2, _080D6C58 @ =gUnknown_2022BC4
ldr r2, _080D6C58 @ =gBattleBufferA
ldr r0, _080D6C5C @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
@@ -5172,7 +5172,7 @@ LinkPartnerHandlecmd44: @ 80D6C30
pop {r0}
bx r0
.align 2, 0
_080D6C58: .4byte gUnknown_2022BC4
_080D6C58: .4byte gBattleBufferA
_080D6C5C: .4byte gActiveBattler
thumb_func_end LinkPartnerHandlecmd44
@@ -5209,14 +5209,14 @@ _080D6C9C: .4byte gPlayerParty
thumb_func_start LinkPartnerHandleIntroSlide
LinkPartnerHandleIntroSlide: @ 80D6CA0
push {lr}
ldr r1, _080D6CC8 @ =gUnknown_2022BC4
ldr r1, _080D6CC8 @ =gBattleBufferA
ldr r0, _080D6CCC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl sub_80BC3A0
bl HandleIntroSlide
ldr r2, _080D6CD0 @ =gIntroSlideFlags
ldrh r0, [r2]
movs r1, 0x1
@@ -5226,7 +5226,7 @@ LinkPartnerHandleIntroSlide: @ 80D6CA0
pop {r0}
bx r0
.align 2, 0
_080D6CC8: .4byte gUnknown_2022BC4
_080D6CC8: .4byte gBattleBufferA
_080D6CCC: .4byte gActiveBattler
_080D6CD0: .4byte gIntroSlideFlags
thumb_func_end LinkPartnerHandleIntroSlide
@@ -5441,7 +5441,7 @@ _080D6E86:
movs r1, 0x1
orrs r0, r1
strb r0, [r2, 0x9]
ldr r1, _080D6EC8 @ =gUnknown_3004FE0
ldr r1, _080D6EC8 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -5460,7 +5460,7 @@ _080D6EB8: .4byte gTasks
_080D6EBC: .4byte gBattleSpritesDataPtr
_080D6EC0: .4byte gUnknown_2024000
_080D6EC4: .4byte sub_80491B0
_080D6EC8: .4byte gUnknown_3004FE0
_080D6EC8: .4byte gBattlerControllerFuncs
_080D6ECC: .4byte nullsub_77
thumb_func_end sub_80D6CD4
@@ -5505,7 +5505,7 @@ _080D6EFC:
cmp r0, 0
beq _080D6F4C
_080D6F1C:
ldr r0, _080D6F44 @ =gUnknown_2022BC4
ldr r0, _080D6F44 @ =gBattleBufferA
ldrb r1, [r7]
lsls r2, r1, 9
adds r0, 0x1
@@ -5522,10 +5522,10 @@ _080D6F1C:
.align 2, 0
_080D6F3C: .4byte gActiveBattler
_080D6F40: .4byte gBattleTypeFlags
_080D6F44: .4byte gUnknown_2022BC4
_080D6F44: .4byte gBattleBufferA
_080D6F48: .4byte gBattlerPartyIndexes
_080D6F4C:
ldr r4, _080D6FC4 @ =gUnknown_2022BC4
ldr r4, _080D6FC4 @ =gBattleBufferA
ldrb r0, [r7]
lsls r1, r0, 9
adds r4, 0x1
@@ -5565,7 +5565,7 @@ _080D6F4C:
eors r0, r6
strb r0, [r7]
_080D6FA0:
ldr r1, _080D6FD0 @ =gUnknown_3004FE0
ldr r1, _080D6FD0 @ =gBattlerControllerFuncs
ldr r2, _080D6FD4 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -5584,10 +5584,10 @@ _080D6FB8:
pop {r0}
bx r0
.align 2, 0
_080D6FC4: .4byte gUnknown_2022BC4
_080D6FC4: .4byte gBattleBufferA
_080D6FC8: .4byte gBattlerPartyIndexes
_080D6FCC: .4byte gPlayerParty
_080D6FD0: .4byte gUnknown_3004FE0
_080D6FD0: .4byte gBattlerControllerFuncs
_080D6FD4: .4byte gActiveBattler
_080D6FD8: .4byte sub_80D443C
thumb_func_end sub_80D6ED0
@@ -5595,7 +5595,7 @@ _080D6FD8: .4byte sub_80D443C
thumb_func_start sub_80D6FDC
sub_80D6FDC: @ 80D6FDC
push {r4-r6,lr}
ldr r1, _080D7004 @ =gUnknown_2022BC4
ldr r1, _080D7004 @ =gBattleBufferA
ldr r0, _080D7008 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -5612,7 +5612,7 @@ sub_80D6FDC: @ 80D6FDC
bl sub_80D49E8
b _080D7080
.align 2, 0
_080D7004: .4byte gUnknown_2022BC4
_080D7004: .4byte gBattleBufferA
_080D7008: .4byte gActiveBattler
_080D700C:
ldr r6, _080D7088 @ =gBattleSpritesDataPtr
@@ -5667,7 +5667,7 @@ _080D700C:
movs r1, 0x5D
strb r1, [r0, 0x5]
_080D7074:
ldr r0, _080D7098 @ =gUnknown_3004FE0
ldr r0, _080D7098 @ =gBattlerControllerFuncs
ldrb r1, [r5]
lsls r1, 2
adds r1, r0
@@ -5682,7 +5682,7 @@ _080D7088: .4byte gBattleSpritesDataPtr
_080D708C: .4byte gActiveBattler
_080D7090: .4byte gUnknown_2022BC8
_080D7094: .4byte gUnknown_2024000
_080D7098: .4byte gUnknown_3004FE0
_080D7098: .4byte gBattlerControllerFuncs
_080D709C: .4byte sub_80D70A0
thumb_func_end sub_80D6FDC
@@ -5789,7 +5789,7 @@ LinkPartnerHandleSpriteInvisibility: @ 80D7144
adds r2, r0
lsls r2, 2
adds r2, r3
ldr r0, _080D71A0 @ =gUnknown_2022BC4
ldr r0, _080D71A0 @ =gBattleBufferA
lsls r1, 9
adds r0, 0x1
adds r1, r0
@@ -5815,7 +5815,7 @@ _080D718A:
_080D7194: .4byte gActiveBattler
_080D7198: .4byte gSprites
_080D719C: .4byte gBattlerSpriteIds
_080D71A0: .4byte gUnknown_2022BC4
_080D71A0: .4byte gBattleBufferA
thumb_func_end LinkPartnerHandleSpriteInvisibility
thumb_func_start LinkPartnerHandleBattleAnimation
@@ -5828,7 +5828,7 @@ LinkPartnerHandleBattleAnimation: @ 80D71A4
lsls r0, 24
cmp r0, 0
bne _080D71FC
ldr r5, _080D71EC @ =gUnknown_2022BC4
ldr r5, _080D71EC @ =gBattleBufferA
ldrb r2, [r6]
lsls r1, r2, 9
adds r0, r5, 0x1
@@ -5853,9 +5853,9 @@ LinkPartnerHandleBattleAnimation: @ 80D71A4
b _080D71FC
.align 2, 0
_080D71E8: .4byte gActiveBattler
_080D71EC: .4byte gUnknown_2022BC4
_080D71EC: .4byte gBattleBufferA
_080D71F0:
ldr r0, _080D7204 @ =gUnknown_3004FE0
ldr r0, _080D7204 @ =gBattlerControllerFuncs
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -5867,7 +5867,7 @@ _080D71FC:
pop {r0}
bx r0
.align 2, 0
_080D7204: .4byte gUnknown_3004FE0
_080D7204: .4byte gBattlerControllerFuncs
_080D7208: .4byte sub_80D4A90
thumb_func_end LinkPartnerHandleBattleAnimation
@@ -5891,7 +5891,7 @@ sub_80D7218: @ 80D7218
LinkPartnerHandlecmd55: @ 80D7224
push {r4,lr}
ldr r2, _080D725C @ =gBattleOutcome
ldr r1, _080D7260 @ =gUnknown_2022BC4
ldr r1, _080D7260 @ =gBattleBufferA
ldr r4, _080D7264 @ =gActiveBattler
ldrb r0, [r4]
lsls r0, 9
@@ -5904,7 +5904,7 @@ LinkPartnerHandlecmd55: @ 80D7224
movs r0, 0x3
bl BeginFastPaletteFade
bl sub_80D49E8
ldr r1, _080D7268 @ =gUnknown_3004FE0
ldr r1, _080D7268 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -5915,9 +5915,9 @@ LinkPartnerHandlecmd55: @ 80D7224
bx r0
.align 2, 0
_080D725C: .4byte gBattleOutcome
_080D7260: .4byte gUnknown_2022BC4
_080D7260: .4byte gBattleBufferA
_080D7264: .4byte gActiveBattler
_080D7268: .4byte gUnknown_3004FE0
_080D7268: .4byte gBattlerControllerFuncs
_080D726C: .4byte sub_802F6A8
thumb_func_end LinkPartnerHandlecmd55
File diff suppressed because it is too large Load Diff
+120 -120
View File
@@ -12,7 +12,7 @@ nullsub_17: @ 8035A78
thumb_func_start sub_8035A7C
sub_8035A7C: @ 8035A7C
ldr r1, _08035A8C @ =gUnknown_3004FE0
ldr r1, _08035A8C @ =gBattlerControllerFuncs
ldr r0, _08035A90 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -21,7 +21,7 @@ sub_8035A7C: @ 8035A7C
str r1, [r0]
bx lr
.align 2, 0
_08035A8C: .4byte gUnknown_3004FE0
_08035A8C: .4byte gBattlerControllerFuncs
_08035A90: .4byte gActiveBattler
_08035A94: .4byte sub_8035A98
thumb_func_end sub_8035A7C
@@ -29,7 +29,7 @@ _08035A94: .4byte sub_8035A98
thumb_func_start sub_8035A98
sub_8035A98: @ 8035A98
push {lr}
ldr r2, _08035ACC @ =gUnknown_2023BC8
ldr r2, _08035ACC @ =gBattleControllerExecFlags
ldr r1, _08035AD0 @ =gBitTable
ldr r0, _08035AD4 @ =gActiveBattler
ldrb r3, [r0]
@@ -40,7 +40,7 @@ sub_8035A98: @ 8035A98
ands r1, r0
cmp r1, 0
beq _08035AE4
ldr r0, _08035AD8 @ =gUnknown_2022BC4
ldr r0, _08035AD8 @ =gBattleBufferA
lsls r1, r3, 9
adds r1, r0
ldrb r0, [r1]
@@ -54,10 +54,10 @@ sub_8035A98: @ 8035A98
bl _call_via_r0
b _08035AE4
.align 2, 0
_08035ACC: .4byte gUnknown_2023BC8
_08035ACC: .4byte gBattleControllerExecFlags
_08035AD0: .4byte gBitTable
_08035AD4: .4byte gActiveBattler
_08035AD8: .4byte gUnknown_2022BC4
_08035AD8: .4byte gBattleBufferA
_08035ADC: .4byte gUnknown_8250A34
_08035AE0:
bl OpponentBufferExecCompleted
@@ -424,7 +424,7 @@ _08035DB0:
adds r0, r2
movs r1, 0x3
strb r1, [r0, 0x9]
ldr r1, _08035DE8 @ =gUnknown_3004FE0
ldr r1, _08035DE8 @ =gBattlerControllerFuncs
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
@@ -439,7 +439,7 @@ _08035DD8: .4byte gMPlayInfo_BGM
_08035DDC: .4byte 0x0000ffff
_08035DE0: .4byte gBattleSpritesDataPtr
_08035DE4: .4byte gActiveBattler
_08035DE8: .4byte gUnknown_3004FE0
_08035DE8: .4byte gBattlerControllerFuncs
_08035DEC: .4byte sub_8035BE8
thumb_func_end sub_8035C30
@@ -655,7 +655,7 @@ _08035F28:
negs r0, r0
ands r0, r1
strb r0, [r2, 0x9]
ldr r1, _08035FE0 @ =gUnknown_3004FE0
ldr r1, _08035FE0 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -677,7 +677,7 @@ _08035FD0: .4byte gBattleTypeFlags
_08035FD4: .4byte gUnknown_3004FFC
_08035FD8: .4byte gSprites
_08035FDC: .4byte gHealthboxSpriteIds
_08035FE0: .4byte gUnknown_3004FE0
_08035FE0: .4byte gBattlerControllerFuncs
_08035FE4: .4byte sub_8035C30
thumb_func_end sub_8035DF0
@@ -815,7 +815,7 @@ _080360E8:
beq _08036120
movs r0, 0x1
bl sub_80EB2F4
ldr r0, _08036118 @ =gUnknown_3004FE0
ldr r0, _08036118 @ =gBattlerControllerFuncs
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -824,7 +824,7 @@ _080360E8:
b _08036124
.align 2, 0
_08036114: .4byte gBattleTypeFlags
_08036118: .4byte gUnknown_3004FE0
_08036118: .4byte gBattlerControllerFuncs
_0803611C: .4byte sub_80E8570
_08036120:
bl OpponentBufferExecCompleted
@@ -961,7 +961,7 @@ sub_80361FC: @ 80361FC
subs r0, 0x5
ands r0, r1
strb r0, [r2]
ldr r0, _08036244 @ =gUnknown_2024005
ldr r0, _08036244 @ =gDoingBattleAnim
strb r3, [r0]
bl OpponentBufferExecCompleted
b _08036272
@@ -969,7 +969,7 @@ sub_80361FC: @ 80361FC
_08036238: .4byte gBattlerSpriteIds
_0803623C: .4byte gActiveBattler
_08036240: .4byte gSprites
_08036244: .4byte gUnknown_2024005
_08036244: .4byte gDoingBattleAnim
_08036248:
ldrh r0, [r4, 0x30]
movs r1, 0x3
@@ -1033,7 +1033,7 @@ sub_8036278: @ 8036278
movs r3, 0x6
bl InitAndLaunchSpecialAnimation
_080362B8:
ldr r0, _080362E0 @ =gUnknown_3004FE0
ldr r0, _080362E0 @ =gBattlerControllerFuncs
ldrb r1, [r4]
lsls r1, 2
adds r1, r0
@@ -1049,7 +1049,7 @@ _080362D0: .4byte gHealthboxSpriteIds
_080362D4: .4byte gActiveBattler
_080362D8: .4byte SpriteCallbackDummy
_080362DC: .4byte gBattleSpritesDataPtr
_080362E0: .4byte gUnknown_3004FE0
_080362E0: .4byte gBattlerControllerFuncs
_080362E4: .4byte sub_80362E8
thumb_func_end sub_8036278
@@ -1161,7 +1161,7 @@ sub_8036334: @ 8036334
bl SetHealthboxSpriteVisible
ldrb r0, [r5]
bl CopyBattleSpriteInvisibility
ldr r1, _08036400 @ =gUnknown_3004FE0
ldr r1, _08036400 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -1180,7 +1180,7 @@ _080363F0: .4byte gSprites
_080363F4: .4byte gHealthboxSpriteIds
_080363F8: .4byte gBattlerPartyIndexes
_080363FC: .4byte gEnemyParty
_08036400: .4byte gUnknown_3004FE0
_08036400: .4byte gBattlerControllerFuncs
_08036404: .4byte sub_8036278
thumb_func_end sub_8036334
@@ -1255,7 +1255,7 @@ _0803643A:
lsrs r1, 16
adds r0, r4, 0
bl SetBattlerShadowSpriteCallback
ldr r1, _080364C8 @ =gUnknown_3004FE0
ldr r1, _080364C8 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -1273,7 +1273,7 @@ _080364B8: .4byte gEnemyParty
_080364BC: .4byte gSprites
_080364C0: .4byte gUnknown_3004FFC
_080364C4: .4byte SpriteCallbackDummy
_080364C8: .4byte gUnknown_3004FE0
_080364C8: .4byte gBattlerControllerFuncs
_080364CC: .4byte sub_8036334
thumb_func_end sub_8036408
@@ -1331,14 +1331,14 @@ _0803652C: .4byte gActiveBattler
thumb_func_start OpponentBufferExecCompleted
OpponentBufferExecCompleted: @ 8036530
ldr r1, _08036554 @ =gUnknown_3004FE0
ldr r1, _08036554 @ =gBattlerControllerFuncs
ldr r2, _08036558 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
adds r0, r1
ldr r1, _0803655C @ =sub_8035A98
str r1, [r0]
ldr r3, _08036560 @ =gUnknown_2023BC8
ldr r3, _08036560 @ =gBattleControllerExecFlags
ldr r1, _08036564 @ =gBitTable
ldrb r0, [r2]
lsls r0, 2
@@ -1349,10 +1349,10 @@ OpponentBufferExecCompleted: @ 8036530
str r0, [r3]
bx lr
.align 2, 0
_08036554: .4byte gUnknown_3004FE0
_08036554: .4byte gBattlerControllerFuncs
_08036558: .4byte gActiveBattler
_0803655C: .4byte sub_8035A98
_08036560: .4byte gUnknown_2023BC8
_08036560: .4byte gBattleControllerExecFlags
_08036564: .4byte gBitTable
thumb_func_end OpponentBufferExecCompleted
@@ -1361,7 +1361,7 @@ OpponentHandleGetAttributes: @ 8036568
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
ldr r1, _08036594 @ =gUnknown_2022BC4
ldr r1, _08036594 @ =gBattleBufferA
ldr r0, _08036598 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -1379,7 +1379,7 @@ OpponentHandleGetAttributes: @ 8036568
adds r6, r0, 0
b _080365C2
.align 2, 0
_08036594: .4byte gUnknown_2022BC4
_08036594: .4byte gBattleBufferA
_08036598: .4byte gActiveBattler
_0803659C: .4byte gBattlerPartyIndexes
_080365A0:
@@ -1426,7 +1426,7 @@ sub_80365DC: @ 80365DC
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
ldr r2, _08036610 @ =gUnknown_2022BC4
ldr r2, _08036610 @ =gBattleBufferA
ldr r3, _08036614 @ =gActiveBattler
ldrb r0, [r3]
lsls r0, 9
@@ -1443,7 +1443,7 @@ _08036606:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08036610: .4byte gUnknown_2022BC4
_08036610: .4byte gBattleBufferA
_08036614: .4byte gActiveBattler
_08036618: .4byte _0803661C
.align 2, 0
@@ -2361,7 +2361,7 @@ OpponentHandlecmd1: @ 8036D88
movs r0, 0x64
adds r4, r2, 0
muls r4, r0
ldr r3, _08036E08 @ =gUnknown_2022BC4
ldr r3, _08036E08 @ =gBattleBufferA
lsls r1, 9
adds r0, r3, 0x1
adds r0, r1, r0
@@ -2412,14 +2412,14 @@ _08036DDE:
.align 2, 0
_08036E00: .4byte gBattlerPartyIndexes
_08036E04: .4byte gActiveBattler
_08036E08: .4byte gUnknown_2022BC4
_08036E08: .4byte gBattleBufferA
_08036E0C: .4byte gEnemyParty
thumb_func_end OpponentHandlecmd1
thumb_func_start OpponentHandleSetAttributes
OpponentHandleSetAttributes: @ 8036E10
push {r4,r5,lr}
ldr r1, _08036E34 @ =gUnknown_2022BC4
ldr r1, _08036E34 @ =gBattleBufferA
ldr r0, _08036E38 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -2435,7 +2435,7 @@ OpponentHandleSetAttributes: @ 8036E10
bl sub_8036E68
b _08036E5E
.align 2, 0
_08036E34: .4byte gUnknown_2022BC4
_08036E34: .4byte gBattleBufferA
_08036E38: .4byte gActiveBattler
_08036E3C: .4byte gBattlerPartyIndexes
_08036E40:
@@ -2812,7 +2812,7 @@ _080371C0:
muls r0, r5
ldr r1, _080371D8 @ =gEnemyParty
adds r0, r1
ldr r3, _080371DC @ =gUnknown_2022BC4
ldr r3, _080371DC @ =gBattleBufferA
ldrb r2, [r6]
lsls r2, 9
adds r1, r3, 0x1
@@ -2822,7 +2822,7 @@ _080371C0:
b _0803725E
.align 2, 0
_080371D8: .4byte gEnemyParty
_080371DC: .4byte gUnknown_2022BC4
_080371DC: .4byte gBattleBufferA
_080371E0:
movs r0, 0x64
adds r4, r5, 0
@@ -2876,7 +2876,7 @@ _08037248:
muls r0, r5
ldr r1, _08037268 @ =gEnemyParty
adds r0, r1
ldr r3, _0803726C @ =gUnknown_2022BC4
ldr r3, _0803726C @ =gBattleBufferA
ldrb r2, [r6]
lsls r2, 9
adds r1, r3, 0x1
@@ -2890,7 +2890,7 @@ _0803725E:
b _08037774
.align 2, 0
_08037268: .4byte gEnemyParty
_0803726C: .4byte gUnknown_2022BC4
_0803726C: .4byte gBattleBufferA
_08037270:
movs r0, 0x64
muls r0, r5
@@ -3514,7 +3514,7 @@ OpponentHandlecmd3: @ 8037788
movs r0, 0x64
adds r3, r1, 0
muls r3, r0
ldr r4, _080377F4 @ =gUnknown_2022BC4
ldr r4, _080377F4 @ =gBattleBufferA
lsls r2, 9
adds r0, r4, 0x1
adds r0, r2, r0
@@ -3557,7 +3557,7 @@ _080377E0:
.align 2, 0
_080377EC: .4byte gBattlerPartyIndexes
_080377F0: .4byte gActiveBattler
_080377F4: .4byte gUnknown_2022BC4
_080377F4: .4byte gBattleBufferA
_080377F8: .4byte gEnemyParty
thumb_func_end OpponentHandlecmd3
@@ -3745,7 +3745,7 @@ _080378AA:
adds r0, r4, 0
bl SetBattlerShadowSpriteCallback
_08037986:
ldr r0, _080379C0 @ =gUnknown_3004FE0
ldr r0, _080379C0 @ =gBattlerControllerFuncs
ldrb r1, [r7]
lsls r1, 2
adds r1, r0
@@ -3766,7 +3766,7 @@ _080379B0: .4byte gBattleMonForms
_080379B4: .4byte gBattleTypeFlags
_080379B8: .4byte gBattlerPartyIndexes
_080379BC: .4byte gEnemyParty
_080379C0: .4byte gUnknown_3004FE0
_080379C0: .4byte gBattlerControllerFuncs
_080379C4: .4byte sub_8035FE8
thumb_func_end sub_80377FC
@@ -3785,7 +3785,7 @@ OpponentHandleSwitchInAnim: @ 80379C8
ldrb r0, [r4]
lsls r2, r0, 1
adds r2, r1
ldr r3, _08037A1C @ =gUnknown_2022BC4
ldr r3, _08037A1C @ =gBattleBufferA
lsls r0, 9
adds r1, r3, 0x1
adds r0, r1
@@ -3797,7 +3797,7 @@ OpponentHandleSwitchInAnim: @ 80379C8
adds r1, r3
ldrb r1, [r1]
bl sub_8037A28
ldr r1, _08037A20 @ =gUnknown_3004FE0
ldr r1, _08037A20 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -3810,8 +3810,8 @@ OpponentHandleSwitchInAnim: @ 80379C8
_08037A10: .4byte gActiveBattler
_08037A14: .4byte gBattleStruct
_08037A18: .4byte gBattlerPartyIndexes
_08037A1C: .4byte gUnknown_2022BC4
_08037A20: .4byte gUnknown_3004FE0
_08037A1C: .4byte gBattleBufferA
_08037A20: .4byte gBattlerControllerFuncs
_08037A24: .4byte sub_8036408
thumb_func_end OpponentHandleSwitchInAnim
@@ -3832,7 +3832,7 @@ sub_8037A28: @ 8037A28
ldr r0, _08037B84 @ =gBattlerPartyIndexes
lsls r4, r6, 1
adds r4, r0
ldr r0, _08037B88 @ =gUnknown_2022BC4
ldr r0, _08037B88 @ =gBattleBufferA
lsls r1, r6, 9
adds r0, 0x1
adds r1, r0
@@ -3980,7 +3980,7 @@ sub_8037A28: @ 8037A28
bx r0
.align 2, 0
_08037B84: .4byte gBattlerPartyIndexes
_08037B88: .4byte gUnknown_2022BC4
_08037B88: .4byte gBattleBufferA
_08037B8C: .4byte gEnemyParty
_08037B90: .4byte sub_8033E3C
_08037B94: .4byte gUnknown_3004FFC
@@ -3994,7 +3994,7 @@ _08037BA8: .4byte SpriteCallbackDummy
thumb_func_start sub_8037BAC
sub_8037BAC: @ 8037BAC
push {r4-r6,lr}
ldr r1, _08037BE0 @ =gUnknown_2022BC4
ldr r1, _08037BE0 @ =gBattleBufferA
ldr r6, _08037BE4 @ =gActiveBattler
ldrb r2, [r6]
lsls r0, r2, 9
@@ -4011,7 +4011,7 @@ sub_8037BAC: @ 8037BAC
lsls r0, 2
adds r0, r1
strb r3, [r0, 0x4]
ldr r1, _08037BEC @ =gUnknown_3004FE0
ldr r1, _08037BEC @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -4019,10 +4019,10 @@ sub_8037BAC: @ 8037BAC
str r1, [r0]
b _08037C30
.align 2, 0
_08037BE0: .4byte gUnknown_2022BC4
_08037BE0: .4byte gBattleBufferA
_08037BE4: .4byte gActiveBattler
_08037BE8: .4byte gBattleSpritesDataPtr
_08037BEC: .4byte gUnknown_3004FE0
_08037BEC: .4byte gBattlerControllerFuncs
_08037BF0: .4byte sub_8037C44
_08037BF4:
ldr r5, _08037C38 @ =gBattlerSpriteIds
@@ -4119,7 +4119,7 @@ _08037C9A:
adds r1, r2, 0
movs r3, 0x2
bl InitAndLaunchSpecialAnimation
ldr r1, _08037CC8 @ =gUnknown_3004FE0
ldr r1, _08037CC8 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -4130,7 +4130,7 @@ _08037CC2:
pop {r0}
bx r0
.align 2, 0
_08037CC8: .4byte gUnknown_3004FE0
_08037CC8: .4byte gBattlerControllerFuncs
_08037CCC: .4byte sub_8036170
thumb_func_end sub_8037C44
@@ -4323,7 +4323,7 @@ _08037D3A:
adds r0, r4
ldr r1, _08037E98 @ =sub_8033EEC
str r1, [r0]
ldr r1, _08037E9C @ =gUnknown_3004FE0
ldr r1, _08037E9C @ =gBattlerControllerFuncs
mov r2, r8
ldrb r0, [r2]
lsls r0, 2
@@ -4349,7 +4349,7 @@ _08037E8C: .4byte gTrainerFrontPicTable
_08037E90: .4byte 0x000003ff
_08037E94: .4byte 0xfffffc00
_08037E98: .4byte sub_8033EEC
_08037E9C: .4byte gUnknown_3004FE0
_08037E9C: .4byte gBattlerControllerFuncs
_08037EA0: .4byte sub_8035AE8
thumb_func_end sub_8037CD0
@@ -4544,7 +4544,7 @@ _08037F0E:
adds r0, r4
ldr r1, _0803806C @ =sub_8033EEC
str r1, [r0]
ldr r1, _08038070 @ =gUnknown_3004FE0
ldr r1, _08038070 @ =gBattlerControllerFuncs
ldrb r0, [r3]
lsls r0, 2
adds r0, r1
@@ -4569,7 +4569,7 @@ _08038060: .4byte gTrainerFrontPicTable
_08038064: .4byte 0x000003ff
_08038068: .4byte 0xfffffc00
_0803806C: .4byte sub_8033EEC
_08038070: .4byte gUnknown_3004FE0
_08038070: .4byte gBattlerControllerFuncs
_08038074: .4byte sub_8035B20
thumb_func_end sub_8037EA4
@@ -4635,7 +4635,7 @@ sub_8038078: @ 8038078
adds r0, r5
ldr r1, _08038118 @ =SpriteCallbackDummy
bl StoreSpriteCallbackInData6
ldr r1, _0803811C @ =gUnknown_3004FE0
ldr r1, _0803811C @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -4650,7 +4650,7 @@ _0803810C: .4byte gActiveBattler
_08038110: .4byte gSprites
_08038114: .4byte sub_8075590
_08038118: .4byte SpriteCallbackDummy
_0803811C: .4byte gUnknown_3004FE0
_0803811C: .4byte gBattlerControllerFuncs
_08038120: .4byte sub_8035B58
thumb_func_end sub_8038078
@@ -4720,7 +4720,7 @@ _08038178:
adds r0, r2
ldr r1, _080381C4 @ =sub_8011EA0
str r1, [r0]
ldr r1, _080381C8 @ =gUnknown_3004FE0
ldr r1, _080381C8 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -4734,7 +4734,7 @@ _080381B4:
_080381BC: .4byte gSprites
_080381C0: .4byte gBattlerSpriteIds
_080381C4: .4byte sub_8011EA0
_080381C8: .4byte gUnknown_3004FE0
_080381C8: .4byte gBattlerControllerFuncs
_080381CC: .4byte sub_803612C
thumb_func_end sub_8038124
@@ -4781,7 +4781,7 @@ sub_8038200: @ 8038200
beq _08038212
b _08038326
_08038212:
ldr r0, _080382E8 @ =gUnknown_2022BC4
ldr r0, _080382E8 @ =gBattleBufferA
mov r12, r0
ldrb r2, [r6]
lsls r2, 9
@@ -4885,7 +4885,7 @@ _08038212:
b _08038326
.align 2, 0
_080382E4: .4byte gActiveBattler
_080382E8: .4byte gUnknown_2022BC4
_080382E8: .4byte gBattleBufferA
_080382EC: .4byte gAnimMoveTurn
_080382F0: .4byte gAnimMovePower
_080382F4: .4byte gAnimMoveDmg
@@ -4903,7 +4903,7 @@ _08038308:
lsls r0, 2
adds r0, r2
strb r3, [r0, 0x4]
ldr r1, _08038330 @ =gUnknown_3004FE0
ldr r1, _08038330 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -4915,7 +4915,7 @@ _08038326:
bx r0
.align 2, 0
_0803832C: .4byte gBattleSpritesDataPtr
_08038330: .4byte gUnknown_3004FE0
_08038330: .4byte gBattlerControllerFuncs
_08038334: .4byte sub_8038338
thumb_func_end sub_8038200
@@ -4926,7 +4926,7 @@ sub_8038338: @ 8038338
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r2, _08038384 @ =gUnknown_2022BC4
ldr r2, _08038384 @ =gBattleBufferA
ldr r6, _08038388 @ =gActiveBattler
ldrb r3, [r6]
lsls r1, r3, 9
@@ -4960,7 +4960,7 @@ sub_8038338: @ 8038338
beq _0803839A
b _080384AC
.align 2, 0
_08038384: .4byte gUnknown_2022BC4
_08038384: .4byte gBattleBufferA
_08038388: .4byte gActiveBattler
_0803838C: .4byte gBattleSpritesDataPtr
_08038390:
@@ -5124,7 +5124,7 @@ sub_80384BC: @ 80384BC
ldr r1, _080384FC @ =gUnknown_2022BC6
adds r4, r0, r1
ldrh r0, [r4]
bl sub_80D7274
bl BufferStringBattle
ldrh r0, [r4]
bl sub_80D89B0
lsls r0, 24
@@ -5132,7 +5132,7 @@ sub_80384BC: @ 80384BC
beq _08038504
ldr r0, _08038500 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
bl BattlePutTextOnWindow
b _0803850C
.align 2, 0
_080384F0: .4byte gBattle_BG0_X
@@ -5143,7 +5143,7 @@ _08038500: .4byte gDisplayedStringBattle
_08038504:
ldr r0, _08038534 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
_0803850C:
ldr r0, _08038538 @ =gBattleTypeFlags
ldr r0, [r0]
@@ -5157,7 +5157,7 @@ _0803850C:
ldr r0, _0803853C @ =0x0000017f
cmp r1, r0
bne _08038568
ldr r1, _08038540 @ =gUnknown_3004FE0
ldr r1, _08038540 @ =gBattlerControllerFuncs
ldr r0, _08038544 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -5168,11 +5168,11 @@ _0803850C:
_08038534: .4byte gDisplayedStringBattle
_08038538: .4byte gBattleTypeFlags
_0803853C: .4byte 0x0000017f
_08038540: .4byte gUnknown_3004FE0
_08038540: .4byte gBattlerControllerFuncs
_08038544: .4byte gActiveBattler
_08038548: .4byte sub_80E85C0
_0803854C:
ldr r1, _0803855C @ =gUnknown_3004FE0
ldr r1, _0803855C @ =gBattlerControllerFuncs
ldr r0, _08038560 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -5180,11 +5180,11 @@ _0803854C:
ldr r1, _08038564 @ =sub_80E8598
b _08038574
.align 2, 0
_0803855C: .4byte gUnknown_3004FE0
_0803855C: .4byte gBattlerControllerFuncs
_08038560: .4byte gActiveBattler
_08038564: .4byte sub_80E8598
_08038568:
ldr r1, _0803857C @ =gUnknown_3004FE0
ldr r1, _0803857C @ =gBattlerControllerFuncs
ldr r0, _08038580 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -5196,7 +5196,7 @@ _08038574:
pop {r0}
bx r0
.align 2, 0
_0803857C: .4byte gUnknown_3004FE0
_0803857C: .4byte gBattlerControllerFuncs
_08038580: .4byte gActiveBattler
_08038584: .4byte sub_80361E4
thumb_func_end sub_80384BC
@@ -5555,7 +5555,7 @@ sub_8038844: @ 8038844
sub sp, 0x4
movs r0, 0
bl LoadBattleBarGfx
ldr r3, _080388BC @ =gUnknown_2022BC4
ldr r3, _080388BC @ =gBattleBufferA
ldr r0, _080388C0 @ =gActiveBattler
mov r9, r0
ldrb r4, [r0]
@@ -5604,7 +5604,7 @@ sub_8038844: @ 8038844
bl SetBattleBarStruct
b _080388FE
.align 2, 0
_080388BC: .4byte gUnknown_2022BC4
_080388BC: .4byte gBattleBufferA
_080388C0: .4byte gActiveBattler
_080388C4: .4byte 0x00007fff
_080388C8: .4byte gBattlerPartyIndexes
@@ -5631,7 +5631,7 @@ _080388D4:
movs r3, 0
bl SetBattleBarStruct
_080388FE:
ldr r1, _08038928 @ =gUnknown_3004FE0
ldr r1, _08038928 @ =gBattlerControllerFuncs
ldr r0, _0803892C @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 2
@@ -5649,7 +5649,7 @@ _080388FE:
_0803891C: .4byte gBattlerPartyIndexes
_08038920: .4byte gEnemyParty
_08038924: .4byte gHealthboxSpriteIds
_08038928: .4byte gUnknown_3004FE0
_08038928: .4byte gBattlerControllerFuncs
_0803892C: .4byte gActiveBattler
_08038930: .4byte sub_80360A0
thumb_func_end sub_8038844
@@ -5698,7 +5698,7 @@ sub_8038940: @ 8038940
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r1, _080389B0 @ =gUnknown_3004FE0
ldr r1, _080389B0 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -5714,7 +5714,7 @@ _080389A0: .4byte gHealthboxSpriteIds
_080389A4: .4byte gBattlerPartyIndexes
_080389A8: .4byte gEnemyParty
_080389AC: .4byte gBattleSpritesDataPtr
_080389B0: .4byte gUnknown_3004FE0
_080389B0: .4byte gBattlerControllerFuncs
_080389B4: .4byte sub_80364D0
thumb_func_end sub_8038940
@@ -5727,7 +5727,7 @@ sub_80389B8: @ 80389B8
lsls r0, 24
cmp r0, 0
bne _08038A08
ldr r4, _08038A14 @ =gUnknown_2022BC4
ldr r4, _08038A14 @ =gBattleBufferA
ldrb r3, [r5]
lsls r3, 9
adds r0, r4, 0x1
@@ -5752,7 +5752,7 @@ sub_80389B8: @ 80389B8
lsls r2, 24
orrs r1, r2
bl InitAndLaunchChosenStatusAnimation
ldr r1, _08038A18 @ =gUnknown_3004FE0
ldr r1, _08038A18 @ =gBattlerControllerFuncs
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
@@ -5764,8 +5764,8 @@ _08038A08:
bx r0
.align 2, 0
_08038A10: .4byte gActiveBattler
_08038A14: .4byte gUnknown_2022BC4
_08038A18: .4byte gUnknown_3004FE0
_08038A14: .4byte gBattleBufferA
_08038A18: .4byte gBattlerControllerFuncs
_08038A1C: .4byte sub_80364D0
thumb_func_end sub_80389B8
@@ -5861,7 +5861,7 @@ _08038AA4: .4byte gUnknown_2022870
OpponentHandlecmd38: @ 8038AA8
push {lr}
ldr r3, _08038AD4 @ =gUnknown_2022870
ldr r1, _08038AD8 @ =gUnknown_2022BC4
ldr r1, _08038AD8 @ =gBattleBufferA
ldr r0, _08038ADC @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
@@ -5881,7 +5881,7 @@ OpponentHandlecmd38: @ 8038AA8
bx r0
.align 2, 0
_08038AD4: .4byte gUnknown_2022870
_08038AD8: .4byte gUnknown_2022BC4
_08038AD8: .4byte gBattleBufferA
_08038ADC: .4byte gActiveBattler
thumb_func_end OpponentHandlecmd38
@@ -5947,7 +5947,7 @@ _08038B48: .4byte gSprites
_08038B4C: .4byte gBattlerSpriteIds
_08038B50: .4byte gActiveBattler
_08038B54:
ldr r1, _08038B84 @ =gUnknown_2024005
ldr r1, _08038B84 @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldrb r0, [r4]
@@ -5961,7 +5961,7 @@ _08038B54:
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl DoHitAnimHealthboxEffect
ldr r1, _08038B88 @ =gUnknown_3004FE0
ldr r1, _08038B88 @ =gBattlerControllerFuncs
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
@@ -5972,8 +5972,8 @@ _08038B7E:
pop {r0}
bx r0
.align 2, 0
_08038B84: .4byte gUnknown_2024005
_08038B88: .4byte gUnknown_3004FE0
_08038B84: .4byte gDoingBattleAnim
_08038B88: .4byte gBattlerControllerFuncs
_08038B8C: .4byte sub_80361FC
thumb_func_end OpponentHandleHitAnimation
@@ -5997,7 +5997,7 @@ OpponentHandleEffectivenessSound: @ 8038B9C
bne _08038BB0
movs r3, 0xC0
_08038BB0:
ldr r2, _08038BDC @ =gUnknown_2022BC4
ldr r2, _08038BDC @ =gBattleBufferA
ldrb r1, [r4]
lsls r1, 9
adds r0, r2, 0x1
@@ -6017,13 +6017,13 @@ _08038BB0:
bx r0
.align 2, 0
_08038BD8: .4byte gActiveBattler
_08038BDC: .4byte gUnknown_2022BC4
_08038BDC: .4byte gBattleBufferA
thumb_func_end OpponentHandleEffectivenessSound
thumb_func_start OpponentHandlecmd44
OpponentHandlecmd44: @ 8038BE0
push {lr}
ldr r2, _08038C08 @ =gUnknown_2022BC4
ldr r2, _08038C08 @ =gBattleBufferA
ldr r0, _08038C0C @ =gActiveBattler
ldrb r1, [r0]
lsls r1, 9
@@ -6040,7 +6040,7 @@ OpponentHandlecmd44: @ 8038BE0
pop {r0}
bx r0
.align 2, 0
_08038C08: .4byte gUnknown_2022BC4
_08038C08: .4byte gBattleBufferA
_08038C0C: .4byte gActiveBattler
thumb_func_end OpponentHandlecmd44
@@ -6076,14 +6076,14 @@ _08038C48: .4byte gEnemyParty
thumb_func_start OpponentHandleIntroSlide
OpponentHandleIntroSlide: @ 8038C4C
push {lr}
ldr r1, _08038C74 @ =gUnknown_2022BC4
ldr r1, _08038C74 @ =gBattleBufferA
ldr r0, _08038C78 @ =gActiveBattler
ldrb r0, [r0]
lsls r0, 9
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl sub_80BC3A0
bl HandleIntroSlide
ldr r2, _08038C7C @ =gIntroSlideFlags
ldrh r0, [r2]
movs r1, 0x1
@@ -6093,7 +6093,7 @@ OpponentHandleIntroSlide: @ 8038C4C
pop {r0}
bx r0
.align 2, 0
_08038C74: .4byte gUnknown_2022BC4
_08038C74: .4byte gBattleBufferA
_08038C78: .4byte gActiveBattler
_08038C7C: .4byte gIntroSlideFlags
thumb_func_end OpponentHandleIntroSlide
@@ -6201,7 +6201,7 @@ _08038D42:
movs r1, 0x1
orrs r0, r1
strb r0, [r2, 0x9]
ldr r1, _08038D88 @ =gUnknown_3004FE0
ldr r1, _08038D88 @ =gBattlerControllerFuncs
ldrb r0, [r6]
lsls r0, 2
adds r0, r1
@@ -6221,7 +6221,7 @@ _08038D78: .4byte gTasks
_08038D7C: .4byte gBattleSpritesDataPtr
_08038D80: .4byte gUnknown_2024000
_08038D84: .4byte sub_80491B0
_08038D88: .4byte gUnknown_3004FE0
_08038D88: .4byte gBattlerControllerFuncs
_08038D8C: .4byte nullsub_17
thumb_func_end sub_8038C80
@@ -6282,7 +6282,7 @@ sub_8038DC4: @ 8038DC4
cmp r0, 0
beq _08038E30
_08038DFE:
ldr r0, _08038E28 @ =gUnknown_2022BC4
ldr r0, _08038E28 @ =gBattleBufferA
ldrb r1, [r7]
lsls r2, r1, 9
adds r0, 0x1
@@ -6300,10 +6300,10 @@ _08038DFE:
_08038E1C: .4byte gActiveBattler
_08038E20: .4byte gTasks
_08038E24: .4byte gBattleTypeFlags
_08038E28: .4byte gUnknown_2022BC4
_08038E28: .4byte gBattleBufferA
_08038E2C: .4byte gBattlerPartyIndexes
_08038E30:
ldr r4, _08038E94 @ =gUnknown_2022BC4
ldr r4, _08038E94 @ =gBattleBufferA
ldrb r0, [r7]
lsls r1, r0, 9
adds r4, 0x1
@@ -6334,7 +6334,7 @@ _08038E30:
eors r0, r5
strb r0, [r7]
_08038E70:
ldr r1, _08038E9C @ =gUnknown_3004FE0
ldr r1, _08038E9C @ =gBattlerControllerFuncs
ldr r2, _08038EA0 @ =gActiveBattler
ldrb r0, [r2]
lsls r0, 2
@@ -6352,9 +6352,9 @@ _08038E70:
pop {r0}
bx r0
.align 2, 0
_08038E94: .4byte gUnknown_2022BC4
_08038E94: .4byte gBattleBufferA
_08038E98: .4byte gBattlerPartyIndexes
_08038E9C: .4byte gUnknown_3004FE0
_08038E9C: .4byte gBattlerControllerFuncs
_08038EA0: .4byte gActiveBattler
_08038EA4: .4byte sub_8035DF0
thumb_func_end sub_8038DC4
@@ -6362,7 +6362,7 @@ _08038EA4: .4byte sub_8035DF0
thumb_func_start sub_8038EA8
sub_8038EA8: @ 8038EA8
push {r4-r7,lr}
ldr r1, _08038ED0 @ =gUnknown_2022BC4
ldr r1, _08038ED0 @ =gBattleBufferA
ldr r0, _08038ED4 @ =gActiveBattler
ldrb r2, [r0]
lsls r0, r2, 9
@@ -6379,7 +6379,7 @@ sub_8038EA8: @ 8038EA8
bl OpponentBufferExecCompleted
b _08038FA2
.align 2, 0
_08038ED0: .4byte gUnknown_2022BC4
_08038ED0: .4byte gBattleBufferA
_08038ED4: .4byte gActiveBattler
_08038ED8:
ldr r4, _08038F30 @ =gBattleSpritesDataPtr
@@ -6395,7 +6395,7 @@ _08038ED8:
movs r2, 0x1
orrs r1, r2
strb r1, [r0]
ldr r1, _08038F38 @ =gUnknown_2022BC4
ldr r1, _08038F38 @ =gBattleBufferA
ldrb r2, [r3]
lsls r0, r2, 9
adds r1, 0x2
@@ -6428,7 +6428,7 @@ _08038ED8:
.align 2, 0
_08038F30: .4byte gBattleSpritesDataPtr
_08038F34: .4byte gActiveBattler
_08038F38: .4byte gUnknown_2022BC4
_08038F38: .4byte gBattleBufferA
_08038F3C:
movs r0, 0x3F
negs r0, r0
@@ -6476,7 +6476,7 @@ _08038F44:
movs r1, 0x5D
strb r1, [r0, 0x5]
_08038F96:
ldr r0, _08038FB4 @ =gUnknown_3004FE0
ldr r0, _08038FB4 @ =gBattlerControllerFuncs
ldrb r1, [r7]
lsls r1, 2
adds r1, r0
@@ -6490,7 +6490,7 @@ _08038FA2:
_08038FA8: .4byte gUnknown_2022BC8
_08038FAC: .4byte gUnknown_2024000
_08038FB0: .4byte gBattleSpritesDataPtr
_08038FB4: .4byte gUnknown_3004FE0
_08038FB4: .4byte gBattlerControllerFuncs
_08038FB8: .4byte sub_8038FBC
thumb_func_end sub_8038EA8
@@ -6597,7 +6597,7 @@ sub_8039060: @ 8039060
adds r2, r0
lsls r2, 2
adds r2, r3
ldr r0, _080390BC @ =gUnknown_2022BC4
ldr r0, _080390BC @ =gBattleBufferA
lsls r1, 9
adds r0, 0x1
adds r1, r0
@@ -6623,7 +6623,7 @@ _080390A6:
_080390B0: .4byte gActiveBattler
_080390B4: .4byte gSprites
_080390B8: .4byte gBattlerSpriteIds
_080390BC: .4byte gUnknown_2022BC4
_080390BC: .4byte gBattleBufferA
thumb_func_end sub_8039060
thumb_func_start sub_80390C0
@@ -6636,7 +6636,7 @@ sub_80390C0: @ 80390C0
lsls r0, 24
cmp r0, 0
bne _08039118
ldr r5, _08039108 @ =gUnknown_2022BC4
ldr r5, _08039108 @ =gBattleBufferA
ldrb r2, [r6]
lsls r1, r2, 9
adds r0, r5, 0x1
@@ -6661,9 +6661,9 @@ sub_80390C0: @ 80390C0
b _08039118
.align 2, 0
_08039104: .4byte gActiveBattler
_08039108: .4byte gUnknown_2022BC4
_08039108: .4byte gBattleBufferA
_0803910C:
ldr r0, _08039120 @ =gUnknown_3004FE0
ldr r0, _08039120 @ =gBattlerControllerFuncs
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
@@ -6675,7 +6675,7 @@ _08039118:
pop {r0}
bx r0
.align 2, 0
_08039120: .4byte gUnknown_3004FE0
_08039120: .4byte gBattlerControllerFuncs
_08039124: .4byte sub_8036500
thumb_func_end sub_80390C0
@@ -6712,7 +6712,7 @@ OpponentHandleCmd55: @ 8039140
negs r0, r0
ands r0, r1
strb r0, [r3]
ldr r0, _08039180 @ =gUnknown_3004F80
ldr r0, _08039180 @ =gPreBattleCallback1
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
@@ -6725,7 +6725,7 @@ _0803916A:
_08039174: .4byte gBattleTypeFlags
_08039178: .4byte gMain
_0803917C: .4byte 0x00000439
_08039180: .4byte gUnknown_3004F80
_08039180: .4byte gPreBattleCallback1
thumb_func_end OpponentHandleCmd55
thumb_func_start nullsub_18
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
+42 -42
View File
@@ -52,11 +52,11 @@ sub_800D278: @ 800D278
ldr r0, _0800D2EC @ =nullsub_13
mov r8, r0
movs r3, 0
ldr r1, _0800D2F0 @ =gUnknown_3004FE0
ldr r1, _0800D2F0 @ =gBattlerControllerFuncs
mov r12, r1
ldr r7, _0800D2F4 @ =gBattlerPositions
movs r6, 0xFF
ldr r5, _0800D2F8 @ =gUnknown_2023FF8
ldr r5, _0800D2F8 @ =gActionSelectionCursor
ldr r4, _0800D2FC @ =gUnknown_2023FFC
_0800D298:
mov r0, r8
@@ -77,7 +77,7 @@ _0800D298:
cmp r2, 0x3
ble _0800D298
bl sub_800D230
ldr r0, _0800D300 @ =gUnknown_2023BC8
ldr r0, _0800D300 @ =gBattleControllerExecFlags
movs r4, 0
str r4, [r0]
bl ClearBattleAnimationVars
@@ -96,11 +96,11 @@ _0800D298:
_0800D2E4: .4byte gUnknown_3004F84
_0800D2E8: .4byte nullsub_12
_0800D2EC: .4byte nullsub_13
_0800D2F0: .4byte gUnknown_3004FE0
_0800D2F0: .4byte gBattlerControllerFuncs
_0800D2F4: .4byte gBattlerPositions
_0800D2F8: .4byte gUnknown_2023FF8
_0800D2F8: .4byte gActionSelectionCursor
_0800D2FC: .4byte gUnknown_2023FFC
_0800D300: .4byte gUnknown_2023BC8
_0800D300: .4byte gBattleControllerExecFlags
_0800D304: .4byte gUnknown_2022B54
_0800D308: .4byte gUnknown_2023DDC
thumb_func_end sub_800D278
@@ -170,7 +170,7 @@ sub_800D364: @ 800D364
ands r0, r2
cmp r0, 0
beq _0800D3B4
ldr r2, _0800D3A4 @ =gUnknown_3004FE0
ldr r2, _0800D3A4 @ =gBattlerControllerFuncs
ldr r1, _0800D3A8 @ =sub_81560A4
str r1, [r2]
ldr r0, _0800D3AC @ =gBattlerPositions
@@ -184,7 +184,7 @@ sub_800D364: @ 800D364
_0800D398: .4byte gBattleTypeFlags
_0800D39C: .4byte gUnknown_3004F84
_0800D3A0: .4byte sub_80123C0
_0800D3A4: .4byte gUnknown_3004FE0
_0800D3A4: .4byte gBattlerControllerFuncs
_0800D3A8: .4byte sub_81560A4
_0800D3AC: .4byte gBattlerPositions
_0800D3B0: .4byte gBattlersCount
@@ -193,26 +193,26 @@ _0800D3B4:
ands r0, r2
cmp r0, 0
beq _0800D3CC
ldr r1, _0800D3C4 @ =gUnknown_3004FE0
ldr r0, _0800D3C8 @ =sub_80DD538
ldr r1, _0800D3C4 @ =gBattlerControllerFuncs
ldr r0, _0800D3C8 @ =SetControllerToSafari
b _0800D3E8
.align 2, 0
_0800D3C4: .4byte gUnknown_3004FE0
_0800D3C8: .4byte sub_80DD538
_0800D3C4: .4byte gBattlerControllerFuncs
_0800D3C8: .4byte SetControllerToSafari
_0800D3CC:
movs r0, 0x84
lsls r0, 2
ands r2, r0
cmp r2, 0
beq _0800D3E4
ldr r1, _0800D3DC @ =gUnknown_3004FE0
ldr r1, _0800D3DC @ =gBattlerControllerFuncs
ldr r0, _0800D3E0 @ =sub_80E75B0
b _0800D3E8
.align 2, 0
_0800D3DC: .4byte gUnknown_3004FE0
_0800D3DC: .4byte gBattlerControllerFuncs
_0800D3E0: .4byte sub_80E75B0
_0800D3E4:
ldr r1, _0800D400 @ =gUnknown_3004FE0
ldr r1, _0800D400 @ =gBattlerControllerFuncs
ldr r0, _0800D404 @ =SetBankFuncToPlayerBufferRunCommand
_0800D3E8:
str r0, [r1]
@@ -228,7 +228,7 @@ _0800D3E8:
movs r0, 0x2
b _0800D478
.align 2, 0
_0800D400: .4byte gUnknown_3004FE0
_0800D400: .4byte gBattlerControllerFuncs
_0800D404: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D408: .4byte gBattlerPositions
_0800D40C: .4byte sub_8035A7C
@@ -242,7 +242,7 @@ _0800D414:
ands r3, r2
cmp r3, 0
beq _0800D458
ldr r3, _0800D44C @ =gUnknown_3004FE0
ldr r3, _0800D44C @ =gBattlerControllerFuncs
ldr r1, _0800D450 @ =sub_81560A4
str r1, [r3]
ldr r2, _0800D454 @ =gBattlerPositions
@@ -260,11 +260,11 @@ _0800D414:
.align 2, 0
_0800D444: .4byte gUnknown_3004F84
_0800D448: .4byte sub_80123C0
_0800D44C: .4byte gUnknown_3004FE0
_0800D44C: .4byte gBattlerControllerFuncs
_0800D450: .4byte sub_81560A4
_0800D454: .4byte gBattlerPositions
_0800D458:
ldr r2, _0800D480 @ =gUnknown_3004FE0
ldr r2, _0800D480 @ =gBattlerControllerFuncs
ldr r0, _0800D484 @ =SetBankFuncToPlayerBufferRunCommand
str r0, [r2]
ldr r1, _0800D488 @ =gBattlerPositions
@@ -287,7 +287,7 @@ _0800D478:
pop {r0}
bx r0
.align 2, 0
_0800D480: .4byte gUnknown_3004FE0
_0800D480: .4byte gBattlerControllerFuncs
_0800D484: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D488: .4byte gBattlerPositions
_0800D48C: .4byte sub_8035A7C
@@ -315,7 +315,7 @@ sub_800D494: @ 800D494
ldr r1, _0800D4D4 @ =gUnknown_3004F84
ldr r0, _0800D4D8 @ =sub_80123C0
str r0, [r1]
ldr r2, _0800D4DC @ =gUnknown_3004FE0
ldr r2, _0800D4DC @ =gBattlerControllerFuncs
ldr r0, _0800D4E0 @ =SetBankFuncToPlayerBufferRunCommand
str r0, [r2]
ldr r1, _0800D4E4 @ =gBattlerPositions
@@ -330,13 +330,13 @@ sub_800D494: @ 800D494
_0800D4D0: .4byte gBattleTypeFlags
_0800D4D4: .4byte gUnknown_3004F84
_0800D4D8: .4byte sub_80123C0
_0800D4DC: .4byte gUnknown_3004FE0
_0800D4DC: .4byte gBattlerControllerFuncs
_0800D4E0: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D4E4: .4byte gBattlerPositions
_0800D4E8: .4byte sub_803A668
_0800D4EC: .4byte gBattlersCount
_0800D4F0:
ldr r2, _0800D508 @ =gUnknown_3004FE0
ldr r2, _0800D508 @ =gBattlerControllerFuncs
ldr r0, _0800D50C @ =SetBankFuncToPlayerBufferRunCommand
str r0, [r2, 0x4]
ldr r1, _0800D510 @ =gBattlerPositions
@@ -348,7 +348,7 @@ _0800D4F0:
movs r0, 0x2
b _0800D752
.align 2, 0
_0800D508: .4byte gUnknown_3004FE0
_0800D508: .4byte gBattlerControllerFuncs
_0800D50C: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D510: .4byte gBattlerPositions
_0800D514: .4byte sub_803A668
@@ -366,7 +366,7 @@ _0800D51C:
ldr r1, _0800D554 @ =gUnknown_3004F84
ldr r0, _0800D558 @ =sub_80123C0
str r0, [r1]
ldr r2, _0800D55C @ =gUnknown_3004FE0
ldr r2, _0800D55C @ =gBattlerControllerFuncs
ldr r4, _0800D560 @ =SetBankFuncToPlayerBufferRunCommand
str r4, [r2]
ldr r1, _0800D564 @ =gBattlerPositions
@@ -385,12 +385,12 @@ _0800D51C:
.align 2, 0
_0800D554: .4byte gUnknown_3004F84
_0800D558: .4byte sub_80123C0
_0800D55C: .4byte gUnknown_3004FE0
_0800D55C: .4byte gBattlerControllerFuncs
_0800D560: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D564: .4byte gBattlerPositions
_0800D568: .4byte sub_803A668
_0800D56C:
ldr r2, _0800D590 @ =gUnknown_3004FE0
ldr r2, _0800D590 @ =gBattlerControllerFuncs
ldr r0, _0800D594 @ =SetBankFuncToPlayerBufferRunCommand
str r0, [r2, 0x4]
ldr r1, _0800D598 @ =gBattlerPositions
@@ -409,7 +409,7 @@ _0800D588:
strb r6, [r0]
b _0800D754
.align 2, 0
_0800D590: .4byte gUnknown_3004FE0
_0800D590: .4byte gBattlerControllerFuncs
_0800D594: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D598: .4byte gBattlerPositions
_0800D59C: .4byte sub_803A668
@@ -478,7 +478,7 @@ _0800D61A:
adds r3, r4, r0
ldrh r1, [r3, 0x18]
lsls r1, 2
ldr r2, _0800D644 @ =gUnknown_3004FE0
ldr r2, _0800D644 @ =gBattlerControllerFuncs
adds r1, r2
ldr r2, _0800D648 @ =SetBankFuncToPlayerBufferRunCommand
str r2, [r1]
@@ -493,7 +493,7 @@ _0800D61A:
b _0800D740
.align 2, 0
_0800D640: .4byte gLinkPlayers
_0800D644: .4byte gUnknown_3004FE0
_0800D644: .4byte gBattlerControllerFuncs
_0800D648: .4byte SetBankFuncToPlayerBufferRunCommand
_0800D64C:
cmp r1, 0x3
@@ -550,7 +550,7 @@ _0800D6A6:
adds r2, r4, r0
ldrh r0, [r2, 0x18]
lsls r0, 2
ldr r1, _0800D6C8 @ =gUnknown_3004FE0
ldr r1, _0800D6C8 @ =gBattlerControllerFuncs
adds r0, r1
ldr r1, _0800D6CC @ =sub_80D4204
str r1, [r0]
@@ -563,7 +563,7 @@ _0800D6A6:
beq _0800D6D4
b _0800D740
.align 2, 0
_0800D6C8: .4byte gUnknown_3004FE0
_0800D6C8: .4byte gBattlerControllerFuncs
_0800D6CC: .4byte sub_80D4204
_0800D6D0:
cmp r1, 0x3
@@ -587,7 +587,7 @@ _0800D6EC:
adds r2, r4, r0
ldrh r0, [r2, 0x18]
lsls r0, 2
ldr r1, _0800D70C @ =gUnknown_3004FE0
ldr r1, _0800D70C @ =gBattlerControllerFuncs
adds r0, r1
ldr r1, _0800D710 @ =sub_803A668
str r1, [r0]
@@ -600,7 +600,7 @@ _0800D6EC:
beq _0800D718
b _0800D740
.align 2, 0
_0800D70C: .4byte gUnknown_3004FE0
_0800D70C: .4byte gBattlerControllerFuncs
_0800D710: .4byte sub_803A668
_0800D714:
cmp r0, 0x3
@@ -850,7 +850,7 @@ _0800D8E6:
movs r3, 0
cmp r3, r2
bge _0800D92E
ldr r6, _0800D908 @ =gUnknown_2022BC4
ldr r6, _0800D908 @ =gBattleBufferA
ldr r5, _0800D90C @ =gActiveBattler
_0800D8F0:
ldrb r0, [r5]
@@ -865,7 +865,7 @@ _0800D8F0:
blt _0800D8F0
b _0800D92E
.align 2, 0
_0800D908: .4byte gUnknown_2022BC4
_0800D908: .4byte gBattleBufferA
_0800D90C: .4byte gActiveBattler
_0800D910:
movs r3, 0
@@ -1603,7 +1603,7 @@ _0800DEBC:
beq _0800DF64
b _0800DF7A
_0800DEC2:
ldr r2, _0800DF2C @ =gUnknown_2023BC8
ldr r2, _0800DF2C @ =gBattleControllerExecFlags
ldr r1, _0800DF30 @ =gBitTable
lsls r0, r4, 2
adds r0, r1
@@ -1613,7 +1613,7 @@ _0800DEC2:
cmp r1, 0
bne _0800DF8C
lsls r0, r4, 9
ldr r1, _0800DF34 @ =gUnknown_2022BC4
ldr r1, _0800DF34 @ =gBattleBufferA
adds r0, r1
adds r1, r3, 0
adds r1, 0x8
@@ -1655,9 +1655,9 @@ _0800DEC2:
strb r0, [r2]
b _0800DF7A
.align 2, 0
_0800DF2C: .4byte gUnknown_2023BC8
_0800DF2C: .4byte gBattleControllerExecFlags
_0800DF30: .4byte gBitTable
_0800DF34: .4byte gUnknown_2022BC4
_0800DF34: .4byte gBattleBufferA
_0800DF38: .4byte gBattleTypeFlags
_0800DF3C: .4byte sBattler_AI
_0800DF40: .4byte gBattlerTarget
@@ -1676,7 +1676,7 @@ _0800DF4C:
_0800DF60: .4byte gUnknown_20233C4
_0800DF64:
ldrb r2, [r3, 0x8]
ldr r3, _0800DF98 @ =gUnknown_2023BC8
ldr r3, _0800DF98 @ =gBattleControllerExecFlags
ldr r1, _0800DF9C @ =gBitTable
lsls r0, r4, 2
adds r0, r1
@@ -1704,7 +1704,7 @@ _0800DF8C:
pop {r0}
bx r0
.align 2, 0
_0800DF98: .4byte gUnknown_2023BC8
_0800DF98: .4byte gBattleControllerExecFlags
_0800DF9C: .4byte gBitTable
_0800DFA0: .4byte gTasks
thumb_func_end Task_HandleCopyReceivedLinkBuffersData
+6 -6
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80D7274
sub_80D7274: @ 80D7274
thumb_func_start BufferStringBattle
BufferStringBattle: @ 80D7274
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -701,7 +701,7 @@ _080D77E2:
bx r0
.align 2, 0
_080D77F0: .4byte gUnknown_83FDF3C
thumb_func_end sub_80D7274
thumb_func_end BufferStringBattle
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
BattleStringExpandPlaceholdersToDisplayedString: @ 80D77F4
@@ -2649,8 +2649,8 @@ _080D87B0:
_080D87B8: .4byte gUnknown_83FD58E
thumb_func_end sub_80D8720
thumb_func_start sub_80D87BC
sub_80D87BC: @ 80D87BC
thumb_func_start BattlePutTextOnWindow
BattlePutTextOnWindow: @ 80D87BC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2907,7 +2907,7 @@ _080D89A4:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80D87BC
thumb_func_end BattlePutTextOnWindow
thumb_func_start sub_80D89B0
sub_80D89B0: @ 80D89B0
+84 -84
View File
@@ -1291,7 +1291,7 @@ _0801E1D4: .4byte gUnknown_2023E82
thumb_func_start atk02_attackstring
atk02_attackstring: @ 801E1D8
push {r4,r5,lr}
ldr r0, _0801E218 @ =gUnknown_2023BC8
ldr r0, _0801E218 @ =gBattleControllerExecFlags
ldr r5, [r0]
cmp r5, 0
bne _0801E210
@@ -1323,7 +1323,7 @@ _0801E210:
pop {r0}
bx r0
.align 2, 0
_0801E218: .4byte gUnknown_2023BC8
_0801E218: .4byte gBattleControllerExecFlags
_0801E21C: .4byte gUnknown_2023DD0
_0801E220: .4byte sBattler_AI
_0801E224: .4byte gUnknown_2023D74
@@ -1339,7 +1339,7 @@ atk03_ppreduce: @ 801E22C
push {r5-r7}
sub sp, 0x4
movs r6, 0x1
ldr r0, _0801E27C @ =gUnknown_2023BC8
ldr r0, _0801E27C @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _0801E244
@@ -1374,7 +1374,7 @@ _0801E244:
beq _0801E2AC
b _0801E2C6
.align 2, 0
_0801E27C: .4byte gUnknown_2023BC8
_0801E27C: .4byte gBattleControllerExecFlags
_0801E280: .4byte gUnknown_2023ECC
_0801E284: .4byte sBattler_AI
_0801E288: .4byte gBattleMoves
@@ -3640,7 +3640,7 @@ atk09_attackanimation: @ 801F440
mov r6, r8
push {r6}
sub sp, 0xC
ldr r0, _0801F488 @ =gUnknown_2023BC8
ldr r0, _0801F488 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _0801F452
@@ -3673,7 +3673,7 @@ _0801F452:
strb r0, [r1, 0x19]
b _0801F572
.align 2, 0
_0801F488: .4byte gUnknown_2023BC8
_0801F488: .4byte gBattleControllerExecFlags
_0801F48C: .4byte gUnknown_2023DD0
_0801F490: .4byte gCurrentMove
_0801F494: .4byte gUnknown_2023D74
@@ -3791,7 +3791,7 @@ _0801F584: .4byte gUnknown_81D89F1
thumb_func_start sub_801F588
sub_801F588: @ 801F588
push {lr}
ldr r0, _0801F5A0 @ =gUnknown_2023BC8
ldr r0, _0801F5A0 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801F59A
@@ -3803,14 +3803,14 @@ _0801F59A:
pop {r0}
bx r0
.align 2, 0
_0801F5A0: .4byte gUnknown_2023BC8
_0801F5A0: .4byte gBattleControllerExecFlags
_0801F5A4: .4byte gUnknown_2023D74
thumb_func_end sub_801F588
thumb_func_start atk0B_healthbarupdate
atk0B_healthbarupdate: @ 801F5A8
push {r4,lr}
ldr r0, _0801F60C @ =gUnknown_2023BC8
ldr r0, _0801F60C @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801F66A
@@ -3858,7 +3858,7 @@ atk0B_healthbarupdate: @ 801F5A8
bl PrepareStringBattle
b _0801F662
.align 2, 0
_0801F60C: .4byte gUnknown_2023BC8
_0801F60C: .4byte gBattleControllerExecFlags
_0801F610: .4byte gMoveResultFlags
_0801F614: .4byte gUnknown_2023D74
_0801F618: .4byte gActiveBattler
@@ -3914,7 +3914,7 @@ _0801F680: .4byte gUnknown_2023D74
atk0C_datahpupdate: @ 801F684
push {r4-r7,lr}
sub sp, 0x4
ldr r0, _0801F6AC @ =gUnknown_2023BC8
ldr r0, _0801F6AC @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _0801F692
@@ -3933,7 +3933,7 @@ _0801F692:
ands r6, r1
b _0801F6C4
.align 2, 0
_0801F6AC: .4byte gUnknown_2023BC8
_0801F6AC: .4byte gBattleControllerExecFlags
_0801F6B0: .4byte gBattleStruct
_0801F6B4:
ldr r2, _0801F750 @ =gBattleMoves
@@ -4403,7 +4403,7 @@ _0801FA78: .4byte 0x0000ffff
thumb_func_start atk0D_critmessage
atk0D_critmessage: @ 801FA7C
push {lr}
ldr r0, _0801FAB8 @ =gUnknown_2023BC8
ldr r0, _0801FAB8 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801FAB2
@@ -4433,7 +4433,7 @@ _0801FAB2:
pop {r0}
bx r0
.align 2, 0
_0801FAB8: .4byte gUnknown_2023BC8
_0801FAB8: .4byte gBattleControllerExecFlags
_0801FABC: .4byte gCritMultiplier
_0801FAC0: .4byte gMoveResultFlags
_0801FAC4: .4byte sBattler_AI
@@ -4444,7 +4444,7 @@ _0801FACC: .4byte gUnknown_2023D74
thumb_func_start atk0E_effectivenesssound
atk0E_effectivenesssound: @ 801FAD0
push {r4,lr}
ldr r0, _0801FB08 @ =gUnknown_2023BC8
ldr r0, _0801FB08 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801FB90
@@ -4472,7 +4472,7 @@ atk0E_effectivenesssound: @ 801FAD0
beq _0801FB2C
b _0801FB42
.align 2, 0
_0801FB08: .4byte gUnknown_2023BC8
_0801FB08: .4byte gBattleControllerExecFlags
_0801FB0C: .4byte gActiveBattler
_0801FB10: .4byte gBattlerTarget
_0801FB14: .4byte gMoveResultFlags
@@ -4553,7 +4553,7 @@ _0801FB9C: .4byte gUnknown_2023D74
atk0F_resultmessage: @ 801FBA0
push {r4-r7,lr}
movs r3, 0
ldr r0, _0801FBDC @ =gUnknown_2023BC8
ldr r0, _0801FBDC @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _0801FBAE
@@ -4584,7 +4584,7 @@ _0801FBCE:
strb r4, [r7, 0x7]
b _0801FD2A
.align 2, 0
_0801FBDC: .4byte gUnknown_2023BC8
_0801FBDC: .4byte gBattleControllerExecFlags
_0801FBE0: .4byte gMoveResultFlags
_0801FBE4: .4byte gUnknown_2023E82
_0801FBE8: .4byte gUnknown_83FE514
@@ -4775,7 +4775,7 @@ _0801FD4C: .4byte gUnknown_2023D74
thumb_func_start atk10_printstring
atk10_printstring: @ 801FD50
push {r4,lr}
ldr r0, _0801FD80 @ =gUnknown_2023BC8
ldr r0, _0801FD80 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801FD7A
@@ -4799,7 +4799,7 @@ _0801FD7A:
pop {r0}
bx r0
.align 2, 0
_0801FD80: .4byte gUnknown_2023BC8
_0801FD80: .4byte gBattleControllerExecFlags
_0801FD84: .4byte gUnknown_2023D74
_0801FD88: .4byte sBattler_AI
_0801FD8C: .4byte gUnknown_2023E82
@@ -4841,7 +4841,7 @@ _0801FDD0: .4byte gUnknown_2023E82
thumb_func_start atk12_waitmessage
atk12_waitmessage: @ 801FDD4
push {r4-r6,lr}
ldr r0, _0801FDF0 @ =gUnknown_2023BC8
ldr r0, _0801FDF0 @ =gBattleControllerExecFlags
ldr r4, [r0]
cmp r4, 0
bne _0801FE22
@@ -4855,7 +4855,7 @@ atk12_waitmessage: @ 801FDD4
str r0, [r1]
b _0801FE22
.align 2, 0
_0801FDF0: .4byte gUnknown_2023BC8
_0801FDF0: .4byte gBattleControllerExecFlags
_0801FDF4: .4byte gUnknown_2023E82
_0801FDF8: .4byte gUnknown_2023D74
_0801FDFC:
@@ -4890,7 +4890,7 @@ _0801FE2C: .4byte gUnknown_2023E7C
thumb_func_start atk13_printfromtable
atk13_printfromtable: @ 801FE30
push {r4,r5,lr}
ldr r0, _0801FE74 @ =gUnknown_2023BC8
ldr r0, _0801FE74 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801FE6E
@@ -4924,7 +4924,7 @@ _0801FE6E:
pop {r0}
bx r0
.align 2, 0
_0801FE74: .4byte gUnknown_2023BC8
_0801FE74: .4byte gBattleControllerExecFlags
_0801FE78: .4byte gUnknown_2023D74
_0801FE7C: .4byte gUnknown_2023E82
_0801FE80: .4byte sBattler_AI
@@ -4933,7 +4933,7 @@ _0801FE80: .4byte sBattler_AI
thumb_func_start atk14_printselectionstringfromtable
atk14_printselectionstringfromtable: @ 801FE84
push {r4-r6,lr}
ldr r0, _0801FED4 @ =gUnknown_2023BC8
ldr r0, _0801FED4 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801FECE
@@ -4972,7 +4972,7 @@ _0801FECE:
pop {r0}
bx r0
.align 2, 0
_0801FED4: .4byte gUnknown_2023BC8
_0801FED4: .4byte gBattleControllerExecFlags
_0801FED8: .4byte gUnknown_2023D74
_0801FEDC: .4byte gUnknown_2023E82
_0801FEE0: .4byte gActiveBattler
@@ -7726,7 +7726,7 @@ _08021592:
thumb_func_start atk1A_faint_animation
atk1A_faint_animation: @ 80215A0
push {r4,r5,lr}
ldr r0, _080215D0 @ =gUnknown_2023BC8
ldr r0, _080215D0 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _080215CA
@@ -7748,7 +7748,7 @@ _080215CA:
pop {r0}
bx r0
.align 2, 0
_080215D0: .4byte gUnknown_2023BC8
_080215D0: .4byte gBattleControllerExecFlags
_080215D4: .4byte gUnknown_2023D74
_080215D8: .4byte gActiveBattler
thumb_func_end atk1A_faint_animation
@@ -7757,7 +7757,7 @@ _080215D8: .4byte gActiveBattler
atk1B_faint_effects_clear: @ 80215DC
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _08021630 @ =gUnknown_2023BC8
ldr r0, _08021630 @ =gBattleControllerExecFlags
ldr r6, [r0]
cmp r6, 0
bne _08021628
@@ -7795,7 +7795,7 @@ _08021628:
pop {r0}
bx r0
.align 2, 0
_08021630: .4byte gUnknown_2023BC8
_08021630: .4byte gBattleControllerExecFlags
_08021634: .4byte gUnknown_2023D74
_08021638: .4byte gActiveBattler
_0802163C: .4byte gBattleMons
@@ -8582,7 +8582,7 @@ _08021C52:
mov r4, r8
strb r4, [r0]
_08021C6A:
ldr r0, _08021CA8 @ =gUnknown_2023BC8
ldr r0, _08021CA8 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _08021C74
@@ -8611,7 +8611,7 @@ _08021C74:
_08021C9C: .4byte gUnknown_2023F52
_08021CA0: .4byte gBattleScripting
_08021CA4: .4byte gBattleStruct
_08021CA8: .4byte gUnknown_2023BC8
_08021CA8: .4byte gBattleControllerExecFlags
_08021CAC: .4byte gPlayerParty
_08021CB0: .4byte gSaveBlock1Ptr
_08021CB4: .4byte 0x0000311a
@@ -8946,7 +8946,7 @@ _08021F6C: .4byte gPlayerParty
_08021F70: .4byte gBattleMons
_08021F74: .4byte gUnknown_2023D6D
_08021F78:
ldr r0, _0802205C @ =gUnknown_2023BC8
ldr r0, _0802205C @ =gBattleControllerExecFlags
ldr r2, [r0]
cmp r2, 0
beq _08021F82
@@ -9053,7 +9053,7 @@ _08022052:
strb r0, [r1, 0x1C]
b _080223DA
.align 2, 0
_0802205C: .4byte gUnknown_2023BC8
_0802205C: .4byte gBattleControllerExecFlags
_08022060: .4byte gUnknown_20233C4
_08022064: .4byte gBattleStruct
_08022068: .4byte gPlayerParty
@@ -9062,7 +9062,7 @@ _08022070: .4byte gActiveBattler
_08022074: .4byte gBattleMoveDamage
_08022078: .4byte gBattleScripting
_0802207C:
ldr r0, _08022314 @ =gUnknown_2023BC8
ldr r0, _08022314 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _08022086
@@ -9379,7 +9379,7 @@ _08022256:
strh r0, [r1]
b _08022356
.align 2, 0
_08022314: .4byte gUnknown_2023BC8
_08022314: .4byte gBattleControllerExecFlags
_08022318: .4byte gActiveBattler
_0802231C: .4byte gBattleStruct
_08022320: .4byte gUnknown_20233C4
@@ -9443,7 +9443,7 @@ _080223A4:
.align 2, 0
_080223AC: .4byte gBattleScripting
_080223B0:
ldr r0, _080223E8 @ =gUnknown_2023BC8
ldr r0, _080223E8 @ =gBattleControllerExecFlags
ldr r5, [r0]
cmp r5, 0
bne _080223DA
@@ -9472,7 +9472,7 @@ _080223DA:
pop {r0}
bx r0
.align 2, 0
_080223E8: .4byte gUnknown_2023BC8
_080223E8: .4byte gBattleControllerExecFlags
_080223EC: .4byte gBattleMons
_080223F0: .4byte gUnknown_2023D6D
_080223F4: .4byte gUnknown_2023D74
@@ -9484,7 +9484,7 @@ sub_80223F8: @ 80223F8
mov r7, r8
push {r7}
movs r6, 0
ldr r0, _08022534 @ =gUnknown_2023BC8
ldr r0, _08022534 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _0802240A
@@ -9645,7 +9645,7 @@ _0802251E:
bgt _08022560
b _0802257A
.align 2, 0
_08022534: .4byte gUnknown_2023BC8
_08022534: .4byte gBattleControllerExecFlags
_08022538: .4byte gPlayerParty
_0802253C: .4byte gBattleOutcome
_08022540: .4byte gEnemyParty
@@ -10610,7 +10610,7 @@ _08022C04: .4byte gUnknown_2023D74
thumb_func_start atk39_pause
atk39_pause: @ 8022C08
push {r4,r5,lr}
ldr r0, _08022C3C @ =gUnknown_2023BC8
ldr r0, _08022C3C @ =gBattleControllerExecFlags
ldr r4, [r0]
cmp r4, 0
bne _08022C34
@@ -10636,7 +10636,7 @@ _08022C34:
pop {r0}
bx r0
.align 2, 0
_08022C3C: .4byte gUnknown_2023BC8
_08022C3C: .4byte gBattleControllerExecFlags
_08022C40: .4byte gUnknown_2023D74
_08022C44: .4byte gUnknown_2023E7C
thumb_func_end atk39_pause
@@ -10644,7 +10644,7 @@ _08022C44: .4byte gUnknown_2023E7C
thumb_func_start sub_8022C48
sub_8022C48: @ 8022C48
push {lr}
ldr r0, _08022C60 @ =gUnknown_2023BC8
ldr r0, _08022C60 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08022C5A
@@ -10656,7 +10656,7 @@ _08022C5A:
pop {r0}
bx r0
.align 2, 0
_08022C60: .4byte gUnknown_2023BC8
_08022C60: .4byte gBattleControllerExecFlags
_08022C64: .4byte gUnknown_2023D74
thumb_func_end sub_8022C48
@@ -12993,7 +12993,7 @@ _08023ED4: .4byte gUnknown_2023D74
thumb_func_start atk4C_getswitchedmondata
atk4C_getswitchedmondata: @ 8023ED8
push {r4,r5,lr}
ldr r0, _08023F30 @ =gUnknown_2023BC8
ldr r0, _08023F30 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08023F28
@@ -13034,7 +13034,7 @@ _08023F28:
pop {r0}
bx r0
.align 2, 0
_08023F30: .4byte gUnknown_2023BC8
_08023F30: .4byte gBattleControllerExecFlags
_08023F34: .4byte gUnknown_2023D74
_08023F38: .4byte gActiveBattler
_08023F3C: .4byte gBattlerPartyIndexes
@@ -13046,7 +13046,7 @@ _08023F44: .4byte gBitTable
sub_8023F48: @ 8023F48
push {r4-r7,lr}
sub sp, 0x58
ldr r0, _080240A0 @ =gUnknown_2023BC8
ldr r0, _080240A0 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _08023F56
@@ -13218,7 +13218,7 @@ _08024098:
pop {r0}
bx r0
.align 2, 0
_080240A0: .4byte gUnknown_2023BC8
_080240A0: .4byte gBattleControllerExecFlags
_080240A4: .4byte gUnknown_2023D74
_080240A8: .4byte gActiveBattler
_080240AC: .4byte gBattleMons
@@ -13236,7 +13236,7 @@ _080240D0: .4byte gBattleTextBuff1
thumb_func_start sub_80240D4
sub_80240D4: @ 80240D4
push {r4-r6,lr}
ldr r0, _08024168 @ =gUnknown_2023BC8
ldr r0, _08024168 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08024160
@@ -13305,7 +13305,7 @@ _08024160:
pop {r0}
bx r0
.align 2, 0
_08024168: .4byte gUnknown_2023BC8
_08024168: .4byte gBattleControllerExecFlags
_0802416C: .4byte gUnknown_2023D74
_08024170: .4byte gActiveBattler
_08024174: .4byte gBattleTypeFlags
@@ -14623,7 +14623,7 @@ _08024C44: .4byte gBitTable
thumb_func_start sub_8024C48
sub_8024C48: @ 8024C48
push {r4-r7,lr}
ldr r0, _08024C74 @ =gUnknown_2023BC8
ldr r0, _08024C74 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _08024C54
@@ -14645,7 +14645,7 @@ _08024C54:
beq _08024C86
b _08024E0E
.align 2, 0
_08024C74: .4byte gUnknown_2023BC8
_08024C74: .4byte gBattleControllerExecFlags
_08024C78: .4byte gUnknown_2023D74
_08024C7C: .4byte gActiveBattler
_08024C80:
@@ -15559,7 +15559,7 @@ _080253C4:
bl sub_802DB7C
ldr r0, _080253F0 @ =gUnknown_83FE791
movs r1, 0xE
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080253F4 @ =gBattleScripting
ldrb r0, [r1, 0x1F]
adds r0, 0x1
@@ -15702,7 +15702,7 @@ _08025500:
_0802550E:
ldr r0, _08025530 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _08025534 @ =sub_8011100
ldr r0, _08025534 @ =BattleMainCB2
cmp r1, r0
beq _0802551A
b _080256D0
@@ -15718,7 +15718,7 @@ _0802551A:
.align 2, 0
_0802552C: .4byte gPaletteFade
_08025530: .4byte gMain
_08025534: .4byte sub_8011100
_08025534: .4byte BattleMainCB2
_08025538: .4byte gBattleScripting
_0802553C:
ldr r6, _08025578 @ =gBattleStruct
@@ -15897,7 +15897,7 @@ _080256A4:
.align 2, 0
_080256C0: .4byte gUnknown_2023D74
_080256C4:
ldr r0, _080256DC @ =gUnknown_2023BC8
ldr r0, _080256DC @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _080256D0
@@ -15911,7 +15911,7 @@ _080256D0:
pop {r0}
bx r0
.align 2, 0
_080256DC: .4byte gUnknown_2023BC8
_080256DC: .4byte gBattleControllerExecFlags
thumb_func_end sub_802537C
thumb_func_start sub_80256E0
@@ -15936,7 +15936,7 @@ _080256F8:
bl sub_802DB7C
ldr r0, _08025720 @ =gUnknown_83FE791
movs r1, 0xE
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r0, [r5, 0x1F]
adds r0, 0x1
strb r0, [r5, 0x1F]
@@ -16401,7 +16401,7 @@ _08025AA0:
strb r0, [r5]
b _08025B0C
_08025AB8:
ldr r0, _08025B18 @ =gUnknown_2023BC8
ldr r0, _08025B18 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08025B0C
@@ -16451,7 +16451,7 @@ _08025B0C:
pop {r0}
bx r0
.align 2, 0
_08025B18: .4byte gUnknown_2023BC8
_08025B18: .4byte gBattleControllerExecFlags
_08025B1C: .4byte gUnknown_20233C8
_08025B20: .4byte gUnknown_2023C08
thumb_func_end atk5E
@@ -16529,7 +16529,7 @@ atk61_drawpartystatussummary: @ 8025BA4
mov r7, r8
push {r7}
sub sp, 0x30
ldr r0, _08025C08 @ =gUnknown_2023BC8
ldr r0, _08025C08 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08025C58
@@ -16575,7 +16575,7 @@ _08025C00:
movs r0, 0
b _08025C32
.align 2, 0
_08025C08: .4byte gUnknown_2023BC8
_08025C08: .4byte gBattleControllerExecFlags
_08025C0C: .4byte gUnknown_2023D74
_08025C10: .4byte gActiveBattler
_08025C14: .4byte gEnemyParty
@@ -16696,7 +16696,7 @@ _08025CFC: .4byte gBattleMoves
thumb_func_start atk64_statusanimation
atk64_statusanimation: @ 8025D00
push {r4,lr}
ldr r0, _08025D70 @ =gUnknown_2023BC8
ldr r0, _08025D70 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08025D68
@@ -16750,7 +16750,7 @@ _08025D68:
pop {r0}
bx r0
.align 2, 0
_08025D70: .4byte gUnknown_2023BC8
_08025D70: .4byte gBattleControllerExecFlags
_08025D74: .4byte gUnknown_2023D74
_08025D78: .4byte gActiveBattler
_08025D7C: .4byte gStatuses3
@@ -16763,7 +16763,7 @@ _08025D8C: .4byte gBattleMons
thumb_func_start atk65_status2animation
atk65_status2animation: @ 8025D90
push {r4,r5,lr}
ldr r0, _08025E18 @ =gUnknown_2023BC8
ldr r0, _08025E18 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08025E10
@@ -16829,7 +16829,7 @@ _08025E10:
pop {r0}
bx r0
.align 2, 0
_08025E18: .4byte gUnknown_2023BC8
_08025E18: .4byte gBattleControllerExecFlags
_08025E1C: .4byte gUnknown_2023D74
_08025E20: .4byte gActiveBattler
_08025E24: .4byte gStatuses3
@@ -16842,7 +16842,7 @@ _08025E34: .4byte gBattleMons
thumb_func_start atk66_chosenstatusanimation
atk66_chosenstatusanimation: @ 8025E38
push {r4,r5,lr}
ldr r0, _08025EB0 @ =gUnknown_2023BC8
ldr r0, _08025EB0 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _08025EAA
@@ -16901,7 +16901,7 @@ _08025EAA:
pop {r0}
bx r0
.align 2, 0
_08025EB0: .4byte gUnknown_2023BC8
_08025EB0: .4byte gBattleControllerExecFlags
_08025EB4: .4byte gUnknown_2023D74
_08025EB8: .4byte gActiveBattler
_08025EBC: .4byte gStatuses3
@@ -16932,7 +16932,7 @@ _08025EE4:
bl sub_802DB7C
ldr r0, _08025F08 @ =gUnknown_83FE791
movs r1, 0xE
bl sub_80D87BC
bl BattlePutTextOnWindow
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -19133,7 +19133,7 @@ atk78_faintifabilitynotdamp: @ 80270A4
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _08027160 @ =gUnknown_2023BC8
ldr r0, _08027160 @ =gBattleControllerExecFlags
ldr r2, [r0]
cmp r2, 0
bne _080271A8
@@ -19227,7 +19227,7 @@ _08027152:
bcc _0802713C
b _080271A8
.align 2, 0
_08027160: .4byte gUnknown_2023BC8
_08027160: .4byte gBattleControllerExecFlags
_08027164: .4byte gBattlerTarget
_08027168: .4byte gBattlersCount
_0802716C: .4byte gBattleMons
@@ -19268,7 +19268,7 @@ _080271BC: .4byte gUnknown_81D93AF
atk79_setatkhptozero: @ 80271C0
push {r4,lr}
sub sp, 0x4
ldr r0, _0802720C @ =gUnknown_2023BC8
ldr r0, _0802720C @ =gBattleControllerExecFlags
ldr r3, [r0]
cmp r3, 0
bne _08027204
@@ -19304,7 +19304,7 @@ _08027204:
pop {r0}
bx r0
.align 2, 0
_0802720C: .4byte gUnknown_2023BC8
_0802720C: .4byte gBattleControllerExecFlags
_08027210: .4byte gActiveBattler
_08027214: .4byte sBattler_AI
_08027218: .4byte gBattleMons
@@ -23131,7 +23131,7 @@ _08029044: .4byte gUnknown_2023D74
thumb_func_start sub_8029048
sub_8029048: @ 8029048
push {r4-r7,lr}
ldr r0, _080290B8 @ =gUnknown_2023BC8
ldr r0, _080290B8 @ =gBattleControllerExecFlags
ldr r1, [r0]
cmp r1, 0
beq _08029054
@@ -23187,7 +23187,7 @@ _080290A2:
bcc _08029074
b _08029164
.align 2, 0
_080290B8: .4byte gUnknown_2023BC8
_080290B8: .4byte gBattleControllerExecFlags
_080290BC: .4byte gUnknown_2023D74
_080290C0: .4byte gActiveBattler
_080290C4: .4byte gBattlersCount
@@ -31742,7 +31742,7 @@ _0802D430: .4byte gUnknown_2023D74
sub_802D434: @ 802D434
push {r4-r6,lr}
movs r4, 0
ldr r0, _0802D474 @ =gUnknown_2023BC8
ldr r0, _0802D474 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
beq _0802D442
@@ -31772,7 +31772,7 @@ _0802D442:
ldr r0, _0802D48C @ =gUnknown_81D9AD1
b _0802D7EC
.align 2, 0
_0802D474: .4byte gUnknown_2023BC8
_0802D474: .4byte gBattleControllerExecFlags
_0802D478: .4byte gActiveBattler
_0802D47C: .4byte sBattler_AI
_0802D480: .4byte gBattlerTarget
@@ -32471,7 +32471,7 @@ _0802DA64:
_0802DA72:
ldr r0, _0802DAB0 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _0802DAB4 @ =sub_8011100
ldr r0, _0802DAB4 @ =BattleMainCB2
cmp r1, r0
bne _0802DB6C
ldr r2, _0802DAB8 @ =gTasks
@@ -32499,7 +32499,7 @@ _0802DA72:
.align 2, 0
_0802DAAC: .4byte gPaletteFade
_0802DAB0: .4byte gMain
_0802DAB4: .4byte sub_8011100
_0802DAB4: .4byte BattleMainCB2
_0802DAB8: .4byte gTasks
_0802DABC: .4byte gUnknown_2023E82
_0802DAC0: .4byte 0x05006000
@@ -32863,7 +32863,7 @@ _0802DD78:
bl sub_802DB7C
ldr r0, _0802DDA0 @ =gUnknown_83FE791
movs r1, 0xE
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _0802DDA4 @ =gUnknown_2023E82
ldrb r0, [r1]
adds r0, 0x1
@@ -33023,7 +33023,7 @@ _0802DE4E:
ldr r1, [r2]
adds r1, 0x6D
str r0, [sp]
ldr r0, _0802DF10 @ =sub_8011100
ldr r0, _0802DF10 @ =BattleMainCB2
str r0, [sp, 0x4]
movs r0, 0x2
adds r2, r6, 0
@@ -33040,12 +33040,12 @@ _0802DF00: .4byte gBattlerPartyIndexes
_0802DF04: .4byte sBattler_AI
_0802DF08: .4byte gEnemyParty
_0802DF0C: .4byte gBattleStruct
_0802DF10: .4byte sub_8011100
_0802DF10: .4byte BattleMainCB2
_0802DF14: .4byte gUnknown_2023E82
_0802DF18:
ldr r0, _0802DF54 @ =gMain
ldr r1, [r0, 0x4]
ldr r0, _0802DF58 @ =sub_8011100
ldr r0, _0802DF58 @ =BattleMainCB2
cmp r1, r0
bne _0802DFA6
ldr r0, _0802DF5C @ =gPaletteFade
@@ -33074,7 +33074,7 @@ _0802DF18:
b _0802DF8C
.align 2, 0
_0802DF54: .4byte gMain
_0802DF58: .4byte sub_8011100
_0802DF58: .4byte BattleMainCB2
_0802DF5C: .4byte gPaletteFade
_0802DF60: .4byte gBattlerPartyIndexes
_0802DF64: .4byte sBattler_AI
+14 -14
View File
@@ -495,7 +495,7 @@ MarkAllBufferBanksForExecution: @ 80171D8
ldrb r0, [r4]
cmp r2, r0
bge _08017236
ldr r3, _08017210 @ =gUnknown_2023BC8
ldr r3, _08017210 @ =gBattleControllerExecFlags
ldr r5, _08017214 @ =gBitTable
_080171F4:
ldm r5!, {r1}
@@ -511,7 +511,7 @@ _080171F4:
.align 2, 0
_08017208: .4byte gBattleTypeFlags
_0801720C: .4byte gBattlersCount
_08017210: .4byte gUnknown_2023BC8
_08017210: .4byte gBattleControllerExecFlags
_08017214: .4byte gBitTable
_08017218:
movs r2, 0
@@ -519,7 +519,7 @@ _08017218:
ldrb r0, [r4]
cmp r2, r0
bge _08017236
ldr r3, _08017240 @ =gUnknown_2023BC8
ldr r3, _08017240 @ =gBattleControllerExecFlags
ldr r5, _08017244 @ =gBitTable
_08017226:
ldr r0, [r3]
@@ -536,7 +536,7 @@ _08017236:
bx r0
.align 2, 0
_0801723C: .4byte gBattlersCount
_08017240: .4byte gUnknown_2023BC8
_08017240: .4byte gBattleControllerExecFlags
_08017244: .4byte gBitTable
thumb_func_end MarkAllBufferBanksForExecution
@@ -551,7 +551,7 @@ MarkBufferBankForExecution: @ 8017248
ands r0, r1
cmp r0, 0
beq _0801727C
ldr r2, _08017274 @ =gUnknown_2023BC8
ldr r2, _08017274 @ =gBattleControllerExecFlags
ldr r1, _08017278 @ =gBitTable
lsls r0, r3, 2
adds r0, r1
@@ -563,10 +563,10 @@ MarkBufferBankForExecution: @ 8017248
b _0801728C
.align 2, 0
_08017270: .4byte gBattleTypeFlags
_08017274: .4byte gUnknown_2023BC8
_08017274: .4byte gBattleControllerExecFlags
_08017278: .4byte gBitTable
_0801727C:
ldr r2, _08017290 @ =gUnknown_2023BC8
ldr r2, _08017290 @ =gBattleControllerExecFlags
ldr r1, _08017294 @ =gBitTable
lsls r0, r3, 2
adds r0, r1
@@ -578,7 +578,7 @@ _0801728C:
pop {r0}
bx r0
.align 2, 0
_08017290: .4byte gUnknown_2023BC8
_08017290: .4byte gBattleControllerExecFlags
_08017294: .4byte gBitTable
thumb_func_end MarkBufferBankForExecution
@@ -588,13 +588,13 @@ sub_8017298: @ 8017298
lsls r0, 24
lsrs r7, r0, 24
movs r4, 0
ldr r5, _080172AC @ =gUnknown_2023BC8
ldr r5, _080172AC @ =gBattleControllerExecFlags
ldr r1, _080172B0 @ =gBitTable
lsls r0, r7, 2
adds r6, r0, r1
b _080172C2
.align 2, 0
_080172AC: .4byte gUnknown_2023BC8
_080172AC: .4byte gBattleControllerExecFlags
_080172B0: .4byte gBitTable
_080172B4:
lsls r0, r4, 2
@@ -610,7 +610,7 @@ _080172C2:
lsrs r0, 24
cmp r4, r0
blt _080172B4
ldr r2, _080172E4 @ =gUnknown_2023BC8
ldr r2, _080172E4 @ =gBattleControllerExecFlags
movs r1, 0x80
lsls r1, 21
lsls r1, r7
@@ -621,7 +621,7 @@ _080172C2:
pop {r0}
bx r0
.align 2, 0
_080172E4: .4byte gUnknown_2023BC8
_080172E4: .4byte gBattleControllerExecFlags
thumb_func_end sub_8017298
thumb_func_start CancelMultiTurnMoves
@@ -11970,7 +11970,7 @@ _0801D02C: .4byte 0xffffbfff
thumb_func_start sub_801D030
sub_801D030: @ 801D030
push {lr}
ldr r0, _0801D050 @ =gUnknown_2023BC8
ldr r0, _0801D050 @ =gBattleControllerExecFlags
ldr r0, [r0]
cmp r0, 0
bne _0801D04C
@@ -11986,7 +11986,7 @@ _0801D04C:
pop {r0}
bx r0
.align 2, 0
_0801D050: .4byte gUnknown_2023BC8
_0801D050: .4byte gBattleControllerExecFlags
_0801D054: .4byte gUnknown_825011C
_0801D058: .4byte gUnknown_2023D74
thumb_func_end sub_801D030
+14 -14
View File
@@ -1497,7 +1497,7 @@ _080CEAA0:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CEACC @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -1802,7 +1802,7 @@ _080CED3A:
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CEDB0 @ =0x00000103
bl PlayBGM
ldr r2, _080CEDB4 @ =gTasks
@@ -2055,7 +2055,7 @@ _080CEF70:
_080CEF78:
ldr r0, _080CEF90 @ =gStringVar4
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CEF98 @ =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2090,7 +2090,7 @@ _080CEFB6:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CEFF0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CEFF4 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2193,7 +2193,7 @@ _080CF0A2:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF0CC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF0D0 @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2225,7 +2225,7 @@ _080CF0EE:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF114 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF118 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2253,7 +2253,7 @@ _080CF11C:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF1AC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF1B0 @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2289,7 +2289,7 @@ _080CF176:
bl sub_802DB7C
ldr r0, _080CF1B4 @ =gUnknown_83FE791
movs r1, 0xE
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF1B0 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2510,7 +2510,7 @@ _080CF34C:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF390 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF394 @ =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2566,7 +2566,7 @@ _080CF3E0:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF40C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF410 @ =gTasks
mov r2, r8
adds r1, r2, r7
@@ -2598,7 +2598,7 @@ _080CF42E:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF454 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r0, _080CF458 @ =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2629,7 +2629,7 @@ _080CF45C:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF49C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF4A0 @ =gTasks
mov r2, r8
adds r0, r2, r7
@@ -2648,7 +2648,7 @@ _080CF4A4:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4D0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF4D4 @ =gTasks
mov r3, r8
adds r0, r3, r7
@@ -2671,7 +2671,7 @@ _080CF4D8:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, _080CF4FC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
bl BattlePutTextOnWindow
ldr r1, _080CF500 @ =gTasks
mov r2, r8
adds r0, r2, r7
+6 -6
View File
@@ -14,7 +14,7 @@ DoPokeballSendOutAnimation: @ 804A938
lsrs r4, 16
lsls r5, 24
lsrs r5, 24
ldr r1, _0804A98C @ =gUnknown_2024005
ldr r1, _0804A98C @ =gDoingBattleAnim
movs r0, 0x1
strb r0, [r1]
ldr r0, _0804A990 @ =gBattleSpritesDataPtr
@@ -49,7 +49,7 @@ DoPokeballSendOutAnimation: @ 804A938
pop {r1}
bx r1
.align 2, 0
_0804A98C: .4byte gUnknown_2024005
_0804A98C: .4byte gDoingBattleAnim
_0804A990: .4byte gBattleSpritesDataPtr
_0804A994: .4byte gActiveBattler
_0804A998: .4byte sub_804A9A0
@@ -1519,7 +1519,7 @@ _0804B52C:
movs r2, 0
movs r1, 0
strh r1, [r0, 0x26]
ldr r0, _0804B5C0 @ =gUnknown_2024005
ldr r0, _0804B5C0 @ =gDoingBattleAnim
strb r2, [r0]
ldr r4, _0804B5C4 @ =gBattleSpritesDataPtr
ldr r0, [r4]
@@ -1572,7 +1572,7 @@ _0804B5AE:
_0804B5B4: .4byte 0xfffffee0
_0804B5B8: .4byte gSprites
_0804B5BC: .4byte gBattlerSpriteIds
_0804B5C0: .4byte gUnknown_2024005
_0804B5C0: .4byte gDoingBattleAnim
_0804B5C4: .4byte gBattleSpritesDataPtr
thumb_func_end HandleBallAnimEnd
@@ -1592,7 +1592,7 @@ sub_804B5C8: @ 804B5C8
beq _0804B666
cmp r1, 0x5F
bne _0804B600
ldr r0, _0804B5F8 @ =gUnknown_2024005
ldr r0, _0804B5F8 @ =gDoingBattleAnim
movs r1, 0
strb r1, [r0]
bl m4aMPlayAllStop
@@ -1600,7 +1600,7 @@ sub_804B5C8: @ 804B5C8
bl PlaySE
b _0804B666
.align 2, 0
_0804B5F8: .4byte gUnknown_2024005
_0804B5F8: .4byte gDoingBattleAnim
_0804B5FC: .4byte 0x0000013f
_0804B600:
ldr r0, _0804B66C @ =0x0000013b
+8 -8
View File
@@ -317,7 +317,7 @@ _080779B0:
adds r0, r4, 0
bl SetBattlerShadowSpriteCallback
_08077A14:
ldr r1, _08077A4C @ =gUnknown_2023FF8
ldr r1, _08077A4C @ =gActionSelectionCursor
ldr r0, _08077A50 @ =gBattlerInMenuId
ldrb r0, [r0]
adds r0, r1
@@ -340,7 +340,7 @@ _08077A14:
.align 2, 0
_08077A44: .4byte gBattlerPartyIndexes
_08077A48: .4byte gEnemyParty
_08077A4C: .4byte gUnknown_2023FF8
_08077A4C: .4byte gActionSelectionCursor
_08077A50: .4byte gBattlerInMenuId
_08077A54: .4byte gWirelessCommType
_08077A58: .4byte gReceivedRemoteLinkPlayers
@@ -360,7 +360,7 @@ _08077A5C:
movs r0, 0x7F
ands r0, r1
strb r0, [r2, 0x8]
ldr r0, _08077AA4 @ =sub_8011100
ldr r0, _08077AA4 @ =BattleMainCB2
bl SetMainCallback2
bl sub_80357C8
_08077A8A:
@@ -376,7 +376,7 @@ _08077A8A:
.align 2, 0
_08077A9C: .4byte sub_80116F4
_08077AA0: .4byte gPaletteFade
_08077AA4: .4byte sub_8011100
_08077AA4: .4byte BattleMainCB2
_08077AA8: .4byte gBattleScripting
thumb_func_end sub_80777E8
@@ -759,7 +759,7 @@ _08077DAC:
adds r0, r4, 0
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r6, _08077E08 @ =gMultiuseSpriteTemplate
ldr r1, _08077E0C @ =gUnknown_8239F8C
ldr r1, _08077E0C @ =gTrainerBackPicCoords
ldr r0, [r5]
ldrb r0, [r0, 0x8]
lsls r0, 2
@@ -783,7 +783,7 @@ _08077DAC:
_08077E00: .4byte gBattleTypeFlags
_08077E04: .4byte gSaveBlock2Ptr
_08077E08: .4byte gMultiuseSpriteTemplate
_08077E0C: .4byte gUnknown_8239F8C
_08077E0C: .4byte gTrainerBackPicCoords
_08077E10:
ldr r0, [r0]
movs r1, 0x80
@@ -801,7 +801,7 @@ _08077E10:
movs r0, 0x5
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r5, _08077E94 @ =gMultiuseSpriteTemplate
ldr r0, _08077E98 @ =gUnknown_8239F8C
ldr r0, _08077E98 @ =gTrainerBackPicCoords
ldrb r0, [r0, 0x14]
movs r4, 0x8
subs r4, r0
@@ -850,7 +850,7 @@ _08077E54:
b _08077F84
.align 2, 0
_08077E94: .4byte gMultiuseSpriteTemplate
_08077E98: .4byte gUnknown_8239F8C
_08077E98: .4byte gTrainerBackPicCoords
_08077E9C: .4byte gBattlerSpriteIds
_08077EA0: .4byte gSprites
_08077EA4: .4byte SpriteCallbackDummy
+1 -1
View File
@@ -157,7 +157,7 @@ gTrainerFrontPicPaletteTable:: @ 8239A1C
gTrainerBackAnimsPtrTable:: @ 8239F74
.incbin "baserom.gba", 0x239F74, 0x18
gUnknown_8239F8C:: @ 8239F8C
gTrainerBackPicCoords:: @ 8239F8C
.incbin "baserom.gba", 0x239F8C, 0x18
gTrainerBackPicTable:: @ 8239FA4
+4 -2
View File
@@ -24,8 +24,10 @@ gUnknown_83FECF4:: @ 83FECF4
gUnknown_83FECFA:: @ 83FECFA
.incbin "baserom.gba", 0x3FECFA, 0x6
gUnknown_83FED00:: @ 83FED00
.incbin "baserom.gba", 0x3FED00, 0x380
.section .rodata.83FEDE4
gUnknown_83FEDE4:: @ 83FEDE4
.incbin "baserom.gba", 0x3FEDE4, 0x29C
gUnknown_83FF080:: @ 83FF080
.incbin "baserom.gba", 0x3FF080, 0xB0
+35 -16
View File
@@ -73,21 +73,22 @@
#define SIDE_STATUS_MIST (1 << 8)
#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9)
#define ACTION_USE_MOVE 0
#define ACTION_USE_ITEM 1
#define ACTION_SWITCH 2
#define ACTION_RUN 3
#define ACTION_WATCHES_CAREFULLY 4
#define ACTION_SAFARI_ZONE_BALL 5
#define ACTION_POKEBLOCK_CASE 6
#define ACTION_GO_NEAR 7
#define ACTION_SAFARI_ZONE_RUN 8
#define ACTION_9 9
#define ACTION_RUN_BATTLESCRIPT 10 // when executing an action
#define ACTION_CANCEL_PARTNER 12 // when choosing an action
#define ACTION_FINISHED 12 // when executing an action
#define ACTION_NOTHING_FAINTED 13 // when choosing an action
#define ACTION_INIT_VALUE 0xFF
#define B_ACTION_USE_MOVE 0
#define B_ACTION_USE_ITEM 1
#define B_ACTION_SWITCH 2
#define B_ACTION_RUN 3
#define B_ACTION_SAFARI_WATCH_CAREFULLY 4
#define B_ACTION_SAFARI_BALL 5
#define B_ACTION_SAFARI_POKEBLOCK 6
#define B_ACTION_SAFARI_GO_NEAR 7
#define B_ACTION_SAFARI_RUN 8
#define B_ACTION_9 9
#define B_ACTION_EXEC_SCRIPT 10
#define B_ACTION_TRY_FINISH 11
#define B_ACTION_FINISHED 12
#define B_ACTION_CANCEL_PARTNER 12 // when choosing an action
#define B_ACTION_NOTHING_FAINTED 13 // when choosing an action
#define B_ACTION_NONE 0xFF
#define MOVESTATUS_MISSED (1 << 0)
#define MOVESTATUS_SUPEREFFECTIVE (1 << 1)
@@ -931,6 +932,18 @@ struct MonSpritesGfx
void *field_17C;
};
extern u16 gBattle_BG0_X;
extern u16 gBattle_BG0_Y;
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
extern u16 gBattle_BG2_X;
extern u16 gBattle_BG2_Y;
extern u16 gBattle_BG3_X;
extern u16 gBattle_BG3_Y;
extern u16 gBattle_WIN0H;
extern u16 gBattle_WIN0V;
extern u16 gBattle_WIN1H;
extern u16 gBattle_WIN1V;
extern struct BattleSpritesGfx* gMonSpritesGfx;
extern u8 gBattleOutcome;
extern u16 gLastUsedItem;
@@ -953,8 +966,14 @@ extern u16 gIntroSlideFlags;
extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
extern u8 gBattleOutcome;
extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
extern u32 gBattleControllerExecFlags;
extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
extern void (*gPreBattleCallback1)(void);
extern bool8 gDoingBattleAnim;
#endif // GUARD_BATTLE_H
+2
View File
@@ -217,6 +217,8 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
void BattleHandleAddTextPrinter(const u8* text, u8 arg1);
void SetPpNumbersPaletteInMoveSelection(void);
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
void BattlePutTextOnWindow(const u8* text, u8 arg1);
bool8 sub_80D89B0(u16);
#define TEXT_BUFF_ARRAY_COUNT 16
+442
View File
@@ -0,0 +1,442 @@
#ifndef GUARD_CONSTANTS_BATTLE_ANIM_H
#define GUARD_CONSTANTS_BATTLE_ANIM_H
// Sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
#define GET_TRUE_SPRITE_INDEX(i) ((i - ANIM_SPRITES_START))
// Particle ids.
#define ANIM_SPRITES_START 10000
#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0)
#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1)
#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2)
#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3)
#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4)
#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5)
#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6)
#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7)
#define ANIM_TAG_PINK_ORB (ANIM_SPRITES_START + 8) // unused
#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9)
#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10)
#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11)
#define ANIM_TAG_ORANGE (ANIM_SPRITES_START + 12) // unused
#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13)
#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14)
#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15)
#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16)
#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17)
#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18)
#define ANIM_TAG_GLASS (ANIM_SPRITES_START + 19) // unused
#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20)
#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21)
#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22)
#define ANIM_TAG_BLUE_SHARDS (ANIM_SPRITES_START + 23) // unused
#define ANIM_TAG_CLOSING_EYE (ANIM_SPRITES_START + 24) // unused
#define ANIM_TAG_WAVING_HAND (ANIM_SPRITES_START + 25) // unused
#define ANIM_TAG_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // unused
#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27)
#define ANIM_TAG_BLUE_BURST (ANIM_SPRITES_START + 28) // unused
#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29)
#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30)
#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31)
#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32)
#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33)
#define ANIM_TAG_SPINNING_FIRE (ANIM_SPRITES_START + 34) // unused
#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35)
#define ANIM_TAG_LIGHTNING_2 (ANIM_SPRITES_START + 36) // unused
#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37)
#define ANIM_TAG_CLAW_SLASH_2 (ANIM_SPRITES_START + 38) // unused
#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39)
#define ANIM_TAG_SCRATCH_3 (ANIM_SPRITES_START + 40) // unused
#define ANIM_TAG_SCRATCH_2 (ANIM_SPRITES_START + 41) // unused
#define ANIM_TAG_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // unused
#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43)
#define ANIM_TAG_GLASS_2 (ANIM_SPRITES_START + 44) // unused
#define ANIM_TAG_PINK_HEART_2 (ANIM_SPRITES_START + 45) // unused
#define ANIM_TAG_SAP_DRIP (ANIM_SPRITES_START + 46) // unused
#define ANIM_TAG_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // unused
#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48)
#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49)
#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50)
#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51)
#define ANIM_TAG_HUMANOID_HAND (ANIM_SPRITES_START + 52) // unused
#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53)
#define ANIM_TAG_YELLOW_UNK (ANIM_SPRITES_START + 54) // unused
#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // unused
#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56)
#define ANIM_TAG_RING (ANIM_SPRITES_START + 57) // unused
#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58)
#define ANIM_TAG_Z (ANIM_SPRITES_START + 59) // unused
#define ANIM_TAG_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // unused
#define ANIM_TAG_AIR_SLASH (ANIM_SPRITES_START + 61) // unused
#define ANIM_TAG_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // unused
#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63)
#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64)
#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65)
#define ANIM_TAG_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // unused
#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67)
#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68)
#define ANIM_TAG_POWDER (ANIM_SPRITES_START + 69) // unused
#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70)
#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71)
#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72)
#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73)
#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74)
#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75)
#define ANIM_TAG_BLUE_FLAMES (ANIM_SPRITES_START + 76) // unused
#define ANIM_TAG_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // unused
#define ANIM_TAG_SHOCK_4 (ANIM_SPRITES_START + 78) // unused
#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79)
#define ANIM_TAG_BELL_2 (ANIM_SPRITES_START + 80) // unused
#define ANIM_TAG_PINK_GLOVE (ANIM_SPRITES_START + 81) // unused
#define ANIM_TAG_BLUE_LINES (ANIM_SPRITES_START + 82) // unused
#define ANIM_TAG_IMPACT_3 (ANIM_SPRITES_START + 83) // unused
#define ANIM_TAG_IMPACT_2 (ANIM_SPRITES_START + 84) // unused
#define ANIM_TAG_RETICLE (ANIM_SPRITES_START + 85) // unused
#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86)
#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87)
#define ANIM_TAG_SNOWBALL (ANIM_SPRITES_START + 88) // unused
#define ANIM_TAG_VINE (ANIM_SPRITES_START + 89) // unused
#define ANIM_TAG_SWORD_2 (ANIM_SPRITES_START + 90) // unused
#define ANIM_TAG_CLAPPING (ANIM_SPRITES_START + 91) // unused
#define ANIM_TAG_RED_TUBE (ANIM_SPRITES_START + 92) // unused
#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93)
#define ANIM_TAG_STRING_2 (ANIM_SPRITES_START + 94) // unused
#define ANIM_TAG_PENCIL_2 (ANIM_SPRITES_START + 95) // unused
#define ANIM_TAG_PETAL (ANIM_SPRITES_START + 96) // unused
#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97)
#define ANIM_TAG_WEB (ANIM_SPRITES_START + 98) // unused
#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99)
#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100)
#define ANIM_TAG_CRACKED_EGG (ANIM_SPRITES_START + 101) // unused
#define ANIM_TAG_HATCHED_EGG (ANIM_SPRITES_START + 102) // unused
#define ANIM_TAG_FRESH_EGG (ANIM_SPRITES_START + 103) // unused
#define ANIM_TAG_FANGS (ANIM_SPRITES_START + 104) // unused
#define ANIM_TAG_EXPLOSION_2 (ANIM_SPRITES_START + 105) // unused
#define ANIM_TAG_EXPLOSION_3 (ANIM_SPRITES_START + 106) // unused
#define ANIM_TAG_WATER_DROPLET (ANIM_SPRITES_START + 107) // unused
#define ANIM_TAG_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // unused
#define ANIM_TAG_SEED_2 (ANIM_SPRITES_START + 109) // unused
#define ANIM_TAG_SPROUT (ANIM_SPRITES_START + 110) // unused
#define ANIM_TAG_RED_WAND (ANIM_SPRITES_START + 111) // unused
#define ANIM_TAG_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // unused
#define ANIM_TAG_WATER_COLUMN (ANIM_SPRITES_START + 113) // unused
#define ANIM_TAG_MUD_UNK (ANIM_SPRITES_START + 114) // unused
#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115)
#define ANIM_TAG_FURY_SWIPES (ANIM_SPRITES_START + 116) // unused
#define ANIM_TAG_VINE_2 (ANIM_SPRITES_START + 117) // unused
#define ANIM_TAG_TEETH (ANIM_SPRITES_START + 118) // unused
#define ANIM_TAG_BONE_2 (ANIM_SPRITES_START + 119) // unused
#define ANIM_TAG_WHITE_BAG (ANIM_SPRITES_START + 120) // unused
#define ANIM_TAG_UNKNOWN (ANIM_SPRITES_START + 121) // unused
#define ANIM_TAG_PURPLE_CORAL (ANIM_SPRITES_START + 122) // unused
#define ANIM_TAG_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // unused
#define ANIM_TAG_SHOCK_2 (ANIM_SPRITES_START + 124) // unused
#define ANIM_TAG_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // unused
#define ANIM_TAG_METAL_BALL (ANIM_SPRITES_START + 126) // unused
#define ANIM_TAG_MONSTER_DOLL (ANIM_SPRITES_START + 127) // unused
#define ANIM_TAG_WHIRLWIND (ANIM_SPRITES_START + 128) // unused
#define ANIM_TAG_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // unused
#define ANIM_TAG_EXPLOSION_4 (ANIM_SPRITES_START + 130) // unused
#define ANIM_TAG_EXPLOSION_5 (ANIM_SPRITES_START + 131) // unused
#define ANIM_TAG_TONGUE (ANIM_SPRITES_START + 132) // unused
#define ANIM_TAG_SMOKE (ANIM_SPRITES_START + 133) // unused
#define ANIM_TAG_SMOKE_2 (ANIM_SPRITES_START + 134) // unused
#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135)
#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136)
#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137)
#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138)
#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139)
#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140)
#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141)
#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142)
#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143)
#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144)
#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145)
#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146)
#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147)
#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148)
#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149)
#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150)
#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151)
#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152)
#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153)
#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154)
#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155)
#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156)
#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157)
#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158)
#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159)
#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160)
#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161)
#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162)
#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163)
#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164)
#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165)
#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166)
#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167)
#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168)
#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169)
#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170)
#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171)
#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172)
#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173)
#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174)
#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175)
#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176)
#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177)
#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178)
#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179)
#define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180)
#define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181)
#define ANIM_TAG_LIGHTBULB (ANIM_SPRITES_START + 182) // unused
#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183)
#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184)
#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185)
#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186)
#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187)
#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188)
#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189)
#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190)
#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191)
#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192)
#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193)
#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194)
#define ANIM_TAG_GREEN_SPARKLE (ANIM_SPRITES_START + 195)
#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196)
#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197)
#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198)
#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199)
#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200)
#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201)
#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202)
#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203)
#define ANIM_TAG_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // unused
#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205)
#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206)
#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207)
#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208)
#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209)
#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210)
#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211)
#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212)
#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213)
#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214)
#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215)
#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216)
#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217)
#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218)
#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219)
#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220)
#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221)
#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222)
#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223)
#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224)
#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225)
#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226)
#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227)
#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228)
#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229)
#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230)
#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231)
#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232)
#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233)
#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234)
#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235)
#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236)
#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237)
#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238)
#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239)
#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240)
#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241)
#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242)
#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243)
#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244)
#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245)
#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246)
#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247)
#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248)
#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249)
#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250)
#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251)
#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252)
#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253)
#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254)
#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255)
#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256)
#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257)
#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258)
#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259)
#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260)
#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261)
#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262)
#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263)
#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264)
#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265)
#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266)
#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267)
#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268)
#define ANIM_TAG_POKEBLOCK (ANIM_SPRITES_START + 269)
#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270)
#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271)
#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272)
#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273)
#define ANIM_TAG_GEM_1 (ANIM_SPRITES_START + 274) // unused
#define ANIM_TAG_GEM_2 (ANIM_SPRITES_START + 275) // unused
#define ANIM_TAG_GEM_3 (ANIM_SPRITES_START + 276) // unused
#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277)
#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278)
#define ANIM_TAG_RED_PARTICLES (ANIM_SPRITES_START + 279) // unused
#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280)
#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281)
#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282)
#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283)
#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284)
#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285)
#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286)
#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287)
#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288)
// battlers
#define ANIM_ATTACKER 0
#define ANIM_TARGET 1
#define ANIM_ATK_PARTNER 2
#define ANIM_DEF_PARTNER 3
// stereo panning constants [0-255]
//
// 0
// . .
// . .
// 192 . . 63
// . .
// . .
// . .
// 127
//
#define SOUND_PAN_ATTACKER -64
#define SOUND_PAN_TARGET 63
// move background ids
#define BG_DARK_ 0 // the same as BG_DARK but is unused
#define BG_DARK 1
#define BG_GHOST 2
#define BG_PSYCHIC 3
#define BG_IMPACT_OPPONENT 4
#define BG_IMPACT_PLAYER 5
#define BG_IMPACT_CONTESTS 6
#define BG_DRILL 7
#define BG_DRILL_CONTESTS 8
#define BG_HIGHSPEED_OPPONENT 9
#define BG_HIGHSPEED_PLAYER 10
#define BG_THUNDER 11
#define BG_GUILLOTINE_OPPONENT 12
#define BG_GUILLOTINE_PLAYER 13
#define BG_GUILLOTINE_CONTESTS 14
#define BG_ICE 15
#define BG_COSMIC 16
#define BG_IN_AIR 17
#define BG_SKY 18
#define BG_SKY_CONTESTS 19
#define BG_AURORA 20
#define BG_FISSURE 21
#define BG_BUG_OPPONENT 22
#define BG_BUG_PLAYER 23
#define BG_SOLARBEAM_OPPONENT 24
#define BG_SOLARBEAM_PLAYER 25
#define BG_SOLARBEAM_CONTESTS 26
// table ids for general animations
#define B_ANIM_CASTFORM_CHANGE 0x0
#define B_ANIM_STATS_CHANGE 0x1
#define B_ANIM_SUBSTITUTE_FADE 0x2
#define B_ANIM_SUBSTITUTE_APPEAR 0x3
#define B_ANIM_POKEBLOCK_THROW 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7
#define B_ANIM_SMOKEBALL_ESCAPE 0x8
#define B_ANIM_HANGED_ON 0x9
#define B_ANIM_RAIN_CONTINUES 0xA
#define B_ANIM_SUN_CONTINUES 0xB
#define B_ANIM_SANDSTORM_CONTINUES 0xC
#define B_ANIM_HAIL_CONTINUES 0xD
#define B_ANIM_LEECH_SEED_DRAIN 0xE
#define B_ANIM_MON_HIT 0xF
#define B_ANIM_ITEM_STEAL 0x10
#define B_ANIM_SNATCH_MOVE 0x11
#define B_ANIM_FUTURE_SIGHT_HIT 0x12
#define B_ANIM_DOOM_DESIRE_HIT 0x13
#define B_ANIM_FOCUS_PUNCH_SETUP 0x14
#define B_ANIM_INGRAIN_HEAL 0x15
#define B_ANIM_WISH_HEAL 0x16
// special animations table
#define B_ANIM_LVL_UP 0x0
#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1
#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2
#define B_ANIM_BALL_THROW 0x3
#define B_ANIM_SAFARI_BALL_THROW 0x4
#define B_ANIM_SUBSTITUTE_TO_MON 0x5
#define B_ANIM_MON_TO_SUBSTITUTE 0x6
// status animation table
#define B_ANIM_STATUS_PSN 0x0
#define B_ANIM_STATUS_CONFUSION 0x1
#define B_ANIM_STATUS_BRN 0x2
#define B_ANIM_STATUS_INFATUATION 0x3
#define B_ANIM_STATUS_SLP 0x4
#define B_ANIM_STATUS_PRZ 0x5
#define B_ANIM_STATUS_FRZ 0x6
#define B_ANIM_STATUS_CURSED 0x7
#define B_ANIM_STATUS_NIGHTMARE 0x8
#define B_ANIM_STATUS_WRAPPED 0x9 // does not actually exist
// Most tasks return a value to gBattleAnimArgs[7].
#define ARG_RET_ID 0x7
// Trapping Wrap-like moves end turn animation.
#define TRAP_ANIM_BIND 0
#define TRAP_ANIM_WRAP 0
#define TRAP_ANIM_FIRE_SPIN 1
#define TRAP_ANIM_WHIRLPOOL 2
#define TRAP_ANIM_CLAMP 3
#define TRAP_ANIM_SAND_TOMB 4
// Weather defines for battle animation scripts.
#define ANIM_WEATHER_NONE 0
#define ANIM_WEATHER_SUN 1
#define ANIM_WEATHER_RAIN 2
#define ANIM_WEATHER_SANDSTORM 3
#define ANIM_WEATHER_HAIL 4
// Battle mon back animations.
#define BACK_ANIM_NONE 0x00
#define BACK_ANIM_H_SLIDE_QUICK 0x01
#define BACK_ANIM_H_SLIDE 0x02
#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03
#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04
#define BACK_ANIM_SHRINK_GROW_1 0x05
#define BACK_ANIM_GROW_1 0x06
#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07
#define BACK_ANIM_HORIZONTAL_SHAKE 0x08
#define BACK_ANIM_VERTICAL_SHAKE 0x09
#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a
#define BACK_ANIM_VERTICAL_STRETCH 0x0b
#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c
#define BACK_ANIM_GROW_2 0x0d
#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e
#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f
#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10
#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11
#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12
#define BACK_ANIM_DIP_RIGHT_SIDE 0x13
#define BACK_ANIM_SHRINK_GROW_2 0x14
#define BACK_ANIM_JOLT_RIGHT 0x15
#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16
#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17
#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18
#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19
#endif // GUARD_CONSTANTS_BATTLE_ANIM_H
+1 -1
View File
@@ -8,7 +8,7 @@ struct MonCoords
{
// This would use a bitfield, but some function
// uses it as a u8 and casting won't match.
u8 coords; // u8 x:4, y:4;
u8 size; // u8 width:4, height:4;
u8 y_offset;
};
+1
View File
@@ -31,5 +31,6 @@ void sub_8076918(u8 bank);
void DoHitAnimHealthboxEffect(u8 bank);
void LoadBallGfx(u8 ballId);
void FreeBallGfx(u8 ballId);
void sub_804BD94(u8 battler);
#endif // GUARD_POKEBALL_H
+6 -1
View File
@@ -179,7 +179,7 @@ extern const u8 gUnknown_841623D[];
extern const u8 gUnknown_84162BD[];
extern const u8 gUnknown_841D148[];
// pokemon.c
// pokemon
extern const u8 BattleText_Rose[];
extern const u8 BattleText_UnknownString3[];
extern const u8 BattleText_GetPumped[];
@@ -203,4 +203,9 @@ extern const u8 gString_BattleRecords_ColumnHeaders[];
extern const u8 gString_BattleRecords_7Dashes[];
extern const u8 gString_BattleRecords_4Dashes[];
// battle_controller_safari
extern const u8 gUnknown_83FDA4C[];
extern const u8 gUnknown_83FE747[];
extern const u8 gUnknown_83FE6E6[];
#endif //GUARD_STRINGS_H
+3 -1
View File
@@ -201,7 +201,7 @@ SECTIONS {
src/mystery_event_script.o(.text);
asm/field_effect_helpers.o(.text);
asm/battle_anim_sound_tasks.o(.text);
asm/battle_controller_safari.o(.text);
src/battle_controller_safari.o(.text);
src/fldeff_sweetscent.o(.text);
asm/battle_anim_effects_3.o(.text);
asm/learn_move.o(.text);
@@ -423,6 +423,8 @@ SECTIONS {
data/data_83F5738.o(.rodata.83FB134);
src/save.o(.rodata);
data/data_83FECCC.o(.rodata);
src/battle_controller_safari.o(.rodata);
data/data_83FECCC.o(.rodata.83FEDE4);
src/intro.o(.rodata);
data/data_83FECCC.o(.rodata.battle_anim_special);
src/diploma.o(.rodata);
+677
View File
@@ -0,0 +1,677 @@
#include "global.h"
#include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h"
#include "battle_interface.h"
#include "battle_message.h"
#include "bg.h"
#include "data2.h"
#include "item_menu.h"
#include "link.h"
#include "main.h"
#include "m4a.h"
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "reshow_battle_screen.h"
#include "sound.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "window.h"
#include "strings.h"
#include "constants/songs.h"
#include "constants/battle_anim.h"
static void SafariHandleGetMonData(void);
static void SafariHandleGetRawMonData(void);
static void SafariHandleSetMonData(void);
static void SafariHandleSetRawMonData(void);
static void SafariHandleLoadMonSprite(void);
static void SafariHandleSwitchInAnim(void);
static void SafariHandleReturnMonToBall(void);
static void SafariHandleDrawTrainerPic(void);
static void SafariHandleTrainerSlide(void);
static void SafariHandleTrainerSlideBack(void);
static void SafariHandleFaintAnimation(void);
static void SafariHandlePaletteFade(void);
static void SafariHandleSuccessBallThrowAnim(void);
static void SafariHandleBallThrowAnim(void);
static void SafariHandlePause(void);
static void SafariHandleMoveAnimation(void);
static void SafariHandlePrintString(void);
static void SafariHandlePrintSelectionString(void);
static void SafariHandleChooseAction(void);
static void SafariHandleUnknownYesNoBox(void);
static void SafariHandleChooseMove(void);
static void SafariHandleChooseItem(void);
static void SafariHandleChoosePokemon(void);
static void SafariHandleCmd23(void);
static void SafariHandleHealthBarUpdate(void);
static void SafariHandleExpUpdate(void);
static void SafariHandleStatusIconUpdate(void);
static void SafariHandleStatusAnimation(void);
static void SafariHandleStatusXor(void);
static void SafariHandleDataTransfer(void);
static void SafariHandleDMA3Transfer(void);
static void SafariHandlePlayBGM(void);
static void SafariHandleCmd32(void);
static void SafariHandleTwoReturnValues(void);
static void SafariHandleChosenMonReturnValue(void);
static void SafariHandleOneReturnValue(void);
static void SafariHandleOneReturnValue_Duplicate(void);
static void SafariHandleCmd37(void);
static void SafariHandleCmd38(void);
static void SafariHandleCmd39(void);
static void SafariHandleCmd40(void);
static void SafariHandleHitAnimation(void);
static void SafariHandleCmd42(void);
static void SafariHandlePlaySE(void);
static void SafariHandlePlayFanfareOrBGM(void);
static void SafariHandleFaintingCry(void);
static void SafariHandleIntroSlide(void);
static void SafariHandleIntroTrainerBallThrow(void);
static void SafariHandleDrawPartyStatusSummary(void);
static void SafariHandleHidePartyStatusSummary(void);
static void SafariHandleEndBounceEffect(void);
static void SafariHandleSpriteInvisibility(void);
static void SafariHandleBattleAnimation(void);
static void SafariHandleLinkStandbyMsg(void);
static void SafariHandleResetActionMoveSelection(void);
static void SafariHandleCmd55(void);
static void SafariCmdEnd(void);
static void SafariBufferRunCommand(void);
static void SafariBufferExecCompleted(void);
static void CompleteWhenChosePokeblock(void);
static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{
SafariHandleGetMonData,
SafariHandleGetRawMonData,
SafariHandleSetMonData,
SafariHandleSetRawMonData,
SafariHandleLoadMonSprite,
SafariHandleSwitchInAnim,
SafariHandleReturnMonToBall,
SafariHandleDrawTrainerPic,
SafariHandleTrainerSlide,
SafariHandleTrainerSlideBack,
SafariHandleFaintAnimation,
SafariHandlePaletteFade,
SafariHandleSuccessBallThrowAnim,
SafariHandleBallThrowAnim,
SafariHandlePause,
SafariHandleMoveAnimation,
SafariHandlePrintString,
SafariHandlePrintSelectionString,
SafariHandleChooseAction,
SafariHandleUnknownYesNoBox,
SafariHandleChooseMove,
SafariHandleChooseItem,
SafariHandleChoosePokemon,
SafariHandleCmd23,
SafariHandleHealthBarUpdate,
SafariHandleExpUpdate,
SafariHandleStatusIconUpdate,
SafariHandleStatusAnimation,
SafariHandleStatusXor,
SafariHandleDataTransfer,
SafariHandleDMA3Transfer,
SafariHandlePlayBGM,
SafariHandleCmd32,
SafariHandleTwoReturnValues,
SafariHandleChosenMonReturnValue,
SafariHandleOneReturnValue,
SafariHandleOneReturnValue_Duplicate,
SafariHandleCmd37,
SafariHandleCmd38,
SafariHandleCmd39,
SafariHandleCmd40,
SafariHandleHitAnimation,
SafariHandleCmd42,
SafariHandlePlaySE,
SafariHandlePlayFanfareOrBGM,
SafariHandleFaintingCry,
SafariHandleIntroSlide,
SafariHandleIntroTrainerBallThrow,
SafariHandleDrawPartyStatusSummary,
SafariHandleHidePartyStatusSummary,
SafariHandleEndBounceEffect,
SafariHandleSpriteInvisibility,
SafariHandleBattleAnimation,
SafariHandleLinkStandbyMsg,
SafariHandleResetActionMoveSelection,
SafariHandleCmd55,
SafariCmdEnd,
};
// not used
static void SpriteCB_Null4(struct Sprite *sprite)
{
}
void SetControllerToSafari(void)
{
gBattlerControllerFuncs[gActiveBattler] = SafariBufferRunCommand;
}
static void SafariBufferRunCommand(void)
{
if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
{
if (gBattleBufferA[gActiveBattler][0] < NELEMS(sSafariBufferCommands))
sSafariBufferCommands[gBattleBufferA[gActiveBattler][0]]();
else
SafariBufferExecCompleted();
}
}
static void HandleInputChooseAction(void)
{
if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
switch (gActionSelectionCursor[gActiveBattler])
{
case 0:
EmitTwoReturnValues(1, B_ACTION_SAFARI_BALL, 0);
break;
case 1:
EmitTwoReturnValues(1, B_ACTION_SAFARI_POKEBLOCK, 0);
break;
case 2:
EmitTwoReturnValues(1, B_ACTION_SAFARI_GO_NEAR, 0);
break;
case 3:
EmitTwoReturnValues(1, B_ACTION_SAFARI_RUN, 0);
break;
}
SafariBufferExecCompleted();
}
else if (JOY_NEW(DPAD_LEFT))
{
if (gActionSelectionCursor[gActiveBattler] & 1)
{
PlaySE(SE_SELECT);
ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
gActionSelectionCursor[gActiveBattler] ^= 1;
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
}
}
else if (JOY_NEW(DPAD_RIGHT))
{
if (!(gActionSelectionCursor[gActiveBattler] & 1))
{
PlaySE(SE_SELECT);
ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
gActionSelectionCursor[gActiveBattler] ^= 1;
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
}
}
else if (JOY_NEW(DPAD_UP))
{
if (gActionSelectionCursor[gActiveBattler] & 2)
{
PlaySE(SE_SELECT);
ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
gActionSelectionCursor[gActiveBattler] ^= 2;
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
}
}
else if (JOY_NEW(DPAD_DOWN))
{
if (!(gActionSelectionCursor[gActiveBattler] & 2))
{
PlaySE(SE_SELECT);
ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
gActionSelectionCursor[gActiveBattler] ^= 2;
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
}
}
}
static void CompleteOnBattlerSpriteCallbackDummy(void)
{
if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
SafariBufferExecCompleted();
}
static void CompleteOnInactiveTextPrinter(void)
{
if (!IsTextPrinterActive(0))
SafariBufferExecCompleted();
}
static void CompleteOnHealthboxSpriteCallbackDummy(void)
{
if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
SafariBufferExecCompleted();
}
static void sub_80DD7B0(void)
{
if (!gPaletteFade.active)
{
gMain.inBattle = FALSE;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(gMain.savedCallback);
}
}
static void CompleteOnSpecialAnimDone_0(void)
{
if (!gDoingBattleAnim || !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
SafariBufferExecCompleted();
}
static void SafariOpenPokeblockCase(void)
{
if (!gPaletteFade.active)
gBattlerControllerFuncs[gActiveBattler] = CompleteWhenChosePokeblock;
}
static void CompleteWhenChosePokeblock(void)
{
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{
EmitOneReturnValue(1, gSpecialVar_ItemId);
SafariBufferExecCompleted();
}
}
static void CompleteOnFinishedBattleAnimation_3(void)
{
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
SafariBufferExecCompleted();
}
static void SafariBufferExecCompleted(void)
{
gBattlerControllerFuncs[gActiveBattler] = SafariBufferRunCommand;
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
}
}
// not used
static void CompleteOnFinishedStatusAnimation_3(void)
{
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
SafariBufferExecCompleted();
}
static void SafariHandleGetMonData(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleGetRawMonData(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleSetMonData(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleSetRawMonData(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleLoadMonSprite(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleSwitchInAnim(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleReturnMonToBall(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleDrawTrainerPic(void)
{
sub_8034750(gSaveBlock2Ptr->playerGender, gActiveBattler);
SetMultiuseSpriteTemplateToTrainerBack(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler));
gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate,
80,
(8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].size) * 4 + 80,
30);
gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8033EEC;
gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy;
}
static void SafariHandleTrainerSlide(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleTrainerSlideBack(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleFaintAnimation(void)
{
SafariBufferExecCompleted();
}
static void SafariHandlePaletteFade(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleSuccessBallThrowAnim(void)
{
gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
gDoingBattleAnim = TRUE;
InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone_0;
}
static void SafariHandleBallThrowAnim(void)
{
u8 ballThrowCaseId = gBattleBufferA[gActiveBattler][1];
gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
gDoingBattleAnim = TRUE;
InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone_0;
}
static void SafariHandlePause(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleMoveAnimation(void)
{
SafariBufferExecCompleted();
}
static void SafariHandlePrintString(void)
{
u16 *stringId;
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
BufferStringBattle(*stringId);
if (sub_80D89B0(*stringId))
BattlePutTextOnWindow(gDisplayedStringBattle, 0x40);
else
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
}
static void SafariHandlePrintSelectionString(void)
{
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
SafariHandlePrintString();
else
SafariBufferExecCompleted();
}
static void HandleChooseActionAfterDma3(void)
{
if (!IsDma3ManagerBusyWithBgCopy())
{
gBattle_BG0_X = 0;
gBattle_BG0_Y = 160;
gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseAction;
}
}
static void SafariHandleChooseAction(void)
{
s32 i;
gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
BattlePutTextOnWindow(gUnknown_83FDA4C, 0);
BattlePutTextOnWindow(gUnknown_83FE747, 2);
for (i = 0; i < 4; ++i)
ActionSelectionDestroyCursorAt(i);
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
BattleStringExpandPlaceholdersToDisplayedString(gUnknown_83FE6E6);
BattlePutTextOnWindow(gDisplayedStringBattle, 1);
}
static void SafariHandleUnknownYesNoBox(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleChooseMove(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleChooseItem(void)
{
s32 i;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
gBattlerInMenuId = gActiveBattler;
}
static void SafariHandleChoosePokemon(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd23(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleHealthBarUpdate(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleExpUpdate(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleStatusIconUpdate(void)
{
UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_SAFARI_BALLS_TEXT);
SafariBufferExecCompleted();
}
static void SafariHandleStatusAnimation(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleStatusXor(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleDataTransfer(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleDMA3Transfer(void)
{
SafariBufferExecCompleted();
}
static void SafariHandlePlayBGM(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd32(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleTwoReturnValues(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleChosenMonReturnValue(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleOneReturnValue(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleOneReturnValue_Duplicate(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd37(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd38(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd39(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd40(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleHitAnimation(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd42(void)
{
SafariBufferExecCompleted();
}
static void SafariHandlePlaySE(void)
{
s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = SOUND_PAN_ATTACKER;
else
pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
SafariBufferExecCompleted();
}
static void SafariHandlePlayFanfareOrBGM(void)
{
PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
SafariBufferExecCompleted();
}
static void SafariHandleFaintingCry(void)
{
u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
PlayCry1(species, 25);
SafariBufferExecCompleted();
}
static void SafariHandleIntroSlide(void)
{
HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
gIntroSlideFlags |= 1;
SafariBufferExecCompleted();
}
static void SafariHandleIntroTrainerBallThrow(void)
{
UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_SAFARI_ALL_TEXT);
sub_804BD94(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthboxSpriteCallbackDummy;
}
static void SafariHandleDrawPartyStatusSummary(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleHidePartyStatusSummary(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleEndBounceEffect(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleSpriteInvisibility(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleBattleAnimation(void)
{
u8 animationId = gBattleBufferA[gActiveBattler][1];
u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
SafariBufferExecCompleted();
else
gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation_3;
}
static void SafariHandleLinkStandbyMsg(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleResetActionMoveSelection(void)
{
SafariBufferExecCompleted();
}
static void SafariHandleCmd55(void)
{
gBattleOutcome = gBattleBufferA[gActiveBattler][1];
FadeOutMapMusic(5);
BeginFastPaletteFade(3);
SafariBufferExecCompleted();
if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER))
gBattlerControllerFuncs[gActiveBattler] = sub_80DD7B0;
}
static void SafariCmdEnd(void)
{
}
+2 -2
View File
@@ -105,7 +105,7 @@ gUnknown_3004F70: @ 3004F70
gUnknown_3004F74: @ 3004F74
.space 0xC
gUnknown_3004F80: @ 3004F80
gPreBattleCallback1: @ 3004F80
.space 0x4
gUnknown_3004F84: @ 3004F84
@@ -117,7 +117,7 @@ gBattleResults: @ 3004F90
gUnknown_3004FD4: @ 3004FD4
.space 0xC
gUnknown_3004FE0: @ 3004FE0
gBattlerControllerFuncs: @ 3004FE0
.space 0x10
gHealthboxSpriteIds: @ 3004FF0
+4 -4
View File
@@ -166,7 +166,7 @@ gUnknown_2022BBC: @ 2022BBC
gUnknown_2022BC0: @ 2022BC0
.space 0x4
gUnknown_2022BC4: @ 2022BC4
gBattleBufferA: @ 2022BC4
.space 0x2
gUnknown_2022BC6: @ 2022BC6
@@ -187,7 +187,7 @@ gUnknown_20233C8: @ 20233C8
gActiveBattler: @ 2023BC4
.space 0x4
gUnknown_2023BC8: @ 2023BC8
gBattleControllerExecFlags: @ 2023BC8
.space 0x4
gBattlersCount: @ 2023BCC
@@ -412,7 +412,7 @@ gUnknown_2023FF0: @ 2023FF0
gBattleResources: @ 2023FF4
.space 0x4
gUnknown_2023FF8: @ 2023FF8
gActionSelectionCursor: @ 2023FF8
.space 0x4
gUnknown_2023FFC: @ 2023FFC
@@ -424,7 +424,7 @@ gUnknown_2024000: @ 2024000
gBattlerInMenuId: @ 2024004
.space 0x1
gUnknown_2024005: @ 2024005
gDoingBattleAnim: @ 2024005
.space 0x3
gTransformedPersonalities: @ 2024008