through sub_8113FBC

anzz1 · Nov 8, 2018 · 5070968 · 5070968
1 parent 21b5f78
commit 5070968
Show file tree

Hide file tree

Showing 21 changed files with 222 additions and 342 deletions.
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
@@ -4570,7 +4570,7 @@ _08030848:
 	ldrh r1, [r4]
 	movs r0, 0xD
 	muls r1, r0
-	ldr r0, _080308A4 @ =gUnknown_8247094
+	ldr r0, _080308A4 @ =gMoveNames
 	adds r1, r0
 	adds r0, r6, 0
 	bl StringAppend
@@ -4599,7 +4599,7 @@ _08030894: .4byte gUnknown_2022BC8
 _08030898: .4byte gUnknown_3004FF8
 _0803089C: .4byte gDisplayedStringBattle
 _080308A0: .4byte gUnknown_83FE770
-_080308A4: .4byte gUnknown_8247094
+_080308A4: .4byte gMoveNames
 	thumb_func_end sub_8030830
 
 	thumb_func_start MoveSelectionDisplayPpString

diff --git a/asm/battle_message.s b/asm/battle_message.s
@@ -473,7 +473,7 @@ _080D762C:
 	ldrh r2, [r2]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _080D764C @ =gUnknown_8247094
+	ldr r2, _080D764C @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 _080D763C:
@@ -483,7 +483,7 @@ _080D763C:
 	b _080D77DC
 	.align 2, 0
 _080D7648: .4byte gBattleTextBuff2
-_080D764C: .4byte gUnknown_8247094
+_080D764C: .4byte gMoveNames
 _080D7650: .4byte gUnknown_83FD57B
 _080D7654:
 	ldr r4, _080D7694 @ =gBattleTextBuff1
@@ -1505,11 +1505,11 @@ _080D7ED4:
 _080D7ED6:
 	movs r0, 0xD
 	muls r1, r0
-	ldr r0, _080D7EE0 @ =gUnknown_8247094
+	ldr r0, _080D7EE0 @ =gMoveNames
 	adds r4, r1, r0
 	b _080D8382
 	.align 2, 0
-_080D7EE0: .4byte gUnknown_8247094
+_080D7EE0: .4byte gMoveNames
 _080D7EE4:
 	ldr r0, _080D7F1C @ =gBattleTypeFlags
 	ldr r1, [r0]
@@ -2294,11 +2294,11 @@ _080D84EC:
 	orrs r1, r0
 	movs r0, 0xD
 	muls r1, r0
-	ldr r0, _080D8500 @ =gUnknown_8247094
+	ldr r0, _080D8500 @ =gMoveNames
 	adds r1, r0
 	b _080D868E
 	.align 2, 0
-_080D8500: .4byte gUnknown_8247094
+_080D8500: .4byte gMoveNames
 _080D8504:
 	adds r0, r5, r7
 	ldrb r0, [r0, 0x1]

diff --git a/asm/easy_chat.s b/asm/easy_chat.s
@@ -166,11 +166,11 @@ _080BD820: .4byte gSpeciesNames
 _080BD824:
 	movs r0, 0xD
 	muls r0, r2
-	ldr r1, _080BD830 @ =gUnknown_8247094
+	ldr r1, _080BD830 @ =gMoveNames
 	adds r0, r1
 	b _080BD846
 	.align 2, 0
-_080BD830: .4byte gUnknown_8247094
+_080BD830: .4byte gMoveNames
 _080BD834:
 	ldr r1, _080BD84C @ =gUnknown_83ECED4
 	lsls r0, 3

diff --git a/asm/field_specials.s b/asm/field_specials.s
@@ -4570,7 +4570,7 @@ _080CC8EC:
 	lsrs r0, 16
 	movs r1, 0xD
 	muls r1, r0
-	ldr r0, _080CC914 @ =gUnknown_8247094
+	ldr r0, _080CC914 @ =gMoveNames
 	adds r1, r0
 	adds r0, r4, 0
 	bl StringCopy
@@ -4581,7 +4581,7 @@ _080CC908:
 	bx r1
 	.align 2, 0
 _080CC910: .4byte gStringVar1
-_080CC914: .4byte gUnknown_8247094
+_080CC914: .4byte gMoveNames
 	thumb_func_end sub_80CC8CC
 
 	thumb_func_start sub_80CC918

diff --git a/asm/item_pc.s b/asm/item_pc.s
@@ -709,12 +709,12 @@ _0810D968:
 	lsrs r0, 16
 	movs r1, 0xD
 	muls r1, r0
-	ldr r0, _0810D9C0 @ =gUnknown_8247094
+	ldr r0, _0810D9C0 @ =gMoveNames
 	adds r5, r1, r0
 	b _0810D9DA
 	.align 2, 0
 _0810D9BC: .4byte gUnknown_203ADBC
-_0810D9C0: .4byte gUnknown_8247094
+_0810D9C0: .4byte gMoveNames
 _0810D9C4:
 	adds r0, r4, 0
 	bl ItemId_GetDescription

diff --git a/asm/learn_move.s b/asm/learn_move.s
@@ -882,7 +882,7 @@ _080E4DB4:
 	mov r9, r1
 	mov r1, r9
 	muls r1, r0
-	ldr r3, _080E4E58 @ =gUnknown_8247094
+	ldr r3, _080E4E58 @ =gMoveNames
 	mov r8, r3
 	add r1, r8
 	adds r0, r2, 0
@@ -938,7 +938,7 @@ _080E4DB4:
 	.align 2, 0
 _080E4E50: .4byte gPlayerParty
 _080E4E54: .4byte gStringVar3
-_080E4E58: .4byte gUnknown_8247094
+_080E4E58: .4byte gMoveNames
 _080E4E5C: .4byte 0x00000261
 _080E4E60: .4byte 0x00000a67
 _080E4E64: .4byte gStringVar2
@@ -1297,7 +1297,7 @@ _080E511A:
 	adds r1, r2
 	ldrh r1, [r1]
 	muls r1, r7
-	ldr r2, _080E51F0 @ =gUnknown_8247094
+	ldr r2, _080E51F0 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	adds r4, 0xD
@@ -1394,7 +1394,7 @@ _080E51AA:
 	.align 2, 0
 _080E51E8: .4byte gUnknown_203AAB4
 _080E51EC: .4byte gPlayerParty
-_080E51F0: .4byte gUnknown_8247094
+_080E51F0: .4byte gMoveNames
 _080E51F4: .4byte gStringVar1
 _080E51F8: .4byte gUnknown_84161C1
 _080E51FC: .4byte gUnknown_3005E70

diff --git a/asm/party_menu.s b/asm/party_menu.s
@@ -13647,7 +13647,7 @@ _08125620:
 	movs r0, 0xD
 	adds r2, r5, 0
 	muls r2, r0
-	ldr r0, _081256BC @ =gUnknown_8247094
+	ldr r0, _081256BC @ =gMoveNames
 	adds r2, r0
 	lsls r0, r6, 4
 	adds r0, 0x2
@@ -13697,7 +13697,7 @@ _08125680:
 	bx r0
 	.align 2, 0
 _081256B8: .4byte gPlayerParty
-_081256BC: .4byte gUnknown_8247094
+_081256BC: .4byte gMoveNames
 	thumb_func_end sub_81255F0
 
 	thumb_func_start sub_81256C0
@@ -13974,7 +13974,7 @@ sub_8125898: @ 8125898
 	ldr r2, _08125944 @ =gStringVar1
 	movs r1, 0xD
 	muls r1, r0
-	ldr r0, _08125948 @ =gUnknown_8247094
+	ldr r0, _08125948 @ =gMoveNames
 	adds r1, r0
 	adds r0, r2, 0
 	bl StringCopy
@@ -14005,7 +14005,7 @@ _08125938: .4byte gUnknown_203AD30
 _0812593C: .4byte gUnknown_203B0C0
 _08125940: .4byte 0x0000ffff
 _08125944: .4byte gStringVar1
-_08125948: .4byte gUnknown_8247094
+_08125948: .4byte gMoveNames
 _0812594C: .4byte gStringVar4
 _08125950: .4byte gTasks
 _08125954: .4byte sub_81255BC
@@ -14076,7 +14076,7 @@ _081259A0:
 	ldr r0, _08125A28 @ =gStringVar1
 	movs r1, 0xD
 	muls r1, r4
-	ldr r2, _08125A2C @ =gUnknown_8247094
+	ldr r2, _08125A2C @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	adds r0, r5, 0
@@ -14104,7 +14104,7 @@ _08125A1C: .4byte gUnknown_203B0C0
 _08125A20: .4byte gPlayerParty
 _08125A24: .4byte 0x0000ffff
 _08125A28: .4byte gStringVar1
-_08125A2C: .4byte gUnknown_8247094
+_08125A2C: .4byte gMoveNames
 _08125A30: .4byte gStringVar4
 _08125A34: .4byte gTasks
 _08125A38: .4byte sub_81255BC
@@ -14288,7 +14288,7 @@ sub_8125B40: @ 8125B40
 	ldrsh r2, [r7, r1]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _08125BE4 @ =gUnknown_8247094
+	ldr r2, _08125BE4 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	movs r0, 0
@@ -14328,7 +14328,7 @@ _08125BD4: .4byte gPlayerParty
 _08125BD8: .4byte gUnknown_203AD30
 _08125BDC: .4byte gStringVar1
 _08125BE0: .4byte gStringVar2
-_08125BE4: .4byte gUnknown_8247094
+_08125BE4: .4byte gMoveNames
 _08125BE8: .4byte 0x0000ffff
 _08125BEC: .4byte gUnknown_3005E98
 _08125BF0: .4byte sub_8125C38
@@ -14416,7 +14416,7 @@ _08125C84:
 	ldrsh r2, [r6, r1]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _08125CE0 @ =gUnknown_8247094
+	ldr r2, _08125CE0 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	ldr r4, _08125CE4 @ =gStringVar4
@@ -14444,7 +14444,7 @@ _08125CD0: .4byte gPlayerParty
 _08125CD4: .4byte gUnknown_203AD30
 _08125CD8: .4byte gStringVar1
 _08125CDC: .4byte gStringVar2
-_08125CE0: .4byte gUnknown_8247094
+_08125CE0: .4byte gMoveNames
 _08125CE4: .4byte gStringVar4
 _08125CE8: .4byte gUnknown_8416DB3
 _08125CEC: .4byte gTasks
@@ -14806,7 +14806,7 @@ sub_8125F5C: @ 8125F5C
 	ldr r0, _08125FF4 @ =gStringVar2
 	movs r1, 0xD
 	muls r1, r4
-	ldr r2, _08125FF8 @ =gUnknown_8247094
+	ldr r2, _08125FF8 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	adds r0, r6, 0
@@ -14831,7 +14831,7 @@ _08125FE8: .4byte gPlayerParty
 _08125FEC: .4byte gUnknown_203AD30
 _08125FF0: .4byte gStringVar1
 _08125FF4: .4byte gStringVar2
-_08125FF8: .4byte gUnknown_8247094
+_08125FF8: .4byte gMoveNames
 	thumb_func_end sub_8125F5C
 
 	thumb_func_start sub_8125FFC
@@ -14864,7 +14864,7 @@ sub_8125FFC: @ 8125FFC
 	ldr r0, _08126068 @ =gStringVar2
 	movs r1, 0xD
 	muls r1, r4
-	ldr r2, _0812606C @ =gUnknown_8247094
+	ldr r2, _0812606C @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	ldr r0, _08126070 @ =gUnknown_8416EC6
@@ -14884,7 +14884,7 @@ _0812605C: .4byte gUnknown_203B0A0
 _08126060: .4byte gPlayerParty
 _08126064: .4byte gStringVar1
 _08126068: .4byte gStringVar2
-_0812606C: .4byte gUnknown_8247094
+_0812606C: .4byte gMoveNames
 _08126070: .4byte gUnknown_8416EC6
 _08126074: .4byte gTasks
 _08126078: .4byte sub_812607C
@@ -14945,7 +14945,7 @@ sub_81260D8: @ 81260D8
 	ldrsh r2, [r1, r3]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _08126128 @ =gUnknown_8247094
+	ldr r2, _08126128 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	ldr r4, _0812612C @ =gStringVar4
@@ -14970,7 +14970,7 @@ sub_81260D8: @ 81260D8
 	.align 2, 0
 _08126120: .4byte gStringVar2
 _08126124: .4byte gUnknown_203B0A0
-_08126128: .4byte gUnknown_8247094
+_08126128: .4byte gMoveNames
 _0812612C: .4byte gStringVar4
 _08126130: .4byte gUnknown_8416E6B
 _08126134: .4byte gTasks
@@ -15044,7 +15044,7 @@ _081261AE:
 	ldrsh r2, [r7, r1]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _081261FC @ =gUnknown_8247094
+	ldr r2, _081261FC @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	ldr r4, _08126200 @ =gStringVar4
@@ -15069,7 +15069,7 @@ _081261AE:
 	.align 2, 0
 _081261F4: .4byte gStringVar1
 _081261F8: .4byte gStringVar2
-_081261FC: .4byte gUnknown_8247094
+_081261FC: .4byte gMoveNames
 _08126200: .4byte gStringVar4
 _08126204: .4byte gUnknown_8416E84
 _08126208: .4byte gTasks
@@ -15105,7 +15105,7 @@ _0812623A:
 	ldrsh r2, [r1, r3]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _0812627C @ =gUnknown_8247094
+	ldr r2, _0812627C @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	ldr r0, _08126280 @ =gUnknown_8416DF7
@@ -15125,7 +15125,7 @@ _0812626A:
 _08126270: .4byte gStringVar1
 _08126274: .4byte gStringVar2
 _08126278: .4byte gUnknown_203B0A0
-_0812627C: .4byte gUnknown_8247094
+_0812627C: .4byte gMoveNames
 _08126280: .4byte gUnknown_8416DF7
 _08126284: .4byte gTasks
 _08126288: .4byte sub_8125D88
@@ -15754,7 +15754,7 @@ sub_8126770: @ 8126770
 	ldrh r2, [r6]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _081267F0 @ =gUnknown_8247094
+	ldr r2, _081267F0 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	ldr r4, _081267F4 @ =gStringVar4
@@ -15787,7 +15787,7 @@ _081267E0: .4byte gPlayerParty
 _081267E4: .4byte gStringVar1
 _081267E8: .4byte gStringVar2
 _081267EC: .4byte gMoveToLearn
-_081267F0: .4byte gUnknown_8247094
+_081267F0: .4byte gMoveNames
 _081267F4: .4byte gStringVar4
 _081267F8: .4byte gUnknown_8416DF7
 _081267FC: .4byte gTasks
@@ -15818,7 +15818,7 @@ sub_8126804: @ 8126804
 	ldr r0, _0812687C @ =gStringVar2
 	movs r1, 0xD
 	muls r1, r5
-	ldr r2, _08126880 @ =gUnknown_8247094
+	ldr r2, _08126880 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	ldr r4, _08126884 @ =gStringVar4
@@ -15849,7 +15849,7 @@ _08126870: .4byte gUnknown_203B0A0
 _08126874: .4byte gPlayerParty
 _08126878: .4byte gStringVar1
 _0812687C: .4byte gStringVar2
-_08126880: .4byte gUnknown_8247094
+_08126880: .4byte gMoveNames
 _08126884: .4byte gStringVar4
 _08126888: .4byte gUnknown_8416DB3
 _0812688C: .4byte gTasks
@@ -16556,7 +16556,7 @@ sub_8126DC8: @ 8126DC8
 	ldrsh r2, [r7, r1]
 	movs r1, 0xD
 	muls r1, r2
-	ldr r2, _08126E64 @ =gUnknown_8247094
+	ldr r2, _08126E64 @ =gMoveNames
 	adds r1, r2
 	bl StringCopy
 	movs r0, 0x2
@@ -16589,7 +16589,7 @@ _08126E54: .4byte gPlayerParty
 _08126E58: .4byte gStringVar1
 _08126E5C: .4byte gSpecialVar_0x8005
 _08126E60: .4byte gStringVar2
-_08126E64: .4byte gUnknown_8247094
+_08126E64: .4byte gMoveNames
 _08126E68: .4byte 0xffff0000
 _08126E6C:
 	ldr r1, _08126E70 @ =gUnknown_8416DC2