summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-10-08 21:58:30 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-10-08 21:58:30 -0400
commit6c614d71a522975c269678667331418a2d561b06 (patch)
treee83ea910c8f06ede61a5885b8d27e1fb6ac10130
parent967b4e6612eb7f81dfe44989c2e2c79000c7d6f3 (diff)
decompile up to SpeciesToCryId
Diffstat
-rw-r--r--asm/battle_2.s28
-rw-r--r--asm/battle_controller_link_opponent.s8
-rw-r--r--asm/battle_controller_link_partner.s8
-rw-r--r--asm/battle_controller_oak.s32
-rw-r--r--asm/battle_controller_opponent.s8
-rw-r--r--asm/battle_controller_player.s28
-rw-r--r--asm/battle_controller_pokedude.s20
-rw-r--r--asm/battle_controller_safari.s12
-rw-r--r--asm/battle_controllers.s16
-rw-r--r--asm/battle_interface.s8
-rw-r--r--asm/battle_message.s54
-rw-r--r--asm/battle_script_commands.s136
-rw-r--r--asm/battle_util.s172
-rw-r--r--asm/daycare.s4
-rw-r--r--asm/evolution_scene.s112
-rw-r--r--asm/pokemon_3.s998
-rw-r--r--data/data.s2
-rw-r--r--data/data_84827AC.s8
-rw-r--r--include/global.h1
-rw-r--r--include/pokemon.h7
-rw-r--r--src/pokemon.c440
-rw-r--r--sym_ewram.txt6
22 files changed, 771 insertions, 1337 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index 2bc93a09f..960df7d0a 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -11057,7 +11057,7 @@ sub_8015670: @ 8015670
ands r0, r1
cmp r0, 0
beq _080156C4
- ldr r1, _080156B0 @ =gUnknown_2022AB8
+ ldr r1, _080156B0 @ =gBattleTextBuff1
ldr r4, _080156B4 @ =gUnknown_2023E8A
ldrb r0, [r4]
strb r0, [r1]
@@ -11076,7 +11076,7 @@ sub_8015670: @ 8015670
.align 2, 0
_080156A8: .4byte gUnknown_2023BE3
_080156AC: .4byte gBattleTypeFlags
-_080156B0: .4byte gUnknown_2022AB8
+_080156B0: .4byte gBattleTextBuff1
_080156B4: .4byte gUnknown_2023E8A
_080156B8: .4byte sBattler_AI
_080156BC: .4byte gUnknown_2023D74
@@ -11180,7 +11180,7 @@ sub_801578C: @ 801578C
ands r0, r4
cmp r0, 0
beq _080157E0
- ldr r1, _080157CC @ =gUnknown_2022AB8
+ ldr r1, _080157CC @ =gBattleTextBuff1
ldr r4, _080157D0 @ =gUnknown_2023E8A
ldrb r0, [r4]
strb r0, [r1]
@@ -11199,7 +11199,7 @@ sub_801578C: @ 801578C
.align 2, 0
_080157C4: .4byte gUnknown_2023BE3
_080157C8: .4byte gBattleTypeFlags
-_080157CC: .4byte gUnknown_2022AB8
+_080157CC: .4byte gBattleTextBuff1
_080157D0: .4byte gUnknown_2023E8A
_080157D4: .4byte sBattler_AI
_080157D8: .4byte gUnknown_2023D74
@@ -11316,7 +11316,7 @@ sub_80158BC: @ 80158BC
ldr r1, _080158F0 @ =gUnknown_2023BE3
movs r0, 0
strb r0, [r1]
- ldr r1, _080158F4 @ =gUnknown_2022AB8
+ ldr r1, _080158F4 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x7
@@ -11341,7 +11341,7 @@ sub_80158BC: @ 80158BC
bx lr
.align 2, 0
_080158F0: .4byte gUnknown_2023BE3
-_080158F4: .4byte gUnknown_2022AB8
+_080158F4: .4byte gBattleTextBuff1
_080158F8: .4byte sBattler_AI
_080158FC: .4byte gBattlerPartyIndexes
_08015900: .4byte gUnknown_2023D74
@@ -12623,7 +12623,7 @@ sub_8016374: @ 8016374
ldrb r0, [r3]
adds r0, r1
strb r2, [r0]
- ldr r2, _080163FC @ =gUnknown_2022AB8
+ ldr r2, _080163FC @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r2]
movs r0, 0x7
@@ -12665,7 +12665,7 @@ _080163EC: .4byte gUnknown_2022974
_080163F0: .4byte gUnknown_2022976
_080163F4: .4byte gUnknown_2023FF8
_080163F8: .4byte gUnknown_2023FFC
-_080163FC: .4byte gUnknown_2022AB8
+_080163FC: .4byte gBattleTextBuff1
_08016400: .4byte gBattleStruct
_08016404: .4byte gBattleScripting
_08016408: .4byte gUnknown_2023D74
@@ -12933,7 +12933,7 @@ _08016644: .4byte gUnknown_2023D74
_08016648: .4byte gUnknown_81D99E4
_0801664C: .4byte gUnknown_2023BE3
_08016650:
- ldr r3, _080166C4 @ =gUnknown_2022AB8
+ ldr r3, _080166C4 @ =gBattleTextBuff1
movs r4, 0xFD
strb r4, [r3]
movs r0, 0x5
@@ -12942,7 +12942,7 @@ _08016650:
strb r2, [r3, 0x2]
movs r0, 0xFF
strb r0, [r3, 0x3]
- ldr r1, _080166C8 @ =gUnknown_2022AC8
+ ldr r1, _080166C8 @ =gBattleTextBuff2
strb r4, [r1]
strb r5, [r1, 0x1]
movs r0, 0xD2
@@ -12993,8 +12993,8 @@ _080166B4:
strb r1, [r2, 0x11]
b _08016706
.align 2, 0
-_080166C4: .4byte gUnknown_2022AB8
-_080166C8: .4byte gUnknown_2022AC8
+_080166C4: .4byte gBattleTextBuff1
+_080166C8: .4byte gBattleTextBuff2
_080166CC: .4byte gUnknown_2023D74
_080166D0: .4byte gUnknown_81D99E4
_080166D4: .4byte gUnknown_2023BE3
@@ -13718,7 +13718,7 @@ HandleAction_Action9: @ 8016C9C
strh r1, [r0]
ldr r0, _08016CF8 @ =gUnknown_2022976
strh r1, [r0]
- ldr r1, _08016CFC @ =gUnknown_2022AB8
+ ldr r1, _08016CFC @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x7
@@ -13749,7 +13749,7 @@ _08016CEC: .4byte gUnknown_2023BDE
_08016CF0: .4byte gUnknown_2023BE2
_08016CF4: .4byte gUnknown_2022974
_08016CF8: .4byte gUnknown_2022976
-_08016CFC: .4byte gUnknown_2022AB8
+_08016CFC: .4byte gBattleTextBuff1
_08016D00: .4byte gBattlerPartyIndexes
_08016D04: .4byte gUnknown_2023D74
_08016D08: .4byte gUnknown_81D9A04
diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s
index d08554a15..e229e21f1 100644
--- a/asm/battle_controller_link_opponent.s
+++ b/asm/battle_controller_link_opponent.s
@@ -4969,7 +4969,7 @@ sub_803CF50: @ 803CF50
lsls r0, 24
cmp r0, 0
beq _0803CF98
- ldr r0, _0803CF94 @ =gUnknown_202298C
+ ldr r0, _0803CF94 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _0803CFA0
@@ -4978,9 +4978,9 @@ _0803CF84: .4byte gUnknown_2022974
_0803CF88: .4byte gUnknown_2022976
_0803CF8C: .4byte gActiveBattler
_0803CF90: .4byte gUnknown_2022BC6
-_0803CF94: .4byte gUnknown_202298C
+_0803CF94: .4byte gDisplayedStringBattle
_0803CF98:
- ldr r0, _0803CFB4 @ =gUnknown_202298C
+ ldr r0, _0803CFB4 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_0803CFA0:
@@ -4995,7 +4995,7 @@ _0803CFA0:
pop {r0}
bx r0
.align 2, 0
-_0803CFB4: .4byte gUnknown_202298C
+_0803CFB4: .4byte gDisplayedStringBattle
_0803CFB8: .4byte gUnknown_3004FE0
_0803CFBC: .4byte gActiveBattler
_0803CFC0: .4byte CompleteOnInactiveTextPrinter_5
diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s
index 4f9dcbfe3..87f018303 100644
--- a/asm/battle_controller_link_partner.s
+++ b/asm/battle_controller_link_partner.s
@@ -4590,7 +4590,7 @@ sub_80D67CC: @ 80D67CC
lsls r0, 24
cmp r0, 0
beq _080D6814
- ldr r0, _080D6810 @ =gUnknown_202298C
+ ldr r0, _080D6810 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _080D681C
@@ -4599,9 +4599,9 @@ _080D6800: .4byte gUnknown_2022974
_080D6804: .4byte gUnknown_2022976
_080D6808: .4byte gActiveBattler
_080D680C: .4byte gUnknown_2022BC6
-_080D6810: .4byte gUnknown_202298C
+_080D6810: .4byte gDisplayedStringBattle
_080D6814:
- ldr r0, _080D6830 @ =gUnknown_202298C
+ ldr r0, _080D6830 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_080D681C:
@@ -4616,7 +4616,7 @@ _080D681C:
pop {r0}
bx r0
.align 2, 0
-_080D6830: .4byte gUnknown_202298C
+_080D6830: .4byte gDisplayedStringBattle
_080D6834: .4byte gUnknown_3004FE0
_080D6838: .4byte gActiveBattler
_080D683C: .4byte sub_80D4718
diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s
index 4cb53b5d7..83bbdd333 100644
--- a/asm/battle_controller_oak.s
+++ b/asm/battle_controller_oak.s
@@ -1780,13 +1780,13 @@ _080E8404: .4byte gUnknown_2037AB8
_080E8408:
ldr r0, _080E8418 @ =gUnknown_83FDAE2
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080E841C @ =gUnknown_202298C
+ ldr r0, _080E841C @ =gDisplayedStringBattle
movs r1, 0x18
bl sub_80D87BC
b _080E851E
.align 2, 0
_080E8418: .4byte gUnknown_83FDAE2
-_080E841C: .4byte gUnknown_202298C
+_080E841C: .4byte gDisplayedStringBattle
_080E8420:
movs r0, 0x18
bl IsTextPrinterActive
@@ -1831,14 +1831,14 @@ _080E8468:
bne _080E855E
ldr r0, _080E8488 @ =gUnknown_83FDB92
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080E848C @ =gUnknown_202298C
+ ldr r0, _080E848C @ =gDisplayedStringBattle
movs r1, 0x18
bl sub_80D87BC
b _080E851E
.align 2, 0
_080E8484: .4byte gUnknown_2037AB8
_080E8488: .4byte gUnknown_83FDB92
-_080E848C: .4byte gUnknown_202298C
+_080E848C: .4byte gDisplayedStringBattle
_080E8490:
movs r0, 0x18
bl IsTextPrinterActive
@@ -1881,14 +1881,14 @@ _080E84D8:
bne _080E855E
ldr r0, _080E84F8 @ =gUnknown_83FDBEF
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080E84FC @ =gUnknown_202298C
+ ldr r0, _080E84FC @ =gDisplayedStringBattle
movs r1, 0x18
bl sub_80D87BC
b _080E851E
.align 2, 0
_080E84F4: .4byte gUnknown_2037AB8
_080E84F8: .4byte gUnknown_83FDBEF
-_080E84FC: .4byte gUnknown_202298C
+_080E84FC: .4byte gDisplayedStringBattle
_080E8500:
movs r0, 0x18
bl IsTextPrinterActive
@@ -2083,12 +2083,12 @@ _080E866C: .4byte gUnknown_2037AB8
_080E8670:
adds r0, r2, 0
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080E8680 @ =gUnknown_202298C
+ ldr r0, _080E8680 @ =gDisplayedStringBattle
movs r1, 0x18
bl sub_80D87BC
b _080E86A2
.align 2, 0
-_080E8680: .4byte gUnknown_202298C
+_080E8680: .4byte gDisplayedStringBattle
_080E8684:
movs r0, 0x18
bl IsTextPrinterActive
@@ -2263,13 +2263,13 @@ _080E87E4: .4byte gUnknown_2037AB8
_080E87E8:
ldr r0, _080E87F8 @ =gUnknown_83FDCD2
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080E87FC @ =gUnknown_202298C
+ ldr r0, _080E87FC @ =gDisplayedStringBattle
movs r1, 0x18
bl sub_80D87BC
b _080E8868
.align 2, 0
_080E87F8: .4byte gUnknown_83FDCD2
-_080E87FC: .4byte gUnknown_202298C
+_080E87FC: .4byte gDisplayedStringBattle
_080E8800:
movs r0, 0x18
bl IsTextPrinterActive
@@ -5812,14 +5812,14 @@ _080EA570:
lsls r0, 24
cmp r0, 0
beq _080EA590
- ldr r0, _080EA58C @ =gUnknown_202298C
+ ldr r0, _080EA58C @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _080EA598
.align 2, 0
-_080EA58C: .4byte gUnknown_202298C
+_080EA58C: .4byte gDisplayedStringBattle
_080EA590:
- ldr r0, _080EA5B4 @ =gUnknown_202298C
+ ldr r0, _080EA5B4 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_080EA598:
@@ -5838,7 +5838,7 @@ _080EA598:
beq _080EA5F8
b _080EA64C
.align 2, 0
-_080EA5B4: .4byte gUnknown_202298C
+_080EA5B4: .4byte gDisplayedStringBattle
_080EA5B8: .4byte gBattleTypeFlags
_080EA5BC:
cmp r1, 0xE3
@@ -6047,7 +6047,7 @@ _080EA770:
ldr r0, _080EA784 @ =gUnknown_83FE6FA
bl BattleStringExpandPlaceholdersToDisplayedString
_080EA776:
- ldr r0, _080EA788 @ =gUnknown_202298C
+ ldr r0, _080EA788 @ =gDisplayedStringBattle
movs r1, 0x1
bl sub_80D87BC
pop {r4}
@@ -6055,7 +6055,7 @@ _080EA776:
bx r0
.align 2, 0
_080EA784: .4byte gUnknown_83FE6FA
-_080EA788: .4byte gUnknown_202298C
+_080EA788: .4byte gDisplayedStringBattle
thumb_func_end sub_80EA6FC
thumb_func_start sub_80EA78C
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index 4d16e6425..0c57693bf 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -5130,7 +5130,7 @@ sub_80384BC: @ 80384BC
lsls r0, 24
cmp r0, 0
beq _08038504
- ldr r0, _08038500 @ =gUnknown_202298C
+ ldr r0, _08038500 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _0803850C
@@ -5139,9 +5139,9 @@ _080384F0: .4byte gUnknown_2022974
_080384F4: .4byte gUnknown_2022976
_080384F8: .4byte gActiveBattler
_080384FC: .4byte gUnknown_2022BC6
-_08038500: .4byte gUnknown_202298C
+_08038500: .4byte gDisplayedStringBattle
_08038504:
- ldr r0, _08038534 @ =gUnknown_202298C
+ ldr r0, _08038534 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_0803850C:
@@ -5165,7 +5165,7 @@ _0803850C:
ldr r1, _08038548 @ =sub_80E85C0
b _08038574
.align 2, 0
-_08038534: .4byte gUnknown_202298C
+_08038534: .4byte gDisplayedStringBattle
_08038538: .4byte gBattleTypeFlags
_0803853C: .4byte 0x0000017f
_08038540: .4byte gUnknown_3004FE0
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index c4f0635c6..20e8aa719 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -4557,7 +4557,7 @@ sub_8030830: @ 8030830
movs r0, 0
strb r0, [r2]
movs r5, 0
- ldr r6, _0803089C @ =gUnknown_202298C
+ ldr r6, _0803089C @ =gDisplayedStringBattle
adds r4, r1, r3
adds r7, r2, 0
_08030848:
@@ -4597,7 +4597,7 @@ _08030880:
_08030890: .4byte gActiveBattler
_08030894: .4byte gUnknown_2022BC8
_08030898: .4byte gUnknown_3004FF8
-_0803089C: .4byte gUnknown_202298C
+_0803089C: .4byte gDisplayedStringBattle
_080308A0: .4byte gUnknown_83FE770
_080308A4: .4byte gUnknown_8247094
thumb_func_end sub_8030830
@@ -4605,7 +4605,7 @@ _080308A4: .4byte gUnknown_8247094
thumb_func_start MoveSelectionDisplayPpString
MoveSelectionDisplayPpString: @ 80308A8
push {r4,lr}
- ldr r4, _080308C4 @ =gUnknown_202298C
+ ldr r4, _080308C4 @ =gDisplayedStringBattle
ldr r1, _080308C8 @ =gUnknown_83FE766
adds r0, r4, 0
bl StringCopy
@@ -4616,7 +4616,7 @@ MoveSelectionDisplayPpString: @ 80308A8
pop {r0}
bx r0
.align 2, 0
-_080308C4: .4byte gUnknown_202298C
+_080308C4: .4byte gDisplayedStringBattle
_080308C8: .4byte gUnknown_83FE766
thumb_func_end MoveSelectionDisplayPpString
@@ -4637,7 +4637,7 @@ MoveSelectionDisplayPpNumber: @ 80308CC
lsls r4, r1, 9
adds r0, r5, 0x4
adds r4, r0
- ldr r6, _08030938 @ =gUnknown_202298C
+ ldr r6, _08030938 @ =gDisplayedStringBattle
ldr r5, _0803093C @ =gUnknown_2023FFC
adds r1, r5
adds r0, r4, 0
@@ -4671,7 +4671,7 @@ _08030928:
.align 2, 0
_08030930: .4byte gUnknown_2022BC4
_08030934: .4byte gActiveBattler
-_08030938: .4byte gUnknown_202298C
+_08030938: .4byte gDisplayedStringBattle
_0803093C: .4byte gUnknown_2023FFC
thumb_func_end MoveSelectionDisplayPpNumber
@@ -4683,7 +4683,7 @@ MoveSelectionDisplayMoveType: @ 8030940
lsls r4, 9
ldr r0, _080309B0 @ =gUnknown_2022BC8
adds r4, r0
- ldr r6, _080309B4 @ =gUnknown_202298C
+ ldr r6, _080309B4 @ =gDisplayedStringBattle
ldr r1, _080309B8 @ =gUnknown_83FE76A
adds r0, r6, 0
bl StringCopy
@@ -4729,7 +4729,7 @@ MoveSelectionDisplayMoveType: @ 8030940
.align 2, 0
_080309AC: .4byte gActiveBattler
_080309B0: .4byte gUnknown_2022BC8
-_080309B4: .4byte gUnknown_202298C
+_080309B4: .4byte gDisplayedStringBattle
_080309B8: .4byte gUnknown_83FE76A
_080309BC: .4byte gUnknown_83FE770
_080309C0: .4byte gBattleMoves
@@ -8764,7 +8764,7 @@ sub_8032AFC: @ 8032AFC
lsls r0, 24
cmp r0, 0
beq _08032B44
- ldr r0, _08032B40 @ =gUnknown_202298C
+ ldr r0, _08032B40 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _08032B4C
@@ -8773,9 +8773,9 @@ _08032B30: .4byte gUnknown_2022974
_08032B34: .4byte gUnknown_2022976
_08032B38: .4byte gActiveBattler
_08032B3C: .4byte gUnknown_2022BC6
-_08032B40: .4byte gUnknown_202298C
+_08032B40: .4byte gDisplayedStringBattle
_08032B44:
- ldr r0, _08032B60 @ =gUnknown_202298C
+ ldr r0, _08032B60 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_08032B4C:
@@ -8790,7 +8790,7 @@ _08032B4C:
pop {r0}
bx r0
.align 2, 0
-_08032B60: .4byte gUnknown_202298C
+_08032B60: .4byte gDisplayedStringBattle
_08032B64: .4byte gUnknown_3004FE0
_08032B68: .4byte gActiveBattler
_08032B6C: .4byte sub_8030610
@@ -8880,7 +8880,7 @@ _08032BF6:
bl ActionSelectionCreateCursorAt
ldr r0, _08032C40 @ =gUnknown_83FE6D5
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _08032C44 @ =gUnknown_202298C
+ ldr r0, _08032C44 @ =gDisplayedStringBattle
movs r1, 0x1
bl sub_80D87BC
pop {r4}
@@ -8894,7 +8894,7 @@ _08032C34: .4byte gUnknown_83FDA4C
_08032C38: .4byte gUnknown_83FE725
_08032C3C: .4byte gUnknown_2023FF8
_08032C40: .4byte gUnknown_83FE6D5
-_08032C44: .4byte gUnknown_202298C
+_08032C44: .4byte gDisplayedStringBattle
thumb_func_end sub_8032BD4
thumb_func_start nullsub_14
diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s
index 59692c9f4..1f01cec2d 100644
--- a/asm/battle_controller_pokedude.s
+++ b/asm/battle_controller_pokedude.s
@@ -5072,7 +5072,7 @@ sub_8158A88: @ 8158A88
lsls r0, 24
cmp r0, 0
beq _08158AD0
- ldr r0, _08158ACC @ =gUnknown_202298C
+ ldr r0, _08158ACC @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _08158AD8
@@ -5081,9 +5081,9 @@ _08158ABC: .4byte gUnknown_2022974
_08158AC0: .4byte gUnknown_2022976
_08158AC4: .4byte gActiveBattler
_08158AC8: .4byte gUnknown_2022BC6
-_08158ACC: .4byte gUnknown_202298C
+_08158ACC: .4byte gDisplayedStringBattle
_08158AD0:
- ldr r0, _08158AEC @ =gUnknown_202298C
+ ldr r0, _08158AEC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_08158AD8:
@@ -5098,7 +5098,7 @@ _08158AD8:
pop {r0}
bx r0
.align 2, 0
-_08158AEC: .4byte gUnknown_202298C
+_08158AEC: .4byte gDisplayedStringBattle
_08158AF0: .4byte gUnknown_3004FE0
_08158AF4: .4byte gActiveBattler
_08158AF8: .4byte sub_815623C
@@ -5193,7 +5193,7 @@ _08158B8E:
bl ActionSelectionCreateCursorAt
ldr r0, _08158BD4 @ =gUnknown_83FE6D5
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _08158BD8 @ =gUnknown_202298C
+ ldr r0, _08158BD8 @ =gDisplayedStringBattle
movs r1, 0x1
bl sub_80D87BC
b _08158BE8
@@ -5205,7 +5205,7 @@ _08158BC8: .4byte gUnknown_83FDA4C
_08158BCC: .4byte gUnknown_83FE725
_08158BD0: .4byte gUnknown_2023FF8
_08158BD4: .4byte gUnknown_83FE6D5
-_08158BD8: .4byte gUnknown_202298C
+_08158BD8: .4byte gDisplayedStringBattle
_08158BDC:
ldr r0, _08158BF0 @ =gUnknown_3004FE0
ldrb r1, [r4]
@@ -7267,13 +7267,13 @@ _08159C44:
strh r0, [r1]
bl sub_8159EF0
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _08159C60 @ =gUnknown_202298C
+ ldr r0, _08159C60 @ =gDisplayedStringBattle
movs r1, 0x18
bl sub_80D87BC
b _08159C94
.align 2, 0
_08159C5C: .4byte gUnknown_2022976
-_08159C60: .4byte gUnknown_202298C
+_08159C60: .4byte gDisplayedStringBattle
_08159C64:
movs r0, 0x18
bl IsTextPrinterActive
@@ -7468,12 +7468,12 @@ _08159DF0: .4byte gUnknown_2037AB8
_08159DF4:
bl sub_8159EF0
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _08159E08 @ =gUnknown_202298C
+ ldr r0, _08159E08 @ =gDisplayedStringBattle
movs r1, 0x18
bl sub_80D87BC
b _08159E84
.align 2, 0
-_08159E08: .4byte gUnknown_202298C
+_08159E08: .4byte gDisplayedStringBattle
_08159E0C:
movs r0, 0x18
bl IsTextPrinterActive
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index 44bdd5572..e221fe8e9 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -866,7 +866,7 @@ sub_80DDBA0: @ 80DDBA0
lsls r0, 24
cmp r0, 0
beq _080DDBE8
- ldr r0, _080DDBE4 @ =gUnknown_202298C
+ ldr r0, _080DDBE4 @ =gDisplayedStringBattle
movs r1, 0x40
bl sub_80D87BC
b _080DDBF0
@@ -875,9 +875,9 @@ _080DDBD4: .4byte gUnknown_2022974
_080DDBD8: .4byte gUnknown_2022976
_080DDBDC: .4byte gActiveBattler
_080DDBE0: .4byte gUnknown_2022BC6
-_080DDBE4: .4byte gUnknown_202298C
+_080DDBE4: .4byte gDisplayedStringBattle
_080DDBE8:
- ldr r0, _080DDC04 @ =gUnknown_202298C
+ ldr r0, _080DDC04 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
_080DDBF0:
@@ -892,7 +892,7 @@ _080DDBF0:
pop {r0}
bx r0
.align 2, 0
-_080DDC04: .4byte gUnknown_202298C
+_080DDC04: .4byte gDisplayedStringBattle
_080DDC08: .4byte gUnknown_3004FE0
_080DDC0C: .4byte gActiveBattler
_080DDC10: .4byte CompleteOnInactiveTextPrinter_3
@@ -982,7 +982,7 @@ _080DDC9A:
bl ActionSelectionCreateCursorAt
ldr r0, _080DDCE4 @ =gUnknown_83FE6E6
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080DDCE8 @ =gUnknown_202298C
+ ldr r0, _080DDCE8 @ =gDisplayedStringBattle
movs r1, 0x1
bl sub_80D87BC
pop {r4}
@@ -996,7 +996,7 @@ _080DDCD8: .4byte gUnknown_83FDA4C
_080DDCDC: .4byte gUnknown_83FE747
_080DDCE0: .4byte gUnknown_2023FF8
_080DDCE4: .4byte gUnknown_83FE6E6
-_080DDCE8: .4byte gUnknown_202298C
+_080DDCE8: .4byte gDisplayedStringBattle
thumb_func_end sub_80DDC78
thumb_func_start sub_80DDCEC
diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s
index 1795e4b8f..bf0bb8d5a 100644
--- a/asm/battle_controllers.s
+++ b/asm/battle_controllers.s
@@ -2243,12 +2243,12 @@ _0800E35A:
adds r5, 0x10
mov r4, r12
adds r4, 0x20
- ldr r6, _0800E3E4 @ =gUnknown_2022AC8
+ ldr r6, _0800E3E4 @ =gBattleTextBuff2
mov r2, r12
adds r2, 0x30
_0800E378:
adds r1, r5, r3
- ldr r7, _0800E3E8 @ =gUnknown_2022AB8
+ ldr r7, _0800E3E8 @ =gBattleTextBuff1
adds r0, r3, r7
ldrb r0, [r0]
strb r0, [r1]
@@ -2288,8 +2288,8 @@ _0800E3D4: .4byte gPotentialItemEffectBattler
_0800E3D8: .4byte gBattleMoves
_0800E3DC: .4byte gUnknown_2022AD8
_0800E3E0: .4byte gBattleMons
-_0800E3E4: .4byte gUnknown_2022AC8
-_0800E3E8: .4byte gUnknown_2022AB8
+_0800E3E4: .4byte gBattleTextBuff2
+_0800E3E8: .4byte gBattleTextBuff1
thumb_func_end EmitPrintString
thumb_func_start EmitPrintSelectionString
@@ -2356,12 +2356,12 @@ _0800E44E:
adds r5, 0x10
mov r4, r12
adds r4, 0x20
- ldr r6, _0800E4CC @ =gUnknown_2022AC8
+ ldr r6, _0800E4CC @ =gBattleTextBuff2
mov r2, r12
adds r2, 0x30
_0800E46C:
adds r1, r5, r3
- ldr r7, _0800E4D0 @ =gUnknown_2022AB8
+ ldr r7, _0800E4D0 @ =gBattleTextBuff1
adds r0, r3, r7
ldrb r0, [r0]
strb r0, [r1]
@@ -2398,8 +2398,8 @@ _0800E4BC: .4byte gBattleScripting
_0800E4C0: .4byte gBattleStruct
_0800E4C4: .4byte gUnknown_2022AD8
_0800E4C8: .4byte gBattleMons
-_0800E4CC: .4byte gUnknown_2022AC8
-_0800E4D0: .4byte gUnknown_2022AB8
+_0800E4CC: .4byte gBattleTextBuff2
+_0800E4D0: .4byte gBattleTextBuff1
thumb_func_end EmitPrintSelectionString
thumb_func_start EmitChooseAction
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index 76fc42280..85c9e4af9 100644
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -3555,7 +3555,7 @@ sub_80496C0: @ 80496C0
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r0, _08049760 @ =gUnknown_202298C
+ ldr r0, _08049760 @ =gDisplayedStringBattle
ldr r1, _08049764 @ =gUnknown_8260556
bl StringCopy
adds r5, r0, 0
@@ -3623,7 +3623,7 @@ _08049754:
movs r0, 0xB
b _08049782
.align 2, 0
-_08049760: .4byte gUnknown_202298C
+_08049760: .4byte gDisplayedStringBattle
_08049764: .4byte gUnknown_8260556
_08049768: .4byte gSpeciesNames
_0804976C: .4byte gSprites
@@ -3642,7 +3642,7 @@ _08049782:
strb r0, [r5]
movs r0, 0xFF
strb r0, [r5, 0x1]
- ldr r0, _080497E4 @ =gUnknown_202298C
+ ldr r0, _080497E4 @ =gDisplayedStringBattle
add r3, sp, 0xC
movs r1, 0
movs r2, 0x3
@@ -3684,7 +3684,7 @@ _080497D4:
bl sub_804A6E8
b _08049804
.align 2, 0
-_080497E4: .4byte gUnknown_202298C
+_080497E4: .4byte gDisplayedStringBattle
_080497E8: .4byte gSprites
_080497EC: .4byte 0x06010040
_080497F0: .4byte 0x06010400
diff --git a/asm/battle_message.s b/asm/battle_message.s
index 5b98e90f0..71dd7f5ed 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -53,7 +53,7 @@ sub_80D7274: @ 80D7274
movs r2, 0
mov r12, r8
mov r10, r5
- ldr r1, _080D7350 @ =gUnknown_2022AB8
+ ldr r1, _080D7350 @ =gBattleTextBuff1
mov r9, r1
ldr r3, _080D7354 @ =gUnknown_2039A30
_080D72D6:
@@ -67,10 +67,10 @@ _080D72D6:
cmp r2, 0x3
ble _080D72D6
movs r2, 0
- ldr r0, _080D7350 @ =gUnknown_2022AB8
+ ldr r0, _080D7350 @ =gBattleTextBuff1
mov r8, r0
ldr r3, _080D7330 @ =gUnknown_2039A34
- ldr r5, _080D7358 @ =gUnknown_2022AC8
+ ldr r5, _080D7358 @ =gBattleTextBuff2
ldr r4, _080D735C @ =gUnknown_2022AD8
_080D72F4:
mov r0, r8
@@ -113,9 +113,9 @@ _080D7340: .4byte gLastUsedAbility
_080D7344: .4byte gBattleScripting
_080D7348: .4byte gBattleStruct
_080D734C: .4byte gPotentialItemEffectBattler
-_080D7350: .4byte gUnknown_2022AB8
+_080D7350: .4byte gBattleTextBuff1
_080D7354: .4byte gUnknown_2039A30
-_080D7358: .4byte gUnknown_2022AC8
+_080D7358: .4byte gBattleTextBuff2
_080D735C: .4byte gUnknown_2022AD8
_080D7360: .4byte _080D7364
.align 2, 0
@@ -452,7 +452,7 @@ _080D75F0:
lsls r0, 1
cmp r1, r0
bls _080D762C
- ldr r0, _080D7620 @ =gUnknown_2022AC8
+ ldr r0, _080D7620 @ =gBattleTextBuff2
ldr r2, _080D7624 @ =gUnknown_83FEA28
ldr r1, _080D7628 @ =gBattleStruct
ldr r1, [r1]
@@ -465,11 +465,11 @@ _080D75F0:
b _080D763C
.align 2, 0
_080D761C: .4byte gUnknown_2039A34
-_080D7620: .4byte gUnknown_2022AC8
+_080D7620: .4byte gBattleTextBuff2
_080D7624: .4byte gUnknown_83FEA28
_080D7628: .4byte gBattleStruct
_080D762C:
- ldr r0, _080D7648 @ =gUnknown_2022AC8
+ ldr r0, _080D7648 @ =gBattleTextBuff2
ldrh r2, [r2]
movs r1, 0xD
muls r1, r2
@@ -477,16 +477,16 @@ _080D762C:
adds r1, r2
bl StringCopy
_080D763C:
- ldr r0, _080D7648 @ =gUnknown_2022AC8
+ ldr r0, _080D7648 @ =gBattleTextBuff2
bl sub_80D8720
ldr r7, _080D7650 @ =gUnknown_83FD57B
b _080D77DC
.align 2, 0
-_080D7648: .4byte gUnknown_2022AC8
+_080D7648: .4byte gBattleTextBuff2
_080D764C: .4byte gUnknown_8247094
_080D7650: .4byte gUnknown_83FD57B
_080D7654:
- ldr r4, _080D7694 @ =gUnknown_2022AB8
+ ldr r4, _080D7694 @ =gBattleTextBuff1
ldrb r1, [r4]
movs r0, 0x80
ands r0, r1
@@ -509,7 +509,7 @@ _080D7654:
eors r0, r1
strb r0, [r4]
_080D7682:
- ldr r0, _080D7694 @ =gUnknown_2022AB8
+ ldr r0, _080D7694 @ =gBattleTextBuff1
ldrb r0, [r0]
subs r0, 0x2
lsls r0, 24
@@ -519,7 +519,7 @@ _080D7682:
ldr r7, _080D7698 @ =gUnknown_83FCC8A
b _080D77DC
.align 2, 0
-_080D7694: .4byte gUnknown_2022AB8
+_080D7694: .4byte gBattleTextBuff1
_080D7698: .4byte gUnknown_83FCC8A
_080D769C:
ldr r0, _080D76AC @ =gBattleTypeFlags
@@ -570,7 +570,7 @@ _080D76F0:
ands r0, r1
cmp r0, 0
beq _080D7738
- ldr r0, _080D7714 @ =gUnknown_2022AB8
+ ldr r0, _080D7714 @ =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _080D7728
@@ -581,7 +581,7 @@ _080D76F0:
b _080D77DC
.align 2, 0
_080D7710: .4byte gBattleTypeFlags
-_080D7714: .4byte gUnknown_2022AB8
+_080D7714: .4byte gBattleTextBuff1
_080D7718:
cmp r0, 0x3
beq _080D7730
@@ -608,7 +608,7 @@ _080D7738:
lsls r0, 4
cmp r1, r0
bne _080D7780
- ldr r0, _080D775C @ =gUnknown_2022AB8
+ ldr r0, _080D775C @ =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _080D7770
@@ -619,7 +619,7 @@ _080D7738:
b _080D77DC
.align 2, 0
_080D7758: .4byte gTrainerBattleOpponent_A
-_080D775C: .4byte gUnknown_2022AB8
+_080D775C: .4byte gBattleTextBuff1
_080D7760:
cmp r0, 0x3
beq _080D7778
@@ -640,7 +640,7 @@ _080D7778:
.align 2, 0
_080D777C: .4byte gUnknown_83FE9FF
_080D7780:
- ldr r0, _080D7794 @ =gUnknown_2022AB8
+ ldr r0, _080D7794 @ =gBattleTextBuff1
ldrb r0, [r0]
cmp r0, 0x2
beq _080D77A8
@@ -650,7 +650,7 @@ _080D7780:
beq _080D779E
b _080D77DC
.align 2, 0
-_080D7794: .4byte gUnknown_2022AB8
+_080D7794: .4byte gBattleTextBuff1
_080D7798:
cmp r0, 0x3
beq _080D77B0
@@ -674,13 +674,13 @@ _080D77B8:
ldr r0, _080D77C8 @ =0x00000181
cmp r6, r0
bls _080D77D0
- ldr r1, _080D77CC @ =gUnknown_202298C
+ ldr r1, _080D77CC @ =gDisplayedStringBattle
movs r0, 0xFF
strb r0, [r1]
b _080D77E2
.align 2, 0
_080D77C8: .4byte 0x00000181
-_080D77CC: .4byte gUnknown_202298C
+_080D77CC: .4byte gDisplayedStringBattle
_080D77D0:
ldr r1, _080D77F0 @ =gUnknown_83FDF3C
adds r0, r6, 0
@@ -706,12 +706,12 @@ _080D77F0: .4byte gUnknown_83FDF3C
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
BattleStringExpandPlaceholdersToDisplayedString: @ 80D77F4
push {lr}
- ldr r1, _080D7800 @ =gUnknown_202298C
+ ldr r1, _080D7800 @ =gDisplayedStringBattle
bl sub_80D7868
pop {r1}
bx r1
.align 2, 0
-_080D7800: .4byte gUnknown_202298C
+_080D7800: .4byte gDisplayedStringBattle
thumb_func_end BattleStringExpandPlaceholdersToDisplayedString
thumb_func_start TryGetStatusString
@@ -859,7 +859,7 @@ _080D78B0:
.4byte _080D8250
.4byte _080D79B8
_080D7974:
- ldr r5, _080D7984 @ =gUnknown_2022AB8
+ ldr r5, _080D7984 @ =gBattleTextBuff1
ldrb r0, [r5]
cmp r0, 0xFD
bne _080D798C
@@ -867,7 +867,7 @@ _080D7974:
adds r0, r5, 0
b _080D79C4
.align 2, 0
-_080D7984: .4byte gUnknown_2022AB8
+_080D7984: .4byte gBattleTextBuff1
_080D7988: .4byte gStringVar1
_080D798C:
adds r0, r5, 0
@@ -880,14 +880,14 @@ _080D799C:
adds r4, r5, 0
bl _080D8382
_080D79A2:
- ldr r1, _080D79B0 @ =gUnknown_2022AC8
+ ldr r1, _080D79B0 @ =gBattleTextBuff2
ldrb r0, [r1]
cmp r0, 0xFD
bne _080D79D8
ldr r4, _080D79B4 @ =gStringVar2
b _080D79C2
.align 2, 0
-_080D79B0: .4byte gUnknown_2022AC8
+_080D79B0: .4byte gBattleTextBuff2
_080D79B4: .4byte gStringVar2
_080D79B8:
ldr r1, _080D79D0 @ =gUnknown_2022AD8
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index ee6b44113..7972b7c80 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -7666,7 +7666,7 @@ _08021492:
bl EmitSetMonData
ldrb r0, [r5]
bl MarkBufferBankForExecution
- ldr r1, _08021588 @ =gUnknown_2022AB8
+ ldr r1, _08021588 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -7708,7 +7708,7 @@ _08021578: .4byte gBattlerTarget
_0802157C: .4byte gCurrentMove
_08021580: .4byte gUnknown_81D8FA3
_08021584: .4byte gActiveBattler
-_08021588: .4byte gUnknown_2022AB8
+_08021588: .4byte gBattleTextBuff1
_0802158C:
ldr r0, [r6]
adds r0, 0x7
@@ -8856,7 +8856,7 @@ _08021EAE:
_08021EB4:
strb r1, [r0]
_08021EB6:
- ldr r1, _08021F60 @ =gUnknown_2022AB8
+ ldr r1, _08021F60 @ =gBattleTextBuff1
movs r2, 0
mov r12, r2
movs r3, 0xFD
@@ -8874,7 +8874,7 @@ _08021EB6:
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r1, _08021F64 @ =gUnknown_2022AC8
+ ldr r1, _08021F64 @ =gBattleTextBuff2
strb r3, [r1]
mov r0, r12
strb r0, [r1, 0x1]
@@ -8939,8 +8939,8 @@ _08021F4C:
b _08022052
.align 2, 0
_08021F5C: .4byte gBattleStruct
-_08021F60: .4byte gUnknown_2022AB8
-_08021F64: .4byte gUnknown_2022AC8
+_08021F60: .4byte gBattleTextBuff1
+_08021F64: .4byte gBattleTextBuff2
_08021F68: .4byte gUnknown_2022AD8
_08021F6C: .4byte gPlayerParty
_08021F70: .4byte gBattleMons
@@ -9112,7 +9112,7 @@ _080220B0:
adds r1, r2, 0
bl HandleLowHpMusicChange
_080220DA:
- ldr r1, _08022330 @ =gUnknown_2022AB8
+ ldr r1, _08022330 @ =gBattleTextBuff1
movs r3, 0xFD
strb r3, [r1]
movs r0, 0x4
@@ -9127,7 +9127,7 @@ _080220DA:
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r4, _08022334 @ =gUnknown_2022AC8
+ ldr r4, _08022334 @ =gBattleTextBuff2
strb r3, [r4]
movs r0, 0x1
strb r0, [r4, 0x1]
@@ -9386,8 +9386,8 @@ _08022320: .4byte gUnknown_20233C4
_08022324: .4byte gBattleTypeFlags
_08022328: .4byte gBattlerPartyIndexes
_0802232C: .4byte gPlayerParty
-_08022330: .4byte gUnknown_2022AB8
-_08022334: .4byte gUnknown_2022AC8
+_08022330: .4byte gBattleTextBuff1
+_08022334: .4byte gBattleTextBuff2
_08022338: .4byte gUnknown_3004FD4
_0802233C: .4byte gBitTable
_08022340: .4byte gUnknown_2023D74
@@ -13194,7 +13194,7 @@ _08024068:
ldr r3, _080240A8 @ =gActiveBattler
ldrb r2, [r3]
strb r2, [r0, 0x17]
- ldr r1, _080240D0 @ =gUnknown_2022AB8
+ ldr r1, _080240D0 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x7
@@ -13230,7 +13230,7 @@ _080240C0: .4byte gBattlerPartyIndexes
_080240C4: .4byte gBattleMoves
_080240C8: .4byte gCurrentMove
_080240CC: .4byte gBattleScripting
-_080240D0: .4byte gUnknown_2022AB8
+_080240D0: .4byte gBattleTextBuff1
thumb_func_end sub_8023F48
thumb_func_start sub_80240D4
@@ -14811,7 +14811,7 @@ _08024DBC:
ldrb r0, [r7]
bl sub_8013F6C
_08024DC2:
- ldr r1, _08024E1C @ =gUnknown_2022AB8
+ ldr r1, _08024E1C @ =gBattleTextBuff1
movs r5, 0xFD
strb r5, [r1]
movs r0, 0x6
@@ -14832,7 +14832,7 @@ _08024DC2:
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r2, _08024E28 @ =gUnknown_2022AC8
+ ldr r2, _08024E28 @ =gBattleTextBuff2
strb r5, [r2]
movs r0, 0x7
strb r0, [r2, 0x1]
@@ -14859,10 +14859,10 @@ _08024E16:
pop {r0}
bx r0
.align 2, 0
-_08024E1C: .4byte gUnknown_2022AB8
+_08024E1C: .4byte gBattleTextBuff1
_08024E20: .4byte gBattleMons
_08024E24: .4byte sBattler_AI
-_08024E28: .4byte gUnknown_2022AC8
+_08024E28: .4byte gBattleTextBuff2
_08024E2C: .4byte gActiveBattler
_08024E30: .4byte gUnknown_20233C4
_08024E34: .4byte gUnknown_2023D74
@@ -15768,7 +15768,7 @@ _0802558C:
lsls r0, 24
orrs r1, r0
str r1, [r3]
- ldr r1, _08025684 @ =gUnknown_2022AC8
+ ldr r1, _08025684 @ =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -15873,7 +15873,7 @@ _08025622:
b _080256D0
.align 2, 0
_08025680: .4byte gUnknown_2023D74
-_08025684: .4byte gUnknown_2022AC8
+_08025684: .4byte gBattleTextBuff2
_08025688: .4byte gMoveToLearn
_0802568C: .4byte gBattlerPartyIndexes
_08025690: .4byte gBattleMons
@@ -16308,7 +16308,7 @@ _080259FA:
bl sub_8054C04
adds r4, r0, 0
_08025A00:
- ldr r1, _08025A40 @ =gUnknown_2022AB8
+ ldr r1, _08025A40 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x1
@@ -16340,7 +16340,7 @@ _08025A00:
str r0, [r1]
b _08025A62
.align 2, 0
-_08025A40: .4byte gUnknown_2022AB8
+_08025A40: .4byte gBattleTextBuff1
_08025A44: .4byte gUnknown_2023D74
_08025A48:
ldr r3, _08025A6C @ =gUnknown_2023D74
@@ -17283,7 +17283,7 @@ _080261C8: .4byte gBattleMons
thumb_func_start atk6B_atknameinbuff1
atk6B_atknameinbuff1: @ 80261CC
- ldr r1, _080261F8 @ =gUnknown_2022AB8
+ ldr r1, _080261F8 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x7
@@ -17305,7 +17305,7 @@ atk6B_atknameinbuff1: @ 80261CC
str r0, [r1]
bx lr
.align 2, 0
-_080261F8: .4byte gUnknown_2022AB8
+_080261F8: .4byte gBattleTextBuff1
_080261FC: .4byte sBattler_AI
_08026200: .4byte gBattlerPartyIndexes
_08026204: .4byte gUnknown_2023D74
@@ -18105,7 +18105,7 @@ _08026874: .4byte gLastUsedAbility
thumb_func_start BufferMoveToLearnIntoBattleTextBuff2
BufferMoveToLearnIntoBattleTextBuff2: @ 8026878
- ldr r2, _08026898 @ =gUnknown_2022AC8
+ ldr r2, _08026898 @ =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r2]
movs r0, 0x2
@@ -18122,7 +18122,7 @@ BufferMoveToLearnIntoBattleTextBuff2: @ 8026878
strb r0, [r2, 0x4]
bx lr
.align 2, 0
-_08026898: .4byte gUnknown_2022AC8
+_08026898: .4byte gBattleTextBuff2
_0802689C: .4byte gMoveToLearn
thumb_func_end BufferMoveToLearnIntoBattleTextBuff2
@@ -20279,7 +20279,7 @@ _08027980:
adds r0, 0x1
movs r3, 0
strb r0, [r1, 0x9]
- ldr r2, _080279B8 @ =gUnknown_2022AB8
+ ldr r2, _080279B8 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r2]
movs r0, 0x1
@@ -20306,7 +20306,7 @@ _080279AA:
pop {r0}
bx r0
.align 2, 0
-_080279B8: .4byte gUnknown_2022AB8
+_080279B8: .4byte gBattleTextBuff1
_080279BC: .4byte gUnknown_2023E82
_080279C0: .4byte gUnknown_2023D74
thumb_func_end atk85_stockpile
@@ -20646,7 +20646,7 @@ _08027C4E:
_08027C64:
movs r0, 0xDF
ands r5, r0
- ldr r1, _08027CDC @ =gUnknown_2022AB8
+ ldr r1, _08027CDC @ =gBattleTextBuff1
movs r4, 0
movs r2, 0xFD
strb r2, [r1]
@@ -20703,7 +20703,7 @@ _08027C88:
.align 2, 0
_08027CD4: .4byte gActiveBattler
_08027CD8: .4byte gBattlerTarget
-_08027CDC: .4byte gUnknown_2022AB8
+_08027CDC: .4byte gBattleTextBuff1
_08027CE0: .4byte gSideTimers
_08027CE4: .4byte gCurrentMove
_08027CE8: .4byte gUnknown_2023ECC
@@ -20946,7 +20946,7 @@ _08027EE8:
ands r0, r1
negs r0, r0
lsls r0, 24
- ldr r3, _08027F60 @ =gUnknown_2022AC8
+ ldr r3, _08027F60 @ =gBattleTextBuff2
movs r4, 0
movs r1, 0xFD
strb r1, [r3]
@@ -21002,14 +21002,14 @@ _08027F56:
b _08027FF0
.align 2, 0
_08027F5C: .4byte gActiveBattler
-_08027F60: .4byte gUnknown_2022AC8
+_08027F60: .4byte gBattleTextBuff2
_08027F64: .4byte gBattlerTarget
_08027F68: .4byte gUnknown_2023E82
_08027F6C:
asrs r6, r0, 28
movs r0, 0x7
ands r6, r0
- ldr r3, _08027FCC @ =gUnknown_2022AC8
+ ldr r3, _08027FCC @ =gBattleTextBuff2
strb r2, [r3]
movs r2, 0x1
cmp r6, 0x2
@@ -21057,7 +21057,7 @@ _08027FC2:
mov r8, r1
b _08027FF0
.align 2, 0
-_08027FCC: .4byte gUnknown_2022AC8
+_08027FCC: .4byte gBattleTextBuff2
_08027FD0: .4byte gBattleMons
_08027FD4: .4byte gActiveBattler
_08027FD8: .4byte gUnknown_2023E82
@@ -22043,7 +22043,7 @@ _08028752:
add r0, r8
adds r0, 0x22
strb r2, [r0]
- ldr r1, _080287A0 @ =gUnknown_2022AB8
+ ldr r1, _080287A0 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x3
@@ -22064,7 +22064,7 @@ _08028790:
pop {r0}
bx r0
.align 2, 0
-_080287A0: .4byte gUnknown_2022AB8
+_080287A0: .4byte gBattleTextBuff1
_080287A4: .4byte gUnknown_2023D74
thumb_func_end atk90_tryconversiontypechange
@@ -22095,7 +22095,7 @@ atk91_givepaydaymoney: @ 80287A8
adds r0, r1
adds r1, r4, 0
bl AddMoney
- ldr r1, _0802881C @ =gUnknown_2022AB8
+ ldr r1, _0802881C @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x1
@@ -22123,7 +22123,7 @@ _0802880C: .4byte gBattleTypeFlags
_08028810: .4byte gUnknown_2023E7E
_08028814: .4byte gBattleStruct
_08028818: .4byte gSaveBlock1Ptr
-_0802881C: .4byte gUnknown_2022AB8
+_0802881C: .4byte gBattleTextBuff1
_08028820: .4byte gUnknown_2023D74
_08028824: .4byte gUnknown_81D911D
_08028828:
@@ -23542,7 +23542,7 @@ _08029350:
movs r0, 0xF
ands r0, r2
strb r0, [r1, 0x18]
- ldr r1, _0802942C @ =gUnknown_2022AB8
+ ldr r1, _0802942C @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x6
@@ -23605,7 +23605,7 @@ _08029400:
.align 2, 0
_08029424: .4byte sBattler_AI
_08029428: .4byte gDisableStructs
-_0802942C: .4byte gUnknown_2022AB8
+_0802942C: .4byte gBattleTextBuff1
_08029430: .4byte gActiveBattler
_08029434: .4byte gBattleMoves
_08029438: .4byte gUnknown_2023BF0
@@ -23933,7 +23933,7 @@ _080296B0:
movs r1, 0x5
strb r1, [r0]
_080296C4:
- ldr r1, _0802971C @ =gUnknown_2022AB8
+ ldr r1, _0802971C @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -23977,7 +23977,7 @@ _080296C4:
str r0, [r4]
b _08029744
.align 2, 0
-_0802971C: .4byte gUnknown_2022AB8
+_0802971C: .4byte gBattleTextBuff1
_08029720: .4byte gDisableStructs
_08029724: .4byte gBitTable
_08029728:
@@ -24453,7 +24453,7 @@ _08029AC4:
ldrb r0, [r0]
cmp r0, 0
beq _08029B88
- ldr r1, _08029B80 @ =gUnknown_2022AB8
+ ldr r1, _08029B80 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -24523,7 +24523,7 @@ _08029B70: .4byte gBattleMons
_08029B74: .4byte gBattlerTarget
_08029B78: .4byte gLastUsedMove
_08029B7C: .4byte gDisableStructs
-_08029B80: .4byte gUnknown_2022AB8
+_08029B80: .4byte gBattleTextBuff1
_08029B84: .4byte gUnknown_2023D74
_08029B88:
ldr r3, _08029BB0 @ =gUnknown_2023D74
@@ -24875,7 +24875,7 @@ _08029E2C:
adds r0, r7
adds r0, 0x22
strb r5, [r0]
- ldr r1, _08029E50 @ =gUnknown_2022AB8
+ ldr r1, _08029E50 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x3
@@ -24886,7 +24886,7 @@ _08029E2C:
ldr r1, _08029E54 @ =gUnknown_2023D74
b _08029E82
.align 2, 0
-_08029E50: .4byte gUnknown_2022AB8
+_08029E50: .4byte gBattleTextBuff1
_08029E54: .4byte gUnknown_2023D74
_08029E58:
mov r0, r8
@@ -24901,7 +24901,7 @@ _08029E58:
adds r0, r7
adds r0, 0x22
strb r2, [r0]
- ldr r1, _08029E90 @ =gUnknown_2022AB8
+ ldr r1, _08029E90 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x3
@@ -24917,7 +24917,7 @@ _08029E82:
b _08029F80
.align 2, 0
_08029E8C: .4byte gBattleMons
-_08029E90: .4byte gUnknown_2022AB8
+_08029E90: .4byte gBattleTextBuff1
_08029E94:
movs r4, 0
mov r8, r4
@@ -25264,7 +25264,7 @@ _0802A0F2:
ldr r0, _0802A184 @ =gActiveBattler
ldrb r0, [r0]
bl MarkBufferBankForExecution
- ldr r1, _0802A188 @ =gUnknown_2022AB8
+ ldr r1, _0802A188 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -25299,7 +25299,7 @@ _0802A178: .4byte gBattlerTarget
_0802A17C: .4byte gUnknown_2023D48
_0802A180: .4byte gBattleMoves
_0802A184: .4byte gActiveBattler
-_0802A188: .4byte gUnknown_2022AB8
+_0802A188: .4byte gBattleTextBuff1
_0802A18C: .4byte gUnknown_2023D74
_0802A190:
ldr r3, _0802A1BC @ =gUnknown_2023D74
@@ -25827,7 +25827,7 @@ _0802A55E:
bge _0802A57C
adds r6, r0, 0
_0802A57C:
- ldr r1, _0802A668 @ =gUnknown_2022AB8
+ ldr r1, _0802A668 @ =gBattleTextBuff1
movs r5, 0xFD
strb r5, [r1]
movs r0, 0x2
@@ -25847,7 +25847,7 @@ _0802A57C:
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r4, _0802A66C @ =gUnknown_2022AC8
+ ldr r4, _0802A66C @ =gBattleTextBuff2
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0
@@ -25938,8 +25938,8 @@ _0802A658: .4byte gLastUsedMove
_0802A65C: .4byte gBattlerTarget
_0802A660: .4byte 0x0000ffff
_0802A664: .4byte gBattleMons
-_0802A668: .4byte gUnknown_2022AB8
-_0802A66C: .4byte gUnknown_2022AC8
+_0802A668: .4byte gBattleTextBuff1
+_0802A66C: .4byte gBattleTextBuff2
_0802A670: .4byte gActiveBattler
_0802A674: .4byte gDisableStructs
_0802A678: .4byte gBitTable
@@ -27229,7 +27229,7 @@ _0802B0AC:
strh r0, [r1]
movs r3, 0xA
_0802B0B4:
- ldr r1, _0802B124 @ =gUnknown_2022AB8
+ ldr r1, _0802B124 @ =gBattleTextBuff1
movs r2, 0
movs r0, 0xFD
strb r0, [r1]
@@ -27287,7 +27287,7 @@ _0802B10C:
bx r0
.align 2, 0
_0802B120: .4byte gDynamicBasePower
-_0802B124: .4byte gUnknown_2022AB8
+_0802B124: .4byte gBattleTextBuff1
_0802B128: .4byte gBattlerTarget
_0802B12C: .4byte gBattlersCount
_0802B130: .4byte gUnknown_2023D74
@@ -27677,7 +27677,7 @@ atkBE_rapidspinfree: @ 802B3F4
adds r0, r2
ldrb r0, [r0, 0x14]
strb r0, [r3]
- ldr r1, _0802B47C @ =gUnknown_2022AB8
+ ldr r1, _0802B47C @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -27705,7 +27705,7 @@ _0802B46C: .4byte gBattleScripting
_0802B470: .4byte gBattlerTarget
_0802B474: .4byte 0xffff1fff
_0802B478: .4byte gBattleStruct
-_0802B47C: .4byte gUnknown_2022AB8
+_0802B47C: .4byte gBattleTextBuff1
_0802B480: .4byte gUnknown_2023D74
_0802B484: .4byte gUnknown_81D8DF3
_0802B488:
@@ -28375,7 +28375,7 @@ _0802B9D0:
ldrb r2, [r1]
cmp r2, 0x5
bhi _0802BAD4
- ldr r1, _0802BAAC @ =gUnknown_2022AB8
+ ldr r1, _0802BAAC @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x4
@@ -28474,7 +28474,7 @@ _0802BA9C:
b _0802BB0E
.align 2, 0
_0802BAA8: .4byte gUnknown_2023E82
-_0802BAAC: .4byte gUnknown_2022AB8
+_0802BAAC: .4byte gBattleTextBuff1
_0802BAB0: .4byte sBattler_AI
_0802BAB4: .4byte gUnknown_2023D74
_0802BAB8: .4byte gBattleMoveDamage
@@ -29532,7 +29532,7 @@ _0802C258:
ldr r0, [r1]
adds r0, 0x5
str r0, [r1]
- ldr r1, _0802C354 @ =gUnknown_2022AB8
+ ldr r1, _0802C354 @ =gBattleTextBuff1
movs r3, 0xFD
strb r3, [r1]
movs r2, 0xA
@@ -29544,7 +29544,7 @@ _0802C258:
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r1, _0802C358 @ =gUnknown_2022AC8
+ ldr r1, _0802C358 @ =gBattleTextBuff2
strb r3, [r1]
strb r2, [r1, 0x1]
mov r2, r9
@@ -29568,8 +29568,8 @@ _0802C344: .4byte gBattleStruct
_0802C348: .4byte sBattler_AI
_0802C34C: .4byte gActiveBattler
_0802C350: .4byte gUnknown_2023D74
-_0802C354: .4byte gUnknown_2022AB8
-_0802C358: .4byte gUnknown_2022AC8
+_0802C354: .4byte gBattleTextBuff1
+_0802C358: .4byte gBattleTextBuff2
_0802C35C: .4byte gUnknown_2023E82
_0802C360:
ldrh r0, [r6]
@@ -29702,7 +29702,7 @@ _0802C44C: .4byte gUnknown_2023F20
_0802C450: .4byte sBattler_AI
_0802C454: .4byte gBattlerPartyIndexes
_0802C458:
- ldr r1, _0802C4BC @ =gUnknown_2022AB8
+ ldr r1, _0802C4BC @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x4
@@ -29755,7 +29755,7 @@ _0802C4A4:
str r1, [r7]
b _0802C4D4
.align 2, 0
-_0802C4BC: .4byte gUnknown_2022AB8
+_0802C4BC: .4byte gBattleTextBuff1
_0802C4C0: .4byte gBattlerTarget
_0802C4C4: .4byte gUnknown_2023F20
_0802C4C8: .4byte gBattleMoveDamage
@@ -30698,7 +30698,7 @@ atkE1_trygetintimidatetarget: @ 802CBE4
bl GetBattlerSide
lsls r0, 24
lsrs r5, r0, 24
- ldr r2, _0802CC90 @ =gUnknown_2022AB8
+ ldr r2, _0802CC90 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r2]
movs r0, 0x9
@@ -30773,7 +30773,7 @@ _0802CC6A:
.align 2, 0
_0802CC88: .4byte gBattleScripting
_0802CC8C: .4byte gBattleStruct
-_0802CC90: .4byte gUnknown_2022AB8
+_0802CC90: .4byte gBattleTextBuff1
_0802CC94: .4byte gBattleMons
_0802CC98: .4byte gBattlerTarget
_0802CC9C: .4byte gBattlersCount
@@ -31494,7 +31494,7 @@ atkEB_settypetoterrain: @ 802D1F0
ldrb r0, [r0]
adds r1, 0x22
strb r0, [r1]
- ldr r1, _0802D270 @ =gUnknown_2022AB8
+ ldr r1, _0802D270 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x3
@@ -31515,7 +31515,7 @@ _0802D260: .4byte gBattleMons
_0802D264: .4byte sBattler_AI
_0802D268: .4byte gUnknown_8250888
_0802D26C: .4byte gUnknown_2022B50
-_0802D270: .4byte gUnknown_2022AB8
+_0802D270: .4byte gBattleTextBuff1
_0802D274: .4byte gUnknown_2023D74
_0802D278:
ldr r3, _0802D29C @ =gUnknown_2023D74
diff --git a/asm/battle_util.s b/asm/battle_util.s
index cab42d908..04202e9da 100644
--- a/asm/battle_util.s
+++ b/asm/battle_util.s
@@ -1866,7 +1866,7 @@ _08017C84:
mov r8, r3
movs r7, 0
ldr r6, _08017D24 @ =sBattler_AI
- ldr r5, _08017D28 @ =gUnknown_2022AB8
+ ldr r5, _08017D28 @ =gBattleTextBuff1
_08017C8E:
ldr r0, [r1]
adds r0, 0xDB
@@ -1942,7 +1942,7 @@ _08017D18: .4byte gBattlersCount
_08017D1C: .4byte gBattleStruct
_08017D20: .4byte gActiveBattler
_08017D24: .4byte sBattler_AI
-_08017D28: .4byte gUnknown_2022AB8
+_08017D28: .4byte gBattleTextBuff1
_08017D2C: .4byte gSideTimers
_08017D30: .4byte gSideAffecting
_08017D34: .4byte 0x0000fffe
@@ -1961,7 +1961,7 @@ _08017D4A:
movs r2, 0
mov r8, r2
ldr r7, _08017DE4 @ =sBattler_AI
- ldr r5, _08017DE8 @ =gUnknown_2022AB8
+ ldr r5, _08017DE8 @ =gBattleTextBuff1
_08017D56:
ldr r0, [r1]
adds r0, 0xDB
@@ -2036,7 +2036,7 @@ _08017DD4:
b _08017EA4
.align 2, 0
_08017DE4: .4byte sBattler_AI
-_08017DE8: .4byte gUnknown_2022AB8
+_08017DE8: .4byte gBattleTextBuff1
_08017DEC: .4byte gSideTimers
_08017DF0: .4byte gActiveBattler
_08017DF4: .4byte gSideAffecting
@@ -2056,7 +2056,7 @@ _08017E08:
movs r2, 0
mov r8, r2
ldr r7, _08017EC4 @ =sBattler_AI
- ldr r5, _08017EC8 @ =gUnknown_2022AB8
+ ldr r5, _08017EC8 @ =gBattleTextBuff1
_08017E20:
ldr r0, [r1]
adds r0, 0xDB
@@ -2143,7 +2143,7 @@ _08017EAC:
.align 2, 0
_08017EC0: .4byte gActiveBattler
_08017EC4: .4byte sBattler_AI
-_08017EC8: .4byte gUnknown_2022AB8
+_08017EC8: .4byte gBattleTextBuff1
_08017ECC: .4byte gSideTimers
_08017ED0: .4byte gSideAffecting
_08017ED4: .4byte 0x0000feff
@@ -3099,7 +3099,7 @@ _08018664:
adds r0, r2
ldrb r0, [r0, 0x5]
strb r0, [r1, 0x11]
- ldr r1, _080186E4 @ =gUnknown_2022AB8
+ ldr r1, _080186E4 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -3136,12 +3136,12 @@ _080186D4: .4byte gBattleMons
_080186D8: .4byte 0xffffe000
_080186DC: .4byte gBattleScripting
_080186E0: .4byte gBattleStruct
-_080186E4: .4byte gUnknown_2022AB8
+_080186E4: .4byte gBattleTextBuff1
_080186E8: .4byte gUnknown_2023D74
_080186EC: .4byte gUnknown_81D9124
_080186F0: .4byte gBattleMoveDamage
_080186F4:
- ldr r2, _08018724 @ =gUnknown_2022AB8
+ ldr r2, _08018724 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r2]
movs r0, 0x2
@@ -3167,7 +3167,7 @@ _08018720:
ldr r0, [r1]
b _08018C04
.align 2, 0
-_08018724: .4byte gUnknown_2022AB8
+_08018724: .4byte gBattleTextBuff1
_08018728: .4byte gBattleStruct
_0801872C: .4byte gUnknown_2023D74
_08018730: .4byte gUnknown_81D9136
@@ -3902,7 +3902,7 @@ _08018CD4:
b _08018E16
_08018CE6:
ldr r4, _08018D28 @ =gActiveBattler
- ldr r5, _08018D2C @ =gUnknown_2022AB8
+ ldr r5, _08018D2C @ =gBattleTextBuff1
ldr r6, _08018D30 @ =gUnknown_2023F20
movs r0, 0x8
adds r0, r6
@@ -3935,7 +3935,7 @@ _08018CFC:
_08018D20: .4byte 0x00000181
_08018D24: .4byte gBattlersCount
_08018D28: .4byte gActiveBattler
-_08018D2C: .4byte gUnknown_2022AB8
+_08018D2C: .4byte gBattleTextBuff1
_08018D30: .4byte gUnknown_2023F20
_08018D34: .4byte gBattlerTarget
_08018D38: .4byte gAbsentBattlerFlags
@@ -4068,7 +4068,7 @@ _08018E2C:
b _08018F68
_08018E42:
ldr r5, _08018E84 @ =gActiveBattler
- ldr r4, _08018E88 @ =gUnknown_2022AB8
+ ldr r4, _08018E88 @ =gBattleTextBuff1
ldr r6, _08018E8C @ =gDisableStructs
mov r12, r6
ldr r0, _08018E90 @ =sBattler_AI
@@ -4101,7 +4101,7 @@ _08018E4E:
_08018E7C: .4byte 0x00000181
_08018E80: .4byte gBattlersCount
_08018E84: .4byte gActiveBattler
-_08018E88: .4byte gUnknown_2022AB8
+_08018E88: .4byte gBattleTextBuff1
_08018E8C: .4byte gDisableStructs
_08018E90: .4byte sBattler_AI
_08018E94: .4byte gUnknown_2023BDE
@@ -6809,7 +6809,7 @@ _0801A4D2:
ands r0, r1
cmp r0, 0
beq _0801A4E4
- ldr r0, _0801A564 @ =gUnknown_2022AB8
+ ldr r0, _0801A564 @ =gBattleTextBuff1
ldr r1, _0801A568 @ =gUnknown_8250094
bl StringCopy
_0801A4E4:
@@ -6818,7 +6818,7 @@ _0801A4E4:
ands r0, r1
cmp r0, 0
beq _0801A4F6
- ldr r0, _0801A564 @ =gUnknown_2022AB8
+ ldr r0, _0801A564 @ =gBattleTextBuff1
ldr r1, _0801A56C @ =gUnknown_825009C
bl StringCopy
_0801A4F6:
@@ -6827,7 +6827,7 @@ _0801A4F6:
ands r0, r1
cmp r0, 0
beq _0801A508
- ldr r0, _0801A564 @ =gUnknown_2022AB8
+ ldr r0, _0801A564 @ =gBattleTextBuff1
ldr r1, _0801A570 @ =gUnknown_82500A4
bl StringCopy
_0801A508:
@@ -6836,7 +6836,7 @@ _0801A508:
ands r0, r1
cmp r0, 0
beq _0801A51A
- ldr r0, _0801A564 @ =gUnknown_2022AB8
+ ldr r0, _0801A564 @ =gBattleTextBuff1
ldr r1, _0801A574 @ =gUnknown_82500AC
bl StringCopy
_0801A51A:
@@ -6845,7 +6845,7 @@ _0801A51A:
ands r0, r1
cmp r0, 0
beq _0801A52C
- ldr r0, _0801A564 @ =gUnknown_2022AB8
+ ldr r0, _0801A564 @ =gBattleTextBuff1
ldr r1, _0801A578 @ =gUnknown_82500B4
bl StringCopy
_0801A52C:
@@ -6874,7 +6874,7 @@ _0801A52C:
bl MarkBufferBankForExecution
bl _0801BB5A
.align 2, 0
-_0801A564: .4byte gUnknown_2022AB8
+_0801A564: .4byte gBattleTextBuff1
_0801A568: .4byte gUnknown_8250094
_0801A56C: .4byte gUnknown_825009C
_0801A570: .4byte gUnknown_82500A4
@@ -7407,7 +7407,7 @@ _0801AA10:
_0801AA1A:
strb r5, [r3]
strb r5, [r2]
- ldr r1, _0801AA50 @ =gUnknown_2022AB8
+ ldr r1, _0801AA50 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x3
@@ -7426,7 +7426,7 @@ _0801AA40: .4byte gBattleMoves
_0801AA44: .4byte gUnknown_2023ECC
_0801AA48: .4byte gBattlerTarget
_0801AA4C: .4byte gBattleMons
-_0801AA50: .4byte gUnknown_2022AB8
+_0801AA50: .4byte gBattleTextBuff1
_0801AA54: .4byte gUnknown_2023D74
_0801AA58: .4byte gUnknown_81D949C
_0801AA5C:
@@ -8197,12 +8197,12 @@ _0801B158:
bne _0801B172
b _0801B29E
_0801B172:
- ldr r0, _0801B17C @ =gUnknown_2022AB8
+ ldr r0, _0801B17C @ =gBattleTextBuff1
ldr r1, _0801B180 @ =gUnknown_8250094
b _0801B264
.align 2, 0
_0801B178: .4byte 0x00000f88
-_0801B17C: .4byte gUnknown_2022AB8
+_0801B17C: .4byte gBattleTextBuff1
_0801B180: .4byte gUnknown_8250094
_0801B184:
movs r0, 0x58
@@ -8219,14 +8219,14 @@ _0801B184:
bne _0801B19E
b _0801B29E
_0801B19E:
- ldr r0, _0801B1AC @ =gUnknown_2022AB8
+ ldr r0, _0801B1AC @ =gBattleTextBuff1
ldr r1, _0801B1B0 @ =gUnknown_82500BC
bl StringCopy
movs r2, 0x2
mov r9, r2
b _0801B2A4
.align 2, 0
-_0801B1AC: .4byte gUnknown_2022AB8
+_0801B1AC: .4byte gBattleTextBuff1
_0801B1B0: .4byte gUnknown_82500BC
_0801B1B4:
movs r0, 0x58
@@ -8241,11 +8241,11 @@ _0801B1B4:
ands r0, r1
cmp r0, 0
beq _0801B29E
- ldr r0, _0801B1D4 @ =gUnknown_2022AB8
+ ldr r0, _0801B1D4 @ =gBattleTextBuff1
ldr r1, _0801B1D8 @ =gUnknown_82500A4
b _0801B264
.align 2, 0
-_0801B1D4: .4byte gUnknown_2022AB8
+_0801B1D4: .4byte gBattleTextBuff1
_0801B1D8: .4byte gUnknown_82500A4
_0801B1DC:
movs r0, 0x58
@@ -8265,7 +8265,7 @@ _0801B1DC:
ldr r1, _0801B20C @ =0xf7ffffff
ands r0, r1
str r0, [r2]
- ldr r0, _0801B210 @ =gUnknown_2022AB8
+ ldr r0, _0801B210 @ =gBattleTextBuff1
ldr r1, _0801B214 @ =gUnknown_825009C
bl StringCopy
movs r0, 0x1
@@ -8273,7 +8273,7 @@ _0801B1DC:
b _0801B2A4
.align 2, 0
_0801B20C: .4byte 0xf7ffffff
-_0801B210: .4byte gUnknown_2022AB8
+_0801B210: .4byte gBattleTextBuff1
_0801B214: .4byte gUnknown_825009C
_0801B218:
movs r0, 0x58
@@ -8288,14 +8288,14 @@ _0801B218:
ands r0, r1
cmp r0, 0
beq _0801B29E
- ldr r0, _0801B240 @ =gUnknown_2022AB8
+ ldr r0, _0801B240 @ =gBattleTextBuff1
ldr r1, _0801B244 @ =gUnknown_82500AC
bl StringCopy
movs r2, 0x1
mov r9, r2
b _0801B2A4
.align 2, 0
-_0801B240: .4byte gUnknown_2022AB8
+_0801B240: .4byte gBattleTextBuff1
_0801B244: .4byte gUnknown_82500AC
_0801B248:
movs r0, 0x58
@@ -8310,7 +8310,7 @@ _0801B248:
ands r0, r1
cmp r0, 0
beq _0801B29E
- ldr r0, _0801B270 @ =gUnknown_2022AB8
+ ldr r0, _0801B270 @ =gBattleTextBuff1
ldr r1, _0801B274 @ =gUnknown_82500B4
_0801B264:
bl StringCopy
@@ -8318,7 +8318,7 @@ _0801B264:
mov r9, r4
b _0801B2A4
.align 2, 0
-_0801B270: .4byte gUnknown_2022AB8
+_0801B270: .4byte gBattleTextBuff1
_0801B274: .4byte gUnknown_82500B4
_0801B278:
movs r0, 0x58
@@ -8334,7 +8334,7 @@ _0801B278:
ands r0, r1
cmp r0, 0
beq _0801B29E
- ldr r0, _0801B2B4 @ =gUnknown_2022AB8
+ ldr r0, _0801B2B4 @ =gBattleTextBuff1
ldr r1, _0801B2B8 @ =gUnknown_82500C4
bl StringCopy
movs r2, 0x3
@@ -8353,7 +8353,7 @@ _0801B2A4:
beq _0801B2C4
b _0801B304
.align 2, 0
-_0801B2B4: .4byte gUnknown_2022AB8
+_0801B2B4: .4byte gBattleTextBuff1
_0801B2B8: .4byte gUnknown_82500C4
_0801B2BC:
mov r0, r9
@@ -9394,7 +9394,7 @@ _0801BAC8:
str r0, [r1]
ldr r0, _0801BB24 @ =gBattleScripting
strb r5, [r0, 0x17]
- ldr r1, _0801BB28 @ =gUnknown_2022AB8
+ ldr r1, _0801BB28 @ =gBattleTextBuff1
movs r4, 0xFD
strb r4, [r1]
movs r0, 0x4
@@ -9410,7 +9410,7 @@ _0801BAC8:
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- ldr r1, _0801BB34 @ =gUnknown_2022AC8
+ ldr r1, _0801BB34 @ =gBattleTextBuff2
strb r4, [r1]
movs r0, 0x9
strb r0, [r1, 0x1]
@@ -9426,10 +9426,10 @@ _0801BB18: .4byte gUnknown_81D92A1
_0801BB1C: .4byte gStatuses3
_0801BB20: .4byte 0xffefffff
_0801BB24: .4byte gBattleScripting
-_0801BB28: .4byte gUnknown_2022AB8
+_0801BB28: .4byte gBattleTextBuff1
_0801BB2C: .4byte gActiveBattler
_0801BB30: .4byte gBattlerPartyIndexes
-_0801BB34: .4byte gUnknown_2022AC8
+_0801BB34: .4byte gBattleTextBuff2
_0801BB38: .4byte gLastUsedAbility
_0801BB3C:
mov r3, r8
@@ -9970,7 +9970,7 @@ _0801BFDC:
add r0, sp, 0x4
strb r1, [r0]
_0801BFE0:
- ldr r1, _0801C020 @ =gUnknown_2022AB8
+ ldr r1, _0801C020 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -9999,7 +9999,7 @@ _0801BFE0:
str r0, [sp, 0xC]
bl _0801C95A
.align 2, 0
-_0801C020: .4byte gUnknown_2022AB8
+_0801C020: .4byte gBattleTextBuff1
_0801C024: .4byte gUnknown_81D960C
_0801C028: .4byte gActiveBattler
_0801C02C:
@@ -10117,7 +10117,7 @@ _0801C112:
beq _0801C11A
bl _0801C952
_0801C11A:
- ldr r1, _0801C170 @ =gUnknown_2022AB8
+ ldr r1, _0801C170 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x8
@@ -10161,7 +10161,7 @@ _0801C14E:
_0801C16C:
b _0801C30C
.align 2, 0
-_0801C170: .4byte gUnknown_2022AB8
+_0801C170: .4byte gBattleTextBuff1
_0801C174: .4byte gBattleMoveDamage
_0801C178:
movs r0, 0x58
@@ -10180,7 +10180,7 @@ _0801C190:
beq _0801C198
bl _0801C952
_0801C198:
- ldr r1, _0801C1EC @ =gUnknown_2022AB8
+ ldr r1, _0801C1EC @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x8
@@ -10224,7 +10224,7 @@ _0801C1CC:
_0801C1EA:
b _0801C3A0
.align 2, 0
-_0801C1EC: .4byte gUnknown_2022AB8
+_0801C1EC: .4byte gBattleTextBuff1
_0801C1F0: .4byte gBattleMoveDamage
_0801C1F4:
movs r0, 0x58
@@ -10244,7 +10244,7 @@ _0801C20C:
beq _0801C212
b _0801C952
_0801C212:
- ldr r1, _0801C26C @ =gUnknown_2022AB8
+ ldr r1, _0801C26C @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x8
@@ -10289,7 +10289,7 @@ _0801C248:
bl BattleScriptExecute
b _0801C27E
.align 2, 0
-_0801C26C: .4byte gUnknown_2022AB8
+_0801C26C: .4byte gBattleTextBuff1
_0801C270: .4byte gBattleMoveDamage
_0801C274: .4byte gUnknown_81D964F
_0801C278:
@@ -10319,7 +10319,7 @@ _0801C2A0:
beq _0801C2A6
b _0801C952
_0801C2A6:
- ldr r1, _0801C300 @ =gUnknown_2022AB8
+ ldr r1, _0801C300 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x8
@@ -10365,7 +10365,7 @@ _0801C2F8:
bl BattleScriptExecute
b _0801C312
.align 2, 0
-_0801C300: .4byte gUnknown_2022AB8
+_0801C300: .4byte gBattleTextBuff1
_0801C304: .4byte gBattleMoveDamage
_0801C308: .4byte gUnknown_81D964F
_0801C30C:
@@ -10394,7 +10394,7 @@ _0801C332:
beq _0801C338
b _0801C952
_0801C338:
- ldr r1, _0801C394 @ =gUnknown_2022AB8
+ ldr r1, _0801C394 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x8
@@ -10440,7 +10440,7 @@ _0801C38A:
bl BattleScriptExecute
b _0801C3A6
.align 2, 0
-_0801C394: .4byte gUnknown_2022AB8
+_0801C394: .4byte gBattleTextBuff1
_0801C398: .4byte gBattleMoveDamage
_0801C39C: .4byte gUnknown_81D964F
_0801C3A0:
@@ -10475,7 +10475,7 @@ _0801C3CE:
ble _0801C3D8
b _0801C952
_0801C3D8:
- ldr r1, _0801C408 @ =gUnknown_2022AB8
+ ldr r1, _0801C408 @ =gBattleTextBuff1
movs r2, 0xFD
strb r2, [r1]
movs r0, 0x5
@@ -10484,7 +10484,7 @@ _0801C3D8:
strb r0, [r1, 0x2]
movs r0, 0xFF
strb r0, [r1, 0x3]
- ldr r1, _0801C40C @ =gUnknown_2022AC8
+ ldr r1, _0801C40C @ =gBattleTextBuff2
strb r2, [r1]
strb r6, [r1, 0x1]
movs r0, 0xD2
@@ -10500,8 +10500,8 @@ _0801C3D8:
movs r0, 0xF
b _0801C56C
.align 2, 0
-_0801C408: .4byte gUnknown_2022AB8
-_0801C40C: .4byte gUnknown_2022AC8
+_0801C408: .4byte gBattleTextBuff1
+_0801C40C: .4byte gBattleTextBuff2
_0801C410: .4byte gUnknown_2023D6E
_0801C414: .4byte gBattleScripting
_0801C418:
@@ -10527,7 +10527,7 @@ _0801C436:
ble _0801C440
b _0801C952
_0801C440:
- ldr r1, _0801C460 @ =gUnknown_2022AB8
+ ldr r1, _0801C460 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x5
@@ -10544,7 +10544,7 @@ _0801C440:
movs r0, 0x10
b _0801C506
.align 2, 0
-_0801C460: .4byte gUnknown_2022AB8
+_0801C460: .4byte gBattleTextBuff1
_0801C464: .4byte gUnknown_2023D6E
_0801C468: .4byte gBattleScripting
_0801C46C:
@@ -10570,7 +10570,7 @@ _0801C48A:
ble _0801C494
b _0801C952
_0801C494:
- ldr r1, _0801C4B4 @ =gUnknown_2022AB8
+ ldr r1, _0801C4B4 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x5
@@ -10587,7 +10587,7 @@ _0801C494:
movs r0, 0x11
b _0801C56C
.align 2, 0
-_0801C4B4: .4byte gUnknown_2022AB8
+_0801C4B4: .4byte gBattleTextBuff1
_0801C4B8: .4byte gUnknown_2023D6E
_0801C4BC: .4byte gBattleScripting
_0801C4C0:
@@ -10613,7 +10613,7 @@ _0801C4DE:
ble _0801C4E8
b _0801C952
_0801C4E8:
- ldr r1, _0801C518 @ =gUnknown_2022AB8
+ ldr r1, _0801C518 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x5
@@ -10637,7 +10637,7 @@ _0801C506:
str r2, [sp, 0xC]
b _0801C95A
.align 2, 0
-_0801C518: .4byte gUnknown_2022AB8
+_0801C518: .4byte gBattleTextBuff1
_0801C51C: .4byte gUnknown_2023D6E
_0801C520: .4byte gBattleScripting
_0801C524: .4byte gUnknown_81D9679
@@ -10664,7 +10664,7 @@ _0801C546:
ble _0801C550
b _0801C952
_0801C550:
- ldr r1, _0801C57C @ =gUnknown_2022AB8
+ ldr r1, _0801C57C @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x5
@@ -10687,7 +10687,7 @@ _0801C56C:
str r5, [sp, 0xC]
b _0801C95A
.align 2, 0
-_0801C57C: .4byte gUnknown_2022AB8
+_0801C57C: .4byte gBattleTextBuff1
_0801C580: .4byte gUnknown_2023D6E
_0801C584: .4byte gBattleScripting
_0801C588: .4byte gUnknown_81D9679
@@ -10799,7 +10799,7 @@ _0801C638:
asrs r0, 24
cmp r0, 0xC
beq _0801C638
- ldr r1, _0801C6AC @ =gUnknown_2022AB8
+ ldr r1, _0801C6AC @ =gBattleTextBuff1
movs r2, 0
movs r3, 0xFD
strb r3, [r1]
@@ -10810,7 +10810,7 @@ _0801C638:
strb r0, [r1, 0x2]
movs r0, 0xFF
strb r0, [r1, 0x3]
- ldr r0, _0801C6B0 @ =gUnknown_2022AC8
+ ldr r0, _0801C6B0 @ =gBattleTextBuff2
strb r3, [r0]
strb r2, [r0, 0x1]
movs r1, 0xD1
@@ -10838,8 +10838,8 @@ _0801C638:
b _0801C95A
.align 2, 0
_0801C6A8: .4byte gUnknown_2023BFC
-_0801C6AC: .4byte gUnknown_2022AB8
-_0801C6B0: .4byte gUnknown_2022AC8
+_0801C6AC: .4byte gBattleTextBuff1
+_0801C6B0: .4byte gBattleTextBuff2
_0801C6B4: .4byte gUnknown_2023D6E
_0801C6B8: .4byte gBattleScripting
_0801C6BC: .4byte gUnknown_81D9679
@@ -11025,7 +11025,7 @@ _0801C816:
ands r2, r0
cmp r2, 0
beq _0801C82E
- ldr r0, _0801C8BC @ =gUnknown_2022AB8
+ ldr r0, _0801C8BC @ =gBattleTextBuff1
ldr r1, _0801C8C0 @ =gUnknown_8250094
bl StringCopy
movs r0, 0x1
@@ -11044,7 +11044,7 @@ _0801C82E:
ldr r1, _0801C8C4 @ =0xf7ffffff
ands r0, r1
str r0, [r2]
- ldr r0, _0801C8BC @ =gUnknown_2022AB8
+ ldr r0, _0801C8BC @ =gBattleTextBuff1
ldr r1, _0801C8C8 @ =gUnknown_825009C
bl StringCopy
movs r2, 0x1
@@ -11055,7 +11055,7 @@ _0801C854:
ands r0, r1
cmp r0, 0
beq _0801C86A
- ldr r0, _0801C8BC @ =gUnknown_2022AB8
+ ldr r0, _0801C8BC @ =gBattleTextBuff1
ldr r1, _0801C8CC @ =gUnknown_82500A4
bl StringCopy
movs r3, 0x1
@@ -11066,7 +11066,7 @@ _0801C86A:
ands r0, r1
cmp r0, 0
beq _0801C880
- ldr r0, _0801C8BC @ =gUnknown_2022AB8
+ ldr r0, _0801C8BC @ =gBattleTextBuff1
ldr r1, _0801C8D0 @ =gUnknown_82500AC
bl StringCopy
movs r0, 0x1
@@ -11077,7 +11077,7 @@ _0801C880:
ands r0, r1
cmp r0, 0
beq _0801C896
- ldr r0, _0801C8BC @ =gUnknown_2022AB8
+ ldr r0, _0801C8BC @ =gBattleTextBuff1
ldr r1, _0801C8D4 @ =gUnknown_82500B4
bl StringCopy
movs r1, 0x1
@@ -11089,7 +11089,7 @@ _0801C896:
ands r0, r2
cmp r0, 0
beq _0801C8AE
- ldr r0, _0801C8BC @ =gUnknown_2022AB8
+ ldr r0, _0801C8BC @ =gBattleTextBuff1
ldr r1, _0801C8D8 @ =gUnknown_82500BC
bl StringCopy
movs r3, 0x1
@@ -11102,7 +11102,7 @@ _0801C8AE:
movs r0, 0
b _0801C8E4
.align 2, 0
-_0801C8BC: .4byte gUnknown_2022AB8
+_0801C8BC: .4byte gBattleTextBuff1
_0801C8C0: .4byte gUnknown_8250094
_0801C8C4: .4byte 0xf7ffffff
_0801C8C8: .4byte gUnknown_825009C
@@ -11157,7 +11157,7 @@ _0801C91C:
ldr r0, _0801C978 @ =0xfff0ffff
ands r2, r0
str r2, [r1]
- ldr r0, _0801C97C @ =gUnknown_2022AB8
+ ldr r0, _0801C97C @ =gBattleTextBuff1
ldr r1, _0801C980 @ =gUnknown_82500C4
bl StringCopy
ldr r0, _0801C984 @ =gUnknown_81D95BF
@@ -11189,7 +11189,7 @@ _0801C95A:
b _0801CFA6
.align 2, 0
_0801C978: .4byte 0xfff0ffff
-_0801C97C: .4byte gUnknown_2022AB8
+_0801C97C: .4byte gBattleTextBuff1
_0801C980: .4byte gUnknown_82500C4
_0801C984: .4byte gUnknown_81D95BF
_0801C988: .4byte gUnknown_2023E82
@@ -11517,7 +11517,7 @@ _0801CC5C:
ldr r0, _0801CC84 @ =0xfff0ffff
ands r1, r0
str r1, [r2]
- ldr r0, _0801CC88 @ =gUnknown_2022AB8
+ ldr r0, _0801CC88 @ =gBattleTextBuff1
ldr r1, _0801CC8C @ =gUnknown_82500C4
bl StringCopy
bl BattleScriptPushCursor
@@ -11533,7 +11533,7 @@ _0801CC5C:
.align 2, 0
_0801CC80: .4byte gBattleMons
_0801CC84: .4byte 0xfff0ffff
-_0801CC88: .4byte gUnknown_2022AB8
+_0801CC88: .4byte gBattleTextBuff1
_0801CC8C: .4byte gUnknown_82500C4
_0801CC90: .4byte gUnknown_2023E82
_0801CC94: .4byte gUnknown_2023D74
@@ -11564,7 +11564,7 @@ _0801CCC4:
ands r2, r0
cmp r2, 0
beq _0801CCD4
- ldr r0, _0801CD64 @ =gUnknown_2022AB8
+ ldr r0, _0801CD64 @ =gBattleTextBuff1
ldr r1, _0801CD68 @ =gUnknown_8250094
bl StringCopy
_0801CCD4:
@@ -11580,7 +11580,7 @@ _0801CCD4:
ldr r1, _0801CD6C @ =0xf7ffffff
ands r0, r1
str r0, [r2]
- ldr r0, _0801CD64 @ =gUnknown_2022AB8
+ ldr r0, _0801CD64 @ =gBattleTextBuff1
ldr r1, _0801CD70 @ =gUnknown_825009C
bl StringCopy
_0801CCF4:
@@ -11589,7 +11589,7 @@ _0801CCF4:
ands r0, r1
cmp r0, 0
beq _0801CD06
- ldr r0, _0801CD64 @ =gUnknown_2022AB8
+ ldr r0, _0801CD64 @ =gBattleTextBuff1
ldr r1, _0801CD74 @ =gUnknown_82500A4
bl StringCopy
_0801CD06:
@@ -11598,7 +11598,7 @@ _0801CD06:
ands r0, r1
cmp r0, 0
beq _0801CD18
- ldr r0, _0801CD64 @ =gUnknown_2022AB8
+ ldr r0, _0801CD64 @ =gBattleTextBuff1
ldr r1, _0801CD78 @ =gUnknown_82500AC
bl StringCopy
_0801CD18:
@@ -11607,7 +11607,7 @@ _0801CD18:
ands r0, r1
cmp r0, 0
beq _0801CD2A
- ldr r0, _0801CD64 @ =gUnknown_2022AB8
+ ldr r0, _0801CD64 @ =gBattleTextBuff1
ldr r1, _0801CD7C @ =gUnknown_82500B4
bl StringCopy
_0801CD2A:
@@ -11617,7 +11617,7 @@ _0801CD2A:
ands r0, r3
cmp r0, 0
beq _0801CD3E
- ldr r0, _0801CD64 @ =gUnknown_2022AB8
+ ldr r0, _0801CD64 @ =gBattleTextBuff1
ldr r1, _0801CD80 @ =gUnknown_82500BC
bl StringCopy
_0801CD3E:
@@ -11640,7 +11640,7 @@ _0801CD58:
b _0801CDF6
.align 2, 0
_0801CD60: .4byte gBattleMons
-_0801CD64: .4byte gUnknown_2022AB8
+_0801CD64: .4byte gBattleTextBuff1
_0801CD68: .4byte gUnknown_8250094
_0801CD6C: .4byte 0xf7ffffff
_0801CD70: .4byte gUnknown_825009C
diff --git a/asm/daycare.s b/asm/daycare.s
index 88e4a235f..7479ef544 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -766,7 +766,7 @@ sub_8045970: @ 8045970
lsrs r2, r0, 16
movs r0, 0
mov r8, r0
- ldr r0, _0804599C @ =gUnknown_8259754
+ ldr r0, _0804599C @ =gEvolutionTable
mov r12, r0
_08045982:
movs r7, 0
@@ -784,7 +784,7 @@ _08045990:
lsrs r2, r4, 16
b _080459CC
.align 2, 0
-_0804599C: .4byte gUnknown_8259754
+_0804599C: .4byte gEvolutionTable
_080459A0:
adds r1, 0x1
cmp r1, 0x4
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index ed01b9e63..4ee374bed 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -1133,7 +1133,7 @@ CreateShedinja: @ 80CE748
str r0, [sp, 0x8]
add r0, r10
lsls r7, r0, 3
- ldr r1, _080CE8C4 @ =gUnknown_8259754
+ ldr r1, _080CE8C4 @ =gEvolutionTable
adds r1, r7
mov r8, r1
ldrh r0, [r1]
@@ -1158,7 +1158,7 @@ _080CE782:
ldrb r0, [r6]
muls r0, r5
adds r0, r4
- ldr r1, _080CE8C4 @ =gUnknown_8259754
+ ldr r1, _080CE8C4 @ =gEvolutionTable
adds r2, r1, r7
adds r2, 0xC
movs r1, 0xB
@@ -1242,7 +1242,7 @@ _080CE80C:
adds r0, r5
bl CalculateMonStats
bl CalculatePlayerPartyCount
- ldr r0, _080CE8C4 @ =gUnknown_8259754
+ ldr r0, _080CE8C4 @ =gEvolutionTable
mov r4, r8
add r4, r10
lsls r4, 3
@@ -1291,7 +1291,7 @@ _080CE8B2:
pop {r0}
bx r0
.align 2, 0
-_080CE8C4: .4byte gUnknown_8259754
+_080CE8C4: .4byte gEvolutionTable
_080CE8C8: .4byte gPlayerPartyCount
_080CE8CC: .4byte gPlayerParty
_080CE8D0: .4byte gSpeciesNames
@@ -1881,7 +1881,7 @@ _080CEDC6:
movs r1, 0x2
add r2, sp, 0x4
bl GetMonData
- ldr r0, _080CEE24 @ =gUnknown_2022AB8
+ ldr r0, _080CEE24 @ =gBattleTextBuff1
add r1, sp, 0x4
bl StringCopy10
ldr r0, _080CEE28 @ =0x0000ffff
@@ -1892,7 +1892,7 @@ _080CEDC6:
b _080CF528
.align 2, 0
_080CEE20: .4byte gTasks
-_080CEE24: .4byte gUnknown_2022AB8
+_080CEE24: .4byte gBattleTextBuff1
_080CEE28: .4byte 0x0000ffff
_080CEE2C:
ldr r0, _080CEE3C @ =0x0000fffe
@@ -2088,7 +2088,7 @@ _080CEFB6:
ldr r0, _080CEFEC @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CEFF0 @ =gUnknown_202298C
+ ldr r0, _080CEFF0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CEFF4 @ =gTasks
@@ -2106,7 +2106,7 @@ _080CEFDE:
.align 2, 0
_080CEFE8: .4byte 0x00000101
_080CEFEC: .4byte gUnknown_83FDF3C
-_080CEFF0: .4byte gUnknown_202298C
+_080CEFF0: .4byte gDisplayedStringBattle
_080CEFF4: .4byte gTasks
_080CEFF8:
movs r0, 0
@@ -2191,7 +2191,7 @@ _080CF0A2:
ldr r0, _080CF0C8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF0CC @ =gUnknown_202298C
+ ldr r0, _080CF0CC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF0D0 @ =gTasks
@@ -2204,7 +2204,7 @@ _080CF0A2:
b _080CF526
.align 2, 0
_080CF0C8: .4byte gUnknown_83FDF3C
-_080CF0CC: .4byte gUnknown_202298C
+_080CF0CC: .4byte gDisplayedStringBattle
_080CF0D0: .4byte gTasks
_080CF0D4:
movs r0, 0
@@ -2223,7 +2223,7 @@ _080CF0EE:
ldr r0, _080CF110 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x14]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF114 @ =gUnknown_202298C
+ ldr r0, _080CF114 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF118 @ =gTasks
@@ -2236,7 +2236,7 @@ _080CF0EE:
b _080CF526
.align 2, 0
_080CF110: .4byte gUnknown_83FDF3C
-_080CF114: .4byte gUnknown_202298C
+_080CF114: .4byte gDisplayedStringBattle
_080CF118: .4byte gTasks
_080CF11C:
movs r0, 0
@@ -2251,7 +2251,7 @@ _080CF11C:
ldr r0, _080CF1A8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x18]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF1AC @ =gUnknown_202298C
+ ldr r0, _080CF1AC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF1B0 @ =gTasks
@@ -2305,7 +2305,7 @@ _080CF176:
b _080CF528
.align 2, 0
_080CF1A8: .4byte gUnknown_83FDF3C
-_080CF1AC: .4byte gUnknown_202298C
+_080CF1AC: .4byte gDisplayedStringBattle
_080CF1B0: .4byte gTasks
_080CF1B4: .4byte gUnknown_83FE791
_080CF1B8: .4byte gUnknown_2023E82
@@ -2508,7 +2508,7 @@ _080CF34C:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF390 @ =gUnknown_202298C
+ ldr r0, _080CF390 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF394 @ =gTasks
@@ -2522,10 +2522,10 @@ _080CF34C:
.align 2, 0
_080CF388: .4byte gUnknown_83FDF3C
_080CF38C: .4byte 0x000004cc
-_080CF390: .4byte gUnknown_202298C
+_080CF390: .4byte gDisplayedStringBattle
_080CF394: .4byte gTasks
_080CF398:
- ldr r1, _080CF3D4 @ =gUnknown_2022AC8
+ ldr r1, _080CF3D4 @ =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -2554,7 +2554,7 @@ _080CF398:
adds r0, 0x1
b _080CF526
.align 2, 0
-_080CF3D4: .4byte gUnknown_2022AC8
+_080CF3D4: .4byte gBattleTextBuff2
_080CF3D8: .4byte gMoveToLearn
_080CF3DC: .4byte gTasks
_080CF3E0:
@@ -2564,7 +2564,7 @@ _080CF3E0:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF40C @ =gUnknown_202298C
+ ldr r0, _080CF40C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF410 @ =gTasks
@@ -2577,7 +2577,7 @@ _080CF3E0:
b _080CF526
.align 2, 0
_080CF408: .4byte gUnknown_83FDF3C
-_080CF40C: .4byte gUnknown_202298C
+_080CF40C: .4byte gDisplayedStringBattle
_080CF410: .4byte gTasks
_080CF414:
movs r0, 0
@@ -2596,7 +2596,7 @@ _080CF42E:
ldr r0, _080CF450 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x1C]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF454 @ =gUnknown_202298C
+ ldr r0, _080CF454 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r0, _080CF458 @ =gTasks
@@ -2609,7 +2609,7 @@ _080CF42E:
b _080CF526
.align 2, 0
_080CF450: .4byte gUnknown_83FDF3C
-_080CF454: .4byte gUnknown_202298C
+_080CF454: .4byte gDisplayedStringBattle
_080CF458: .4byte gTasks
_080CF45C:
movs r0, 0
@@ -2627,7 +2627,7 @@ _080CF45C:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF49C @ =gUnknown_202298C
+ ldr r0, _080CF49C @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF4A0 @ =gTasks
@@ -2640,13 +2640,13 @@ _080CF45C:
b _080CF528
.align 2, 0
_080CF498: .4byte gUnknown_83FDF3C
-_080CF49C: .4byte gUnknown_202298C
+_080CF49C: .4byte gDisplayedStringBattle
_080CF4A0: .4byte gTasks
_080CF4A4:
ldr r0, _080CF4CC @ =gUnknown_83FDF3C
ldr r0, [r0, 0x20]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF4D0 @ =gUnknown_202298C
+ ldr r0, _080CF4D0 @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF4D4 @ =gTasks
@@ -2663,13 +2663,13 @@ _080CF4A4:
b _080CF528
.align 2, 0
_080CF4CC: .4byte gUnknown_83FDF3C
-_080CF4D0: .4byte gUnknown_202298C
+_080CF4D0: .4byte gDisplayedStringBattle
_080CF4D4: .4byte gTasks
_080CF4D8:
ldr r0, _080CF4F8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x24]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r0, _080CF4FC @ =gUnknown_202298C
+ ldr r0, _080CF4FC @ =gDisplayedStringBattle
movs r1, 0
bl sub_80D87BC
ldr r1, _080CF500 @ =gTasks
@@ -2683,7 +2683,7 @@ _080CF4F2:
b _080CF528
.align 2, 0
_080CF4F8: .4byte gUnknown_83FDF3C
-_080CF4FC: .4byte gUnknown_202298C
+_080CF4FC: .4byte gDisplayedStringBattle
_080CF500: .4byte gTasks
_080CF504:
movs r0, 0
@@ -3191,7 +3191,7 @@ _080CF940:
movs r1, 0x2
add r2, sp, 0xC
bl GetMonData
- ldr r0, _080CF990 @ =gUnknown_2022AB8
+ ldr r0, _080CF990 @ =gBattleTextBuff1
add r1, sp, 0xC
bl StringCopy10
ldr r0, _080CF994 @ =0x0000ffff
@@ -3202,7 +3202,7 @@ _080CF940:
b _080D003A
.align 2, 0
_080CF98C: .4byte gTasks
-_080CF990: .4byte gUnknown_2022AB8
+_080CF990: .4byte gBattleTextBuff1
_080CF994: .4byte 0x0000ffff
_080CF998:
ldr r0, _080CF9A8 @ =0x0000fffe
@@ -3373,7 +3373,7 @@ _080CFAF2:
ldr r0, _080CFB28 @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFB2C @ =gUnknown_202298C
+ ldr r1, _080CFB2C @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3391,7 +3391,7 @@ _080CFB1A:
.align 2, 0
_080CFB24: .4byte 0x00000101
_080CFB28: .4byte gUnknown_83FDF3C
-_080CFB2C: .4byte gUnknown_202298C
+_080CFB2C: .4byte gDisplayedStringBattle
_080CFB30: .4byte gTasks
_080CFB34:
movs r0, 0
@@ -3474,7 +3474,7 @@ _080CFBDA:
ldr r0, _080CFC00 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFC04 @ =gUnknown_202298C
+ ldr r1, _080CFC04 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3487,7 +3487,7 @@ _080CFBDA:
b _080D0038
.align 2, 0
_080CFC00: .4byte gUnknown_83FDF3C
-_080CFC04: .4byte gUnknown_202298C
+_080CFC04: .4byte gDisplayedStringBattle
_080CFC08: .4byte gTasks
_080CFC0C:
movs r0, 0
@@ -3506,7 +3506,7 @@ _080CFC26:
ldr r0, _080CFC48 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x14]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFC4C @ =gUnknown_202298C
+ ldr r1, _080CFC4C @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3519,7 +3519,7 @@ _080CFC26:
b _080D0038
.align 2, 0
_080CFC48: .4byte gUnknown_83FDF3C
-_080CFC4C: .4byte gUnknown_202298C
+_080CFC4C: .4byte gDisplayedStringBattle
_080CFC50: .4byte gTasks
_080CFC54:
movs r0, 0
@@ -3534,7 +3534,7 @@ _080CFC54:
ldr r0, _080CFCE8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x18]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFCEC @ =gUnknown_202298C
+ ldr r1, _080CFCEC @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3592,7 +3592,7 @@ _080CFCAE:
b _080D003A
.align 2, 0
_080CFCE8: .4byte gUnknown_83FDF3C
-_080CFCEC: .4byte gUnknown_202298C
+_080CFCEC: .4byte gDisplayedStringBattle
_080CFCF0: .4byte gTasks
_080CFCF4: .4byte gUnknown_826D1CC
_080CFCF8: .4byte gUnknown_2023E82
@@ -3622,7 +3622,7 @@ _080CFD1C:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFD68 @ =gUnknown_202298C
+ ldr r1, _080CFD68 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3650,7 +3650,7 @@ _080CFD56:
.align 2, 0
_080CFD60: .4byte gUnknown_2023E82
_080CFD64: .4byte gUnknown_83FDF3C
-_080CFD68: .4byte gUnknown_202298C
+_080CFD68: .4byte gDisplayedStringBattle
_080CFD6C: .4byte gTasks
_080CFD70:
ldr r1, _080CFD9C @ =gUnknown_2023E82
@@ -3662,7 +3662,7 @@ _080CFD70:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFDA4 @ =gUnknown_202298C
+ ldr r1, _080CFDA4 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3676,7 +3676,7 @@ _080CFD70:
.align 2, 0
_080CFD9C: .4byte gUnknown_2023E82
_080CFDA0: .4byte gUnknown_83FDF3C
-_080CFDA4: .4byte gUnknown_202298C
+_080CFDA4: .4byte gDisplayedStringBattle
_080CFDA8: .4byte gTasks
_080CFDAC:
ldr r0, _080CFE14 @ =gUnknown_2037AB8
@@ -3779,7 +3779,7 @@ _080CFE74:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFEB8 @ =gUnknown_202298C
+ ldr r1, _080CFEB8 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3793,10 +3793,10 @@ _080CFE74:
.align 2, 0
_080CFEB0: .4byte gUnknown_83FDF3C
_080CFEB4: .4byte 0x000004cc
-_080CFEB8: .4byte gUnknown_202298C
+_080CFEB8: .4byte gDisplayedStringBattle
_080CFEBC: .4byte gTasks
_080CFEC0:
- ldr r1, _080CFF14 @ =gUnknown_2022AC8
+ ldr r1, _080CFF14 @ =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r1]
movs r0, 0x2
@@ -3822,7 +3822,7 @@ _080CFEC0:
adds r0, r1
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFF20 @ =gUnknown_202298C
+ ldr r1, _080CFF20 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3834,10 +3834,10 @@ _080CFEC0:
adds r0, 0x1
b _080D0038
.align 2, 0
-_080CFF14: .4byte gUnknown_2022AC8
+_080CFF14: .4byte gBattleTextBuff2
_080CFF18: .4byte gMoveToLearn
_080CFF1C: .4byte gUnknown_83FDF3C
-_080CFF20: .4byte gUnknown_202298C
+_080CFF20: .4byte gDisplayedStringBattle
_080CFF24: .4byte gTasks
_080CFF28:
movs r0, 0
@@ -3856,7 +3856,7 @@ _080CFF42:
ldr r0, _080CFF64 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x1C]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFF68 @ =gUnknown_202298C
+ ldr r1, _080CFF68 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3869,7 +3869,7 @@ _080CFF42:
b _080D0038
.align 2, 0
_080CFF64: .4byte gUnknown_83FDF3C
-_080CFF68: .4byte gUnknown_202298C
+_080CFF68: .4byte gDisplayedStringBattle
_080CFF6C: .4byte gTasks
_080CFF70:
movs r0, 0
@@ -3887,7 +3887,7 @@ _080CFF70:
adds r0, r3
ldr r0, [r0]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFFB0 @ =gUnknown_202298C
+ ldr r1, _080CFFB0 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3900,13 +3900,13 @@ _080CFF70:
b _080D003A
.align 2, 0
_080CFFAC: .4byte gUnknown_83FDF3C
-_080CFFB0: .4byte gUnknown_202298C
+_080CFFB0: .4byte gDisplayedStringBattle
_080CFFB4: .4byte gTasks
_080CFFB8:
ldr r0, _080CFFE0 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x20]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080CFFE4 @ =gUnknown_202298C
+ ldr r1, _080CFFE4 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3923,13 +3923,13 @@ _080CFFB8:
b _080D003A
.align 2, 0
_080CFFE0: .4byte gUnknown_83FDF3C
-_080CFFE4: .4byte gUnknown_202298C
+_080CFFE4: .4byte gDisplayedStringBattle
_080CFFE8: .4byte gTasks
_080CFFEC:
ldr r0, _080D000C @ =gUnknown_83FDF3C
ldr r0, [r0, 0x24]
bl BattleStringExpandPlaceholdersToDisplayedString
- ldr r1, _080D0010 @ =gUnknown_202298C
+ ldr r1, _080D0010 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
@@ -3943,7 +3943,7 @@ _080D0006:
b _080D003A
.align 2, 0
_080D000C: .4byte gUnknown_83FDF3C
-_080D0010: .4byte gUnknown_202298C
+_080D0010: .4byte gDisplayedStringBattle
_080D0014: .4byte gTasks
_080D0018:
movs r0, 0
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index 6df2e64ad..a7b2e3a4c 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -5,996 +5,6 @@
.text
- thumb_func_start sub_8042BE8
-sub_8042BE8: @ 8042BE8
- push {r4,lr}
- adds r4, r2, 0
- movs r1, 0x37
- movs r2, 0
- bl GetMonData
- ands r0, r4
- cmp r0, 0
- bne _08042BFE
- movs r0, 0
- b _08042C00
-_08042BFE:
- movs r0, 0x1
-_08042C00:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8042BE8
-
- thumb_func_start GetItemEffectParamOffset
-GetItemEffectParamOffset: @ 8042C08
- push {r4-r7,lr}
- lsls r0, 16
- lsrs r3, r0, 16
- lsls r1, 24
- lsrs r4, r1, 24
- lsls r2, 24
- lsrs r5, r2, 24
- movs r7, 0x6
- ldr r1, _08042C30 @ =gItemEffectTable
- adds r0, r3, 0
- subs r0, 0xD
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- cmp r0, 0
- bne _08042C34
- cmp r3, 0xAF
- beq _08042C38
-_08042C2C:
- movs r0, 0
- b _08042D48
- .align 2, 0
-_08042C30: .4byte gItemEffectTable
-_08042C34:
- cmp r3, 0xAF
- bne _08042C46
-_08042C38:
- ldr r0, _08042C58 @ =gActiveBattler
- ldrb r1, [r0]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- ldr r1, _08042C5C @ =gEnigmaBerries+0x8
- adds r0, r1
-_08042C46:
- mov r12, r0
- movs r2, 0
-_08042C4A:
- cmp r2, 0x4
- beq _08042C6A
- cmp r2, 0x4
- ble _08042C60
- cmp r2, 0x5
- beq _08042CF4
- b _08042D3E
- .align 2, 0
-_08042C58: .4byte gActiveBattler
-_08042C5C: .4byte gEnigmaBerries+0x8
-_08042C60:
- cmp r2, 0
- blt _08042D3E
- cmp r2, r4
- bne _08042D3E
- b _08042C2C
-_08042C6A:
- mov r0, r12
- ldrb r3, [r0, 0x4]
- movs r0, 0x20
- ands r0, r3
- cmp r0, 0
- beq _08042C7A
- movs r0, 0xDF
- ands r3, r0
-_08042C7A:
- movs r6, 0
- cmp r3, 0
- beq _08042D3E
-_08042C80:
- movs r0, 0x1
- ands r0, r3
- cmp r0, 0
- beq _08042CE0
- cmp r6, 0x7
- bhi _08042CE0
- lsls r0, r6, 2
- ldr r1, _08042C98 @ =_08042C9C
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_08042C98: .4byte _08042C9C
- .align 2, 0
-_08042C9C:
- .4byte _08042CC8
- .4byte _08042CC8
- .4byte _08042CBC
- .4byte _08042CC8
- .4byte _08042CE0
- .4byte _08042CE0
- .4byte _08042CE0
- .4byte _08042CDC
-_08042CBC:
- movs r0, 0x10
- ands r0, r3
- cmp r0, 0
- beq _08042CC8
- movs r0, 0xEF
- ands r3, r0
-_08042CC8:
- cmp r2, r4
- bne _08042CD4
- adds r0, r3, 0
- ands r0, r5
- cmp r0, 0
- bne _08042D46
-_08042CD4:
- adds r0, r7, 0x1
- lsls r0, 24
- lsrs r7, r0, 24
- b _08042CE0
-_08042CDC:
- cmp r2, r4
- beq _08042C2C
-_08042CE0:
- adds r0, r6, 0x1
- lsls r0, 24
- lsrs r6, r0, 24
- lsrs r3, 1
- cmp r2, r4
- bne _08042CEE
- lsrs r5, 1
-_08042CEE:
- cmp r3, 0
- bne _08042C80
- b _08042D3E
-_08042CF4:
- mov r0, r12
- ldrb r3, [r0, 0x5]
- movs r6, 0
-_08042CFA:
- cmp r3, 0
- beq _08042D3E
- movs r0, 0x1
- ands r0, r3
- cmp r0, 0
- beq _08042D2E
- cmp r6, 0
- blt _08042D2E
- cmp r6, 0x6
- ble _08042D14
- cmp r6, 0x7
- beq _08042D28
- b _08042D2E
-_08042D14:
- cmp r2, r4
- bne _08042D20
- adds r0, r3, 0
- ands r0, r5
- cmp r0, 0
- bne _08042D46
-_08042D20:
- adds r0, r7, 0x1
- lsls r0, 24
- lsrs r7, r0, 24
- b _08042D2E
-_08042D28:
- cmp r2, r4
- bne _08042D2E
- b _08042C2C
-_08042D2E:
- adds r0, r6, 0x1
- lsls r0, 24
- lsrs r6, r0, 24
- lsrs r3, 1
- cmp r2, r4
- bne _08042CFA
- lsrs r5, 1
- b _08042CFA
-_08042D3E:
- adds r2, 0x1
- cmp r2, 0x5
- bgt _08042D46
- b _08042C4A
-_08042D46:
- adds r0, r7, 0
-_08042D48:
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end GetItemEffectParamOffset
-
- thumb_func_start sub_8042D50
-sub_8042D50: @ 8042D50
- push {lr}
- ldr r2, _08042D84 @ =gBattlerTarget
- ldr r1, _08042D88 @ =gBattlerInMenuId
- ldrb r1, [r1]
- strb r1, [r2]
- ldr r3, _08042D8C @ =gUnknown_2022AB8
- ldr r2, _08042D90 @ =gUnknown_83FD5D0
- ldr r1, _08042D94 @ =gUnknown_825DFF0
- adds r0, r1
- ldrb r0, [r0]
- lsls r0, 2
- adds r0, r2
- ldr r1, [r0]
- adds r0, r3, 0
- bl StringCopy
- ldr r0, _08042D98 @ =gUnknown_2022AC8
- ldr r1, _08042D9C @ =gUnknown_83FCB4A
- bl StringCopy
- ldr r0, _08042DA0 @ =gUnknown_83FCB6A
- bl BattleStringExpandPlaceholdersToDisplayedString
- pop {r0}
- bx r0
- .align 2, 0
-_08042D84: .4byte gBattlerTarget
-_08042D88: .4byte gBattlerInMenuId
-_08042D8C: .4byte gUnknown_2022AB8
-_08042D90: .4byte gUnknown_83FD5D0
-_08042D94: .4byte gUnknown_825DFF0
-_08042D98: .4byte gUnknown_2022AC8
-_08042D9C: .4byte gUnknown_83FCB4A
-_08042DA0: .4byte gUnknown_83FCB6A
- thumb_func_end sub_8042D50
-
- thumb_func_start sub_8042DA4
-sub_8042DA4: @ 8042DA4
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- lsls r0, 16
- lsrs r0, 16
- cmp r0, 0xAF
- bne _08042DF8
- ldr r0, _08042DD4 @ =gMain
- ldr r1, _08042DD8 @ =0x00000439
- adds r0, r1
- ldrb r1, [r0]
- movs r0, 0x2
- ands r0, r1
- cmp r0, 0
- beq _08042DE4
- ldr r2, _08042DDC @ =gBattlerInMenuId
- ldrb r1, [r2]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- ldr r1, _08042DE0 @ =gEnigmaBerries+0x8
- adds r7, r0, r1
- b _08042E04
- .align 2, 0
-_08042DD4: .4byte gMain
-_08042DD8: .4byte 0x00000439
-_08042DDC: .4byte gBattlerInMenuId
-_08042DE0: .4byte gEnigmaBerries+0x8
-_08042DE4:
- ldr r0, _08042DF0 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- ldr r1, _08042DF4 @ =0x00003108
- adds r7, r0, r1
- b _08042E02
- .align 2, 0
-_08042DF0: .4byte gSaveBlock1Ptr
-_08042DF4: .4byte 0x00003108
-_08042DF8:
- ldr r1, _08042E3C @ =gItemEffectTable
- subs r0, 0xD
- lsls r0, 2
- adds r0, r1
- ldr r7, [r0]
-_08042E02:
- ldr r2, _08042E40 @ =gBattlerInMenuId
-_08042E04:
- ldr r1, _08042E44 @ =gPotentialItemEffectBattler
- ldrb r0, [r2]
- strb r0, [r1]
- movs r5, 0
- ldr r0, _08042E48 @ =sBattler_AI
- mov r8, r0
- movs r6, 0
-_08042E12:
- adds r4, r7, r5
- ldrb r1, [r4]
- movs r0, 0xF
- ands r0, r1
- cmp r0, 0
- beq _08042E24
- adds r0, r6, 0
- bl sub_8042D50
-_08042E24:
- ldrb r1, [r4]
- movs r0, 0xF0
- ands r0, r1
- cmp r0, 0
- beq _08042E5A
- cmp r5, 0
- beq _08042E4C
- adds r0, r6, 0x1
- bl sub_8042D50
- b _08042E5A
- .align 2, 0
-_08042E3C: .4byte gItemEffectTable
-_08042E40: .4byte gBattlerInMenuId
-_08042E44: .4byte gPotentialItemEffectBattler
-_08042E48: .4byte sBattler_AI
-_08042E4C:
- ldr r0, _08042E88 @ =gBattlerInMenuId
- ldrb r0, [r0]
- mov r1, r8
- strb r0, [r1]
- ldr r0, _08042E8C @ =gUnknown_83FBBE9
- bl BattleStringExpandPlaceholdersToDisplayedString
-_08042E5A:
- adds r6, 0x2
- adds r5, 0x1
- cmp r5, 0x2
- ble _08042E12
- ldrb r1, [r7, 0x3]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _08042E7A
- ldr r1, _08042E90 @ =sBattler_AI
- ldr r0, _08042E88 @ =gBattlerInMenuId
- ldrb r0, [r0]
- strb r0, [r1]
- ldr r0, _08042E94 @ =gUnknown_83FBBB4
- bl BattleStringExpandPlaceholdersToDisplayedString
-_08042E7A:
- ldr r0, _08042E98 @ =gUnknown_202298C
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_08042E88: .4byte gBattlerInMenuId
-_08042E8C: .4byte gUnknown_83FBBE9
-_08042E90: .4byte sBattler_AI
-_08042E94: .4byte gUnknown_83FBBB4
-_08042E98: .4byte gUnknown_202298C
- thumb_func_end sub_8042DA4
-
- thumb_func_start GetNature
-GetNature: @ 8042E9C
- push {lr}
- movs r1, 0
- movs r2, 0
- bl GetMonData
- movs r1, 0x19
- bl __umodsi3
- lsls r0, 24
- lsrs r0, 24
- pop {r1}
- bx r1
- thumb_func_end GetNature
-
- thumb_func_start GetNatureFromPersonality
-GetNatureFromPersonality: @ 8042EB4
- push {lr}
- movs r1, 0x19
- bl __umodsi3
- lsls r0, 24
- lsrs r0, 24
- pop {r1}
- bx r1
- thumb_func_end GetNatureFromPersonality
-
- thumb_func_start GetEvolutionTargetSpecies
-GetEvolutionTargetSpecies: @ 8042EC4
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- sub sp, 0x14
- mov r8, r0
- lsls r1, 24
- lsrs r5, r1, 24
- lsls r2, 16
- lsrs r2, 16
- mov r9, r2
- movs r0, 0
- mov r10, r0
- mov r0, r8
- movs r1, 0xB
- movs r2, 0
- bl GetMonData
- lsls r0, 16
- lsrs r7, r0, 16
- mov r0, r8
- movs r1, 0xC
- movs r2, 0
- bl GetMonData
- mov r1, sp
- strh r0, [r1]
- mov r0, r8
- movs r1, 0
- movs r2, 0
- bl GetMonData
- adds r4, r0, 0
- mov r0, r8
- movs r1, 0x17
- movs r2, 0
- bl GetMonData
- lsls r0, 24
- lsrs r0, 24
- str r0, [sp, 0xC]
- lsrs r4, 16
- str r4, [sp, 0x10]
- mov r0, sp
- ldrh r0, [r0]
- cmp r0, 0xAF
- bne _08042F38
- ldr r0, _08042F30 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- ldr r1, _08042F34 @ =0x0000311a
- adds r0, r1
- ldrb r0, [r0]
- b _08042F40
- .align 2, 0
-_08042F30: .4byte gSaveBlock1Ptr
-_08042F34: .4byte 0x0000311a
-_08042F38:
- bl ItemId_GetHoldEffect
- lsls r0, 24
- lsrs r0, 24
-_08042F40:
- cmp r0, 0x26
- bne _08042F4C
- cmp r5, 0x3
- beq _08042F4C
- movs r0, 0
- b _080431A4
-_08042F4C:
- cmp r5, 0x1
- bne _08042F52
- b _0804311E
-_08042F52:
- cmp r5, 0x1
- bgt _08042F5C
- cmp r5, 0
- beq _08042F70
- b _080431A2
-_08042F5C:
- cmp r5, 0x3
- ble _08042F62
- b _080431A2
-_08042F62:
- movs r2, 0
- str r2, [sp, 0x4]
- ldr r3, _08042F6C @ =gUnknown_8259754
- lsls r6, r7, 2
- b _08043182
- .align 2, 0
-_08042F6C: .4byte gUnknown_8259754
-_08042F70:
- mov r0, r8
- movs r1, 0x38
- movs r2, 0
- bl GetMonData
- lsls r0, 24
- lsrs r0, 24
- mov r9, r0
- mov r0, r8
- movs r1, 0x20
- movs r2, 0
- bl GetMonData
- lsls r0, 16
- lsrs r0, 16
- str r0, [sp, 0x8]
- movs r0, 0
- str r0, [sp, 0x4]
- lsls r6, r7, 2
-_08042F96:
- ldr r1, _08042FBC @ =gUnknown_8259754
- ldr r0, [sp, 0x4]
- lsls r2, r0, 3
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r0, r1
- ldrh r0, [r0]
- subs r0, 0x1
- adds r3, r1, 0
- cmp r0, 0xE
- bls _08042FB0
- b _08043110
-_08042FB0:
- lsls r0, 2
- ldr r1, _08042FC0 @ =_08042FC4
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_08042FBC: .4byte gUnknown_8259754
-_08042FC0: .4byte _08042FC4
- .align 2, 0
-_08042FC4:
- .4byte _08043000
- .4byte _08043110
- .4byte _08043110
- .4byte _08043016
- .4byte _08043110
- .4byte _08043110
- .4byte _08043110
- .4byte _08043026
- .4byte _08043050
- .4byte _0804307A
- .4byte _080430A8
- .4byte _080430C8
- .4byte _080430EC
- .4byte _08043110
- .4byte _080430FC
-_08043000:
- ldr r1, [sp, 0x8]
- cmp r1, 0xDB
- bhi _08043008
- b _08043110
-_08043008:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r0, r3
- ldrh r0, [r0, 0x4]
- mov r10, r0
- b _08043110
-_08043016:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r1, r0, r3
- ldrh r0, [r1, 0x2]
- cmp r0, r9
- bhi _08043110
- b _0804310C
-_08043026:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r5, r0, r3
- ldrh r0, [r5, 0x2]
- cmp r0, r9
- bhi _08043110
- mov r0, r8
- movs r1, 0x3B
- movs r2, 0
- bl GetMonData
- adds r4, r0, 0
- mov r0, r8
- movs r1, 0x3C
- movs r2, 0
- bl GetMonData
- cmp r4, r0
- bls _08043110
- b _080430A2
-_08043050:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r5, r0, r3
- ldrh r0, [r5, 0x2]
- cmp r0, r9
- bhi _08043110
- mov r0, r8
- movs r1, 0x3B
- movs r2, 0
- bl GetMonData
- adds r4, r0, 0
- mov r0, r8
- movs r1, 0x3C
- movs r2, 0
- bl GetMonData
- cmp r4, r0
- bne _08043110
- b _080430A2
-_0804307A:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r5, r0, r3
- ldrh r0, [r5, 0x2]
- cmp r0, r9
- bhi _08043110
- mov r0, r8
- movs r1, 0x3B
- movs r2, 0
- bl GetMonData
- adds r4, r0, 0
- mov r0, r8
- movs r1, 0x3C
- movs r2, 0
- bl GetMonData
- cmp r4, r0
- bcs _08043110
-_080430A2:
- ldrh r5, [r5, 0x4]
- mov r10, r5
- b _08043110
-_080430A8:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r4, r0, r3
- ldrh r0, [r4, 0x2]
- cmp r0, r9
- bhi _08043110
- ldr r0, [sp, 0x10]
- movs r1, 0xA
- bl __umodsi3
- lsls r0, 16
- lsrs r0, 16
- cmp r0, 0x4
- bhi _08043110
- b _080430E6
-_080430C8:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r4, r0, r3
- ldrh r0, [r4, 0x2]
- cmp r0, r9
- bhi _08043110
- ldr r0, [sp, 0x10]
- movs r1, 0xA
- bl __umodsi3
- lsls r0, 16
- lsrs r0, 16
- cmp r0, 0x4
- bls _08043110
-_080430E6:
- ldrh r4, [r4, 0x4]
- mov r10, r4
- b _08043110
-_080430EC:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r1, r0, r3
- ldrh r0, [r1, 0x2]
- cmp r0, r9
- bhi _08043110
- b _0804310C
-_080430FC:
- adds r0, r6, r7
- lsls r0, 3
- adds r0, r2, r0
- adds r1, r0, r3
- ldrh r0, [r1, 0x2]
- ldr r2, [sp, 0xC]
- cmp r0, r2
- bhi _08043110
-_0804310C:
- ldrh r1, [r1, 0x4]
- mov r10, r1
-_08043110:
- ldr r0, [sp, 0x4]
- adds r0, 0x1
- str r0, [sp, 0x4]
- cmp r0, 0x4
- bgt _0804311C
- b _08042F96
-_0804311C:
- b _080431A2
-_0804311E:
- movs r1, 0
- str r1, [sp, 0x4]
- lsls r6, r7, 2
- ldr r1, _08043138 @ =gUnknown_8259754
- adds r0, r6, r7
- lsls r0, 3
- adds r4, r0, r1
-_0804312C:
- ldrh r0, [r4]
- cmp r0, 0x5
- beq _0804313C
- cmp r0, 0x6
- beq _08043142
- b _0804316E
- .align 2, 0
-_08043138: .4byte gUnknown_8259754
-_0804313C:
- ldrh r2, [r4, 0x4]
- mov r10, r2
- b _0804316E
-_08043142:
- ldrh r1, [r4, 0x2]
- mov r0, sp
- ldrh r0, [r0]
- cmp r1, r0
- bne _0804316E
- ldrh r0, [r4, 0x4]
- mov r10, r0
- bl sub_806E25C
- cmp r0, 0
- bne _0804315E
- mov r1, r10
- cmp r1, 0x97
- bhi _0804316E
-_0804315E:
- movs r1, 0
- mov r0, sp
- strh r1, [r0]
- mov r0, r8
- movs r1, 0xC
- mov r2, sp
- bl SetMonData
-_0804316E:
- adds r4, 0x8
- ldr r2, [sp, 0x4]
- adds r2, 0x1
- str r2, [sp, 0x4]
- cmp r2, 0x4
- ble _0804312C
- b _080431A2
-_0804317C:
- ldrh r1, [r1, 0x4]
- mov r10, r1
- b _080431A2
-_08043182:
- adds r0, r6, r7
- ldr r1, [sp, 0x4]
- adds r0, r1
- lsls r0, 3
- adds r1, r0, r3
- ldrh r0, [r1]
- cmp r0, 0x7
- bne _08043198
- ldrh r0, [r1, 0x2]
- cmp r0, r9
- beq _0804317C
-_08043198:
- ldr r2, [sp, 0x4]
- adds r2, 0x1
- str r2, [sp, 0x4]
- cmp r2, 0x4
- ble _08043182
-_080431A2:
- mov r0, r10
-_080431A4:
- add sp, 0x14
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end GetEvolutionTargetSpecies
-
- thumb_func_start sub_80431B4
-sub_80431B4: @ 80431B4
- push {r4,lr}
- lsls r0, 16
- lsrs r2, r0, 16
- cmp r2, 0
- beq _080431F8
- movs r1, 0
- ldr r3, _080431F0 @ =gUnknown_8251CB8
- ldrh r0, [r3]
- cmp r0, r2
- beq _080431E0
- movs r4, 0xCD
- lsls r4, 1
-_080431CC:
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, r4
- bhi _080431E0
- lsls r0, r1, 1
- adds r0, r3
- ldrh r0, [r0]
- cmp r0, r2
- bne _080431CC
-_080431E0:
- ldr r0, _080431F4 @ =0x0000019b
- cmp r1, r0
- beq _080431F8
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r0, 16
- b _080431FA
- .align 2, 0
-_080431F0: .4byte gUnknown_8251CB8
-_080431F4: .4byte 0x0000019b
-_080431F8:
- movs r0, 0
-_080431FA:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_80431B4
-
- thumb_func_start NationalPokedexNumToSpecies
-NationalPokedexNumToSpecies: @ 8043200
- push {r4,lr}
- lsls r0, 16
- lsrs r2, r0, 16
- cmp r2, 0
- beq _08043244
- movs r1, 0
- ldr r3, _0804323C @ =gUnknown_8251FEE
- ldrh r0, [r3]
- cmp r0, r2
- beq _0804322C
- movs r4, 0xCD
- lsls r4, 1
-_08043218:
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, r4
- bhi _0804322C
- lsls r0, r1, 1
- adds r0, r3
- ldrh r0, [r0]
- cmp r0, r2
- bne _08043218
-_0804322C:
- ldr r0, _08043240 @ =0x0000019b
- cmp r1, r0
- beq _08043244
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r0, 16
- b _08043246
- .align 2, 0
-_0804323C: .4byte gUnknown_8251FEE
-_08043240: .4byte 0x0000019b
-_08043244:
- movs r0, 0
-_08043246:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end NationalPokedexNumToSpecies
-
- thumb_func_start sub_804324C
-sub_804324C: @ 804324C
- push {r4,lr}
- lsls r0, 16
- lsrs r2, r0, 16
- cmp r2, 0
- beq _08043290
- movs r1, 0
- ldr r3, _08043288 @ =gUnknown_8252324
- ldrh r0, [r3]
- cmp r0, r2
- beq _08043278
- movs r4, 0xCD
- lsls r4, 1
-_08043264:
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, r4
- bhi _08043278
- lsls r0, r1, 1
- adds r0, r3
- ldrh r0, [r0]
- cmp r0, r2
- bne _08043264
-_08043278:
- ldr r0, _0804328C @ =0x0000019b
- cmp r1, r0
- beq _08043290
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r0, 16
- b _08043292
- .align 2, 0
-_08043288: .4byte gUnknown_8252324
-_0804328C: .4byte 0x0000019b
-_08043290:
- movs r0, 0
-_08043292:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_804324C
-
- thumb_func_start SpeciesToNationalPokedexNum
-SpeciesToNationalPokedexNum: @ 8043298
- push {lr}
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, 0
- beq _080432B4
- ldr r0, _080432B0 @ =gUnknown_8251FEE
- subs r1, 0x1
- lsls r1, 1
- adds r1, r0
- ldrh r0, [r1]
- b _080432B6
- .align 2, 0
-_080432B0: .4byte gUnknown_8251FEE
-_080432B4:
- movs r0, 0
-_080432B6:
- pop {r1}
- bx r1
- thumb_func_end SpeciesToNationalPokedexNum
-
- thumb_func_start SpeciesToHoennPokedexNum
-SpeciesToHoennPokedexNum: @ 80432BC
- push {lr}
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, 0
- beq _080432D8
- ldr r0, _080432D4 @ =gUnknown_8251CB8
- subs r1, 0x1
- lsls r1, 1
- adds r1, r0
- ldrh r0, [r1]
- b _080432DA
- .align 2, 0
-_080432D4: .4byte gUnknown_8251CB8
-_080432D8:
- movs r0, 0
-_080432DA:
- pop {r1}
- bx r1
- thumb_func_end SpeciesToHoennPokedexNum
-
- thumb_func_start HoennToNationalOrder
-HoennToNationalOrder: @ 80432E0
- push {lr}
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, 0
- beq _080432FC
- ldr r0, _080432F8 @ =gUnknown_8252324
- subs r1, 0x1
- lsls r1, 1
- adds r1, r0
- ldrh r0, [r1]
- b _080432FE
- .align 2, 0
-_080432F8: .4byte gUnknown_8252324
-_080432FC:
- movs r0, 0
-_080432FE:
- pop {r1}
- bx r1
- thumb_func_end HoennToNationalOrder
-
- thumb_func_start SpeciesToCryId
-SpeciesToCryId: @ 8043304
- push {lr}
- lsls r0, 16
- lsrs r0, 16
- adds r1, r0, 0
- cmp r0, 0xFA
- bls _08043332
- ldr r0, _08043324 @ =0x00000113
- cmp r1, r0
- bls _08043330
- ldr r0, _08043328 @ =gUnknown_82539D4
- ldr r2, _0804332C @ =0xfffffeec
- adds r1, r2
- lsls r1, 1
- adds r1, r0
- ldrh r0, [r1]
- b _08043332
- .align 2, 0
-_08043324: .4byte 0x00000113
-_08043328: .4byte gUnknown_82539D4
-_0804332C: .4byte 0xfffffeec
-_08043330:
- movs r0, 0xC8
-_08043332:
- pop {r1}
- bx r1
- thumb_func_end SpeciesToCryId
-
thumb_func_start sub_8043338
sub_8043338: @ 8043338
push {r4-r7,lr}
@@ -3212,7 +2222,7 @@ sub_8044348: @ 8044348
adds r0, 0xAC
ldrb r0, [r0]
strb r0, [r2]
- ldr r4, _08044394 @ =gUnknown_2022AB8
+ ldr r4, _08044394 @ =gBattleTextBuff1
movs r0, 0xFD
strb r0, [r4]
movs r0, 0x4
@@ -3239,7 +2249,7 @@ sub_8044348: @ 8044348
.align 2, 0
_0804438C: .4byte gLastUsedAbility
_08044390: .4byte gBattleStruct
-_08044394: .4byte gUnknown_2022AB8
+_08044394: .4byte gBattleTextBuff1
_08044398: .4byte gBattlerPartyIndexes
_0804439C:
ldr r1, _080443E0 @ =gBattlerPartyIndexes
@@ -3251,7 +2261,7 @@ _0804439C:
ldrh r0, [r0]
_080443AA:
strb r0, [r4, 0x3]
- ldr r4, _080443E4 @ =gUnknown_2022AC8
+ ldr r4, _080443E4 @ =gBattleTextBuff2
movs r0, 0xFD
strb r0, [r4]
movs r0, 0x4
@@ -3276,7 +2286,7 @@ _080443AA:
bx r0
.align 2, 0
_080443E0: .4byte gBattlerPartyIndexes
-_080443E4: .4byte gUnknown_2022AC8
+_080443E4: .4byte gBattleTextBuff2
_080443E8: .4byte gBattlerInMenuId
_080443EC: .4byte gUnknown_83FCA2C
_080443F0: .4byte gStringVar4
diff --git a/data/data.s b/data/data.s
index b6b915577..9c5c431ae 100644
--- a/data/data.s
+++ b/data/data.s
@@ -340,7 +340,7 @@ gBaseStats:: @ 8254784
gUnknown_8254795:: @ 8254795
.incbin "baserom.gba", 0x254795, 0x4FBF
-gUnknown_8259754:: @ 8259754
+gEvolutionTable:: @ 8259754
.incbin "baserom.gba", 0x259754, 0x4060
gLevelUpLearnsets:: @ 825D7B4
diff --git a/data/data_84827AC.s b/data/data_84827AC.s
index 671dc3ab4..880c97ae1 100644
--- a/data/data_84827AC.s
+++ b/data/data_84827AC.s
@@ -276,19 +276,19 @@ gUnknown_83FAC34:: @ 83FAC34
gUnknown_83FB134:: @ 83FB134
.incbin "baserom.gba", 0x3FB134, 0xA80
-gUnknown_83FBBB4:: @ 83FBBB4
+BattleText_MistShroud:: @ 83FBBB4
.incbin "baserom.gba", 0x3FBBB4, 0x35
-gUnknown_83FBBE9:: @ 83FBBE9
+BattleText_GetPumped:: @ 83FBBE9
.incbin "baserom.gba", 0x3FBBE9, 0xE43
gUnknown_83FCA2C:: @ 83FCA2C
.incbin "baserom.gba", 0x3FCA2C, 0x11E
-gUnknown_83FCB4A:: @ 83FCB4A
+BattleText_Rose:: @ 83FCB4A
.incbin "baserom.gba", 0x3FCB4A, 0x20
-gUnknown_83FCB6A:: @ 83FCB6A
+BattleText_UnknownString3:: @ 83FCB6A
.incbin "baserom.gba", 0x3FCB6A, 0x120
gUnknown_83FCC8A:: @ 83FCC8A
diff --git a/include/global.h b/include/global.h
index fac7e1354..ba681d570 100644
--- a/include/global.h
+++ b/include/global.h
@@ -28,6 +28,7 @@ char* strcpy(char *dst0, const char *src0);
// Converts a number to Q4.12 fixed-point format
#define Q_4_12(n) ((s16)((n) * 4096))
+#define POKEMON_SLOTS_NUMBER 412
#define POKEMON_NAME_LENGTH 10
#define OT_NAME_LENGTH 7
diff --git a/include/pokemon.h b/include/pokemon.h
index 2a8dc9c7d..e15172dd5 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -511,18 +511,13 @@ struct Evolution
#define EVOS_PER_MON 5
-struct EvolutionData
-{
- struct Evolution evolutions[EVOS_PER_MON];
-};
-
extern u8 gPlayerPartyCount;
extern struct Pokemon gPlayerParty[PARTY_SIZE];
extern u8 gEnemyPartyCount;
extern struct Pokemon gEnemyParty[PARTY_SIZE];
extern const struct BaseStats gBaseStats[];
extern const u8 *const gItemEffectTable[];
-extern const struct EvolutionData gEvolutionTable[];
+extern const struct Evolution gEvolutionTable[][EVOS_PER_MON];
extern const u8 gStatStageRatios[][2];
extern struct SpriteTemplate gMultiuseSpriteTemplate;
extern struct PokemonStorage* gPokemonStoragePtr;
diff --git a/src/pokemon.c b/src/pokemon.c
index 1467d8b6f..66b7824ff 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -13,6 +13,7 @@
#include "battle_gfx_sfx_util.h"
#include "battle_controllers.h"
#include "evolution_scene.h"
+#include "battle_message.h"
#include "constants/items.h"
#include "constants/species.h"
#include "constants/pokemon.h"
@@ -36,6 +37,8 @@ struct UnkStruct20244F4
u8 filler1[0xF];
struct SpriteTemplate *unk10;
};
+
+// External symbols
extern struct UnkStruct20244F4 *gUnknown_20244F4;
extern struct SpriteTemplate gUnknown_825DEF0[];
extern struct SpriteTemplate gUnknown_825DF50[];
@@ -43,11 +46,27 @@ extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
extern struct SpriteTemplate gUnknown_825DEF0[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
extern const union AnimCmd *const gUnknown_82349BC[];
-extern const u8 gText_EggNickname[];
-extern const u8 gText_BadEgg[];
extern const u8 gUnknown_825DEA1[];
extern const u8 gPPUpWriteMasks[];
+extern u8 *gUnknown_83FD5D0[];
+extern const u8 gUnknown_825DFF0[];
+extern u8 gBattleTextBuff1[];
+extern u8 gBattleTextBuff2[];
+extern const u8 gText_EggNickname[];
+extern const u8 gText_BadEgg[];
+extern const u8 BattleText_Rose[];
+extern const u8 BattleText_UnknownString3[];
+extern const u8 BattleText_GetPumped[];
+extern const u8 BattleText_MistShroud[];
+extern const u8 sHoldEffectToType[][2];
+extern u8 sLearningMoveTableID;
+extern const u8 sSecretBaseFacilityClasses[2][5];
+extern u16 gUnknown_8251CB8[];
+extern u16 gUnknown_8251FEE[];
+extern u16 gUnknown_8252324[];
+extern u16 gUnknown_82539D4[];
+// External functions
extern u8 sav1_map_get_name(void); // overworld
extern const struct BattleMove gBattleMoves[];
extern u8 sBattler_AI; // battle_ai
@@ -60,10 +79,6 @@ extern void sub_80174B8(u8 battlerId);
union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType);
s32 GetDeoxysStat(struct Pokemon *mon, s32 statId);
-extern const u8 sHoldEffectToType[][2];
-extern u8 sLearningMoveTableID;
-extern const u8 sSecretBaseFacilityClasses[2][5];
-
// code
void ZeroBoxMonData(struct BoxPokemon *boxMon)
{
@@ -4368,3 +4383,416 @@ _08042BD8:\n\
.syntax divided\n");
}
#endif
+
+bool8 sub_8042BE8(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId)
+{
+ if((GetMonData(mon, MON_DATA_STATUS, NULL) & healMask) != 0)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
+{
+ const u8 *temp;
+ const u8 *itemEffect;
+ u8 offset;
+ int i;
+ u8 j;
+ u8 val;
+
+ offset = 6;
+
+ temp = gItemEffectTable[itemId - 13];
+
+ if (!temp && itemId != ITEM_ENIGMA_BERRY)
+ return 0;
+
+ if (itemId == ITEM_ENIGMA_BERRY)
+ {
+ temp = gEnigmaBerries[gActiveBattler].itemEffect;
+ }
+
+ itemEffect = temp;
+
+ for (i = 0; i < 6; i++)
+ {
+ switch (i)
+ {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ if (i == effectByte)
+ return 0;
+ break;
+ case 4:
+ val = itemEffect[4];
+ if (val & 0x20)
+ val &= 0xDF;
+ j = 0;
+ while (val)
+ {
+ if (val & 1)
+ {
+ switch (j)
+ {
+ case 2:
+ if (val & 0x10)
+ val &= 0xEF;
+ case 0:
+ if (i == effectByte && (val & effectBit))
+ return offset;
+ offset++;
+ break;
+ case 1:
+ if (i == effectByte && (val & effectBit))
+ return offset;
+ offset++;
+ break;
+ case 3:
+ if (i == effectByte && (val & effectBit))
+ return offset;
+ offset++;
+ break;
+ case 7:
+ if (i == effectByte)
+ return 0;
+ break;
+ }
+ }
+ j++;
+ val >>= 1;
+ if (i == effectByte)
+ effectBit >>= 1;
+ }
+ break;
+ case 5:
+ val = itemEffect[5];
+ j = 0;
+ while (val)
+ {
+ if (val & 1)
+ {
+ switch (j)
+ {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ if (i == effectByte && (val & effectBit))
+ return offset;
+ offset++;
+ break;
+ case 7:
+ if (i == effectByte)
+ return 0;
+ break;
+ }
+ }
+ j++;
+ val >>= 1;
+ if (i == effectByte)
+ effectBit >>= 1;
+ }
+ break;
+ }
+ }
+
+ return offset;
+}
+
+void sub_8042D50(int stat)
+{
+ gBattlerTarget = gBattlerInMenuId;
+ StringCopy(gBattleTextBuff1, gUnknown_83FD5D0[gUnknown_825DFF0[stat]]);
+ StringCopy(gBattleTextBuff2, BattleText_Rose);
+ BattleStringExpandPlaceholdersToDisplayedString(BattleText_UnknownString3);
+}
+
+u8 *sub_8042DA4(u16 itemId)
+{
+ int i;
+ const u8 *itemEffect;
+
+ if (itemId == ITEM_ENIGMA_BERRY)
+ {
+ if (gMain.inBattle)
+ {
+ itemEffect = gEnigmaBerries[gBattlerInMenuId].itemEffect;
+ }
+ else
+ {
+ itemEffect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
+ }
+ }
+ else
+ {
+ itemEffect = gItemEffectTable[itemId - 13];
+ }
+
+ gPotentialItemEffectBattler = gBattlerInMenuId;
+
+ for (i = 0; i < 3; i++)
+ {
+ if (itemEffect[i] & 0xF)
+ sub_8042D50(i * 2);
+ if (itemEffect[i] & 0xF0)
+ {
+ if (i)
+ {
+ sub_8042D50(i * 2 + 1);
+ }
+ else
+ {
+ sBattler_AI = gBattlerInMenuId;
+ BattleStringExpandPlaceholdersToDisplayedString(BattleText_GetPumped);
+ }
+ }
+ }
+
+ if (itemEffect[3] & 0x80)
+ {
+ sBattler_AI = gBattlerInMenuId;
+ BattleStringExpandPlaceholdersToDisplayedString(BattleText_MistShroud);
+ }
+
+ return gDisplayedStringBattle;
+}
+
+u8 GetNature(struct Pokemon *mon)
+{
+ return GetMonData(mon, MON_DATA_PERSONALITY, 0) % 25;
+}
+
+u8 GetNatureFromPersonality(u32 personality)
+{
+ return personality % 25;
+}
+
+extern bool32 sub_806E25C(u16 targetSpecies);
+
+u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
+{
+ int i;
+ u16 targetSpecies = 0;
+ u16 species = GetMonData(mon, MON_DATA_SPECIES, 0);
+ u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
+ u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, 0);
+ u8 level;
+ u16 friendship;
+ u8 beauty = GetMonData(mon, MON_DATA_BEAUTY, 0);
+ u16 upperPersonality = personality >> 16;
+ u8 holdEffect;
+
+ if (heldItem == ITEM_ENIGMA_BERRY)
+ holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
+ else
+ holdEffect = ItemId_GetHoldEffect(heldItem);
+
+ if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && type != 3)
+ return 0;
+
+ switch (type)
+ {
+ case 0:
+ level = GetMonData(mon, MON_DATA_LEVEL, 0);
+ friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, 0);
+
+ for (i = 0; i < 5; i++)
+ {
+ switch (gEvolutionTable[species][i].method)
+ {
+ case EVO_FRIENDSHIP:
+ if (friendship >= 220)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ // FR/LG removed the time of day evolutions due to having no RTC.
+ case EVO_FRIENDSHIP_DAY:
+ /*
+ RtcCalcLocalTime();
+ if (gLocalTime.hours >= 12 && gLocalTime.hours < 24 && friendship >= 220)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ */
+ break;
+ case EVO_FRIENDSHIP_NIGHT:
+ /*
+ RtcCalcLocalTime();
+ if (gLocalTime.hours >= 0 && gLocalTime.hours < 12 && friendship >= 220)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ */
+ break;
+ case EVO_LEVEL:
+ if (gEvolutionTable[species][i].param <= level)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_LEVEL_ATK_GT_DEF:
+ if (gEvolutionTable[species][i].param <= level)
+ if (GetMonData(mon, MON_DATA_ATK, 0) > GetMonData(mon, MON_DATA_DEF, 0))
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_LEVEL_ATK_EQ_DEF:
+ if (gEvolutionTable[species][i].param <= level)
+ if (GetMonData(mon, MON_DATA_ATK, 0) == GetMonData(mon, MON_DATA_DEF, 0))
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_LEVEL_ATK_LT_DEF:
+ if (gEvolutionTable[species][i].param <= level)
+ if (GetMonData(mon, MON_DATA_ATK, 0) < GetMonData(mon, MON_DATA_DEF, 0))
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_LEVEL_SILCOON:
+ if (gEvolutionTable[species][i].param <= level && (upperPersonality % 10) <= 4)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_LEVEL_CASCOON:
+ if (gEvolutionTable[species][i].param <= level && (upperPersonality % 10) > 4)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_LEVEL_NINJASK:
+ if (gEvolutionTable[species][i].param <= level)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_BEAUTY:
+ if (gEvolutionTable[species][i].param <= beauty)
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ }
+ }
+ break;
+ case 1:
+ for (i = 0; i < 5; i++)
+ {
+ switch (gEvolutionTable[species][i].method)
+ {
+ case EVO_TRADE:
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ case EVO_TRADE_ITEM:
+ if (gEvolutionTable[species][i].param == heldItem)
+ {
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ if (sub_806E25C(targetSpecies) || targetSpecies <= 151)
+ {
+ heldItem = 0;
+ SetMonData(mon, MON_DATA_HELD_ITEM, &heldItem);
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ }
+ }
+ break;
+ }
+ }
+ break;
+ case 2:
+ case 3:
+ for (i = 0; i < 5; i++)
+ {
+ if (gEvolutionTable[species][i].method == EVO_ITEM
+ && gEvolutionTable[species][i].param == evolutionItem)
+ {
+ targetSpecies = gEvolutionTable[species][i].targetSpecies;
+ break;
+ }
+ }
+ break;
+ }
+
+ return targetSpecies;
+}
+
+// HoennPokedexNumToSpecies, but is it really Hoenn or Kanto its checking
+// TODO: Figure this out
+u16 sub_80431B4(u16 var)
+{
+ u16 species;
+
+ if(!var)
+ return 0;
+
+ species = 0;
+
+ while(species < POKEMON_SLOTS_NUMBER - 1 && gUnknown_8251CB8[species] != var)
+ species++;
+
+ if(species == POKEMON_SLOTS_NUMBER - 1)
+ return 0;
+
+ return species + 1;
+}
+
+u16 NationalPokedexNumToSpecies(u16 nationalNum)
+{
+ u16 species;
+
+ if (!nationalNum)
+ return 0;
+
+ species = 0;
+
+ while (species < POKEMON_SLOTS_NUMBER - 1 && gUnknown_8251FEE[species] != nationalNum)
+ species++;
+
+ if (species == POKEMON_SLOTS_NUMBER - 1)
+ return 0;
+
+ return species + 1;
+}
+
+// NationalToKantoOrder?
+u16 sub_804324C(u16 nationalNum)
+{
+ u16 hoennNum;
+
+ if (!nationalNum)
+ return 0;
+
+ hoennNum = 0;
+
+ while (hoennNum < POKEMON_SLOTS_NUMBER - 1 && gUnknown_8252324[hoennNum] != nationalNum)
+ hoennNum++;
+
+ if (hoennNum == POKEMON_SLOTS_NUMBER - 1)
+ return 0;
+
+ return hoennNum + 1;
+}
+
+u16 SpeciesToNationalPokedexNum(u16 species)
+{
+ if (!species)
+ return 0;
+
+ return gUnknown_8251FEE[species - 1];
+}
+
+// these 2 functions are probably kanto and not hoenn
+// TODO: figure this out
+u16 SpeciesToHoennPokedexNum(u16 species)
+{
+ if (!species)
+ return 0;
+
+ return gUnknown_8251CB8[species - 1];
+}
+
+u16 HoennToNationalOrder(u16 hoennNum)
+{
+ if (!hoennNum)
+ return 0;
+
+ return gUnknown_8252324[hoennNum - 1];
+}
+
+u16 SpeciesToCryId(u16 species)
+{
+ if (species < SPECIES_OLD_UNOWN_B - 1)
+ return species;
+
+ if (species <= SPECIES_OLD_UNOWN_Z - 1)
+ return SPECIES_UNOWN - 1;
+
+ return gUnknown_82539D4[species - ((SPECIES_OLD_UNOWN_Z + 1) - 1)];
+}
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 381d3af13..75c584009 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -152,13 +152,13 @@ gUnknown_2022988: @ 2022988
gUnknown_202298A: @ 202298A
.space 0x2
-gUnknown_202298C: @ 202298C
+gDisplayedStringBattle: @ 202298C
.space 0x12C
-gUnknown_2022AB8: @ 2022AB8
+gBattleTextBuff1: @ 2022AB8
.space 0x10
-gUnknown_2022AC8: @ 2022AC8
+gBattleTextBuff2: @ 2022AC8
.space 0x10
gUnknown_2022AD8: @ 2022AD8
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 22:15:42 +0000