Merge pull request #2 from pret/master

Taking files

1 files changed, 36 insertions, 36 deletions

diff --git a/asm/tm_case.s b/asm/tm_case.s
index 76c0a384e..1539343e8 100644
--- a/asm/tm_case.s
+++ b/asm/tm_case.s
@@ -704,7 +704,7 @@ _08131DC4:
 	lsrs r0, 16
 	movs r1, 0xD
 	muls r1, r0
-	ldr r0, _08131E14 @ =gUnknown_8247094
+	ldr r0, _08131E14 @ =gMoveNames
 	adds r1, r0
 	adds r0, r4, 0
 	bl StringAppend
@@ -721,7 +721,7 @@ _08131E04: .4byte 0xfffffee0
 _08131E08: .4byte gStringVar4
 _08131E0C: .4byte gUnknown_846317C
 _08131E10: .4byte gUnknown_8416703
-_08131E14: .4byte gUnknown_8247094
+_08131E14: .4byte gMoveNames
 	thumb_func_end sub_8131D48
 
 	thumb_func_start sub_8131E18
@@ -963,7 +963,7 @@ sub_8131FB0: @ 8131FB0
 	bl CopyWindowToVram
 	b _0813200A
 _08131FF4:
-	ldr r2, _08132014 @ =gUnknown_841623B
+	ldr r2, _08132014 @ =gFameCheckerText_ListMenuCursor
 	str r5, [sp]
 	movs r0, 0
 	str r0, [sp, 0x4]
@@ -979,7 +979,7 @@ _0813200A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08132014: .4byte gUnknown_841623B
+_08132014: .4byte gFameCheckerText_ListMenuCursor
 	thumb_func_end sub_8131FB0
 
 	thumb_func_start sub_8132018
@@ -1314,7 +1314,7 @@ sub_813226C: @ 813226C
 	lsls r0, 3
 	ldr r1, _081322A4 @ =gTasks+0x8
 	adds r2, r0, r1
-	ldr r0, _081322A8 @ =gUnknown_2037AB8
+	ldr r0, _081322A8 @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
 	ands r0, r1
@@ -1334,7 +1334,7 @@ sub_813226C: @ 813226C
 	b _081322BE
 	.align 2, 0
 _081322A4: .4byte gTasks+0x8
-_081322A8: .4byte gUnknown_2037AB8
+_081322A8: .4byte gPaletteFade
 _081322AC: .4byte gUnknown_203B116
 _081322B0: .4byte gUnknown_203B118
 _081322B4:
@@ -1365,7 +1365,7 @@ sub_81322D4: @ 81322D4
 	lsls r0, 3
 	ldr r1, _08132340 @ =gTasks+0x8
 	adds r6, r0, r1
-	ldr r0, _08132344 @ =gUnknown_2037AB8
+	ldr r0, _08132344 @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
 	ands r0, r1
@@ -1400,16 +1400,16 @@ sub_81322D4: @ 81322D4
 	bne _08132354
 	movs r0, 0x5
 	bl PlaySE
-	ldr r0, _08132350 @ =gUnknown_203AD30
+	ldr r0, _08132350 @ =gSpecialVar_ItemId
 	mov r1, r8
 	strh r1, [r0]
 	b _08132370
 	.align 2, 0
 _08132340: .4byte gTasks+0x8
-_08132344: .4byte gUnknown_2037AB8
+_08132344: .4byte gPaletteFade
 _08132348: .4byte gUnknown_203B116
 _0813234C: .4byte gMain
-_08132350: .4byte gUnknown_203AD30
+_08132350: .4byte gSpecialVar_ItemId
 _08132354:
 	movs r0, 0x2
 	negs r0, r0
@@ -1422,7 +1422,7 @@ _08132354:
 _08132364:
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, _08132378 @ =gUnknown_203AD30
+	ldr r1, _08132378 @ =gSpecialVar_ItemId
 	movs r0, 0
 	strh r0, [r1]
 _08132370:
@@ -1430,7 +1430,7 @@ _08132370:
 	bl sub_8132230
 	b _081323C8
 	.align 2, 0
-_08132378: .4byte gUnknown_203AD30
+_08132378: .4byte gSpecialVar_ItemId
 _0813237C:
 	movs r0, 0x5
 	bl PlaySE
@@ -1450,7 +1450,7 @@ _0813237C:
 	movs r0, 0x4
 	adds r1, r4, 0
 	bl sub_809A798
-	ldr r1, _081323D4 @ =gUnknown_203AD30
+	ldr r1, _081323D4 @ =gSpecialVar_ItemId
 	strh r0, [r1]
 	ldr r0, _081323D8 @ =gTasks
 	lsls r1, r7, 2
@@ -1471,7 +1471,7 @@ _081323C8:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_081323D4: .4byte gUnknown_203AD30
+_081323D4: .4byte gSpecialVar_ItemId
 _081323D8: .4byte gTasks
 _081323DC: .4byte gUnknown_8463140
 _081323E0: .4byte gUnknown_203B10C
@@ -1591,7 +1591,7 @@ _08132468:
 	lsls r0, 1
 	bl Alloc
 	adds r4, r0, 0
-	ldr r6, _08132558 @ =gUnknown_203AD30
+	ldr r6, _08132558 @ =gSpecialVar_ItemId
 	ldrh r1, [r6]
 	bl sub_8131D48
 	ldr r1, _0813255C @ =gUnknown_8416301
@@ -1643,7 +1643,7 @@ _08132528:
 _0813254C: .4byte gUnknown_203B118
 _08132550: .4byte gUnknown_846316B
 _08132554: .4byte gUnknown_8463150
-_08132558: .4byte gUnknown_203AD30
+_08132558: .4byte gSpecialVar_ItemId
 _0813255C: .4byte gUnknown_8416301
 _08132560: .4byte gTasks
 _08132564: .4byte sub_8132568
@@ -1852,7 +1852,7 @@ sub_8132714: @ 8132714
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r0, _08132744 @ =gUnknown_203AD30
+	ldr r0, _08132744 @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _08132748 @ =gStringVar1
 	bl sub_8099E90
@@ -1869,7 +1869,7 @@ sub_8132714: @ 8132714
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08132744: .4byte gUnknown_203AD30
+_08132744: .4byte gSpecialVar_ItemId
 _08132748: .4byte gStringVar1
 _0813274C: .4byte gStringVar4
 _08132750: .4byte gUnknown_841635E
@@ -2085,7 +2085,7 @@ sub_8132908: @ 8132908
 	lsls r0, 3
 	ldr r1, _08132950 @ =gTasks+0x8
 	adds r4, r0, r1
-	ldr r6, _08132954 @ =gUnknown_203AD30
+	ldr r6, _08132954 @ =gSpecialVar_ItemId
 	ldrh r0, [r6]
 	bl itemid_get_market_price
 	lsls r0, 16
@@ -2109,7 +2109,7 @@ sub_8132908: @ 8132908
 	b _081329AE
 	.align 2, 0
 _08132950: .4byte gTasks+0x8
-_08132954: .4byte gUnknown_203AD30
+_08132954: .4byte gSpecialVar_ItemId
 _08132958: .4byte gStringVar1
 _0813295C: .4byte gStringVar4
 _08132960: .4byte gUnknown_84168F1
@@ -2503,7 +2503,7 @@ sub_8132CAC: @ 8132CAC
 	bl PutWindowTilemap
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
-	ldr r0, _08132D1C @ =gUnknown_203AD30
+	ldr r0, _08132D1C @ =gSpecialVar_ItemId
 	ldrh r0, [r0]
 	ldr r1, _08132D20 @ =gStringVar1
 	bl sub_8099E90
@@ -2537,7 +2537,7 @@ sub_8132CAC: @ 8132CAC
 	bx r0
 	.align 2, 0
 _08132D18: .4byte gTasks+0x8
-_08132D1C: .4byte gUnknown_203AD30
+_08132D1C: .4byte gSpecialVar_ItemId
 _08132D20: .4byte gStringVar1
 _08132D24: .4byte gStringVar3
 _08132D28: .4byte gStringVar4
@@ -2564,7 +2564,7 @@ sub_8132D34: @ 8132D34
 	mov r8, r1
 	movs r0, 0xF8
 	bl PlaySE
-	ldr r5, _08132DF8 @ =gUnknown_203AD30
+	ldr r5, _08132DF8 @ =gSpecialVar_ItemId
 	ldrh r0, [r5]
 	mov r2, r8
 	ldrh r1, [r2, 0x10]
@@ -2632,7 +2632,7 @@ sub_8132D34: @ 8132D34
 	bx r0
 	.align 2, 0
 _08132DF4: .4byte gTasks+0x8
-_08132DF8: .4byte gUnknown_203AD30
+_08132DF8: .4byte gSpecialVar_ItemId
 _08132DFC: .4byte gSaveBlock1Ptr
 _08132E00: .4byte gUnknown_203B116
 _08132E04: .4byte gUnknown_3005E70
@@ -2770,7 +2770,7 @@ sub_8132F20: @ 8132F20
 	lsls r3, r1, 3
 	ldr r4, _08132F54 @ =gTasks+0x8
 	adds r2, r3, r4
-	ldr r0, _08132F58 @ =gUnknown_2037AB8
+	ldr r0, _08132F58 @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
 	ands r0, r1
@@ -2791,7 +2791,7 @@ _08132F4E:
 	bx r0
 	.align 2, 0
 _08132F54: .4byte gTasks+0x8
-_08132F58: .4byte gUnknown_2037AB8
+_08132F58: .4byte gPaletteFade
 _08132F5C: .4byte sub_8132F60
 	thumb_func_end sub_8132F20
 
@@ -2873,7 +2873,7 @@ _08133008:
 	.align 2, 0
 _08133020: .4byte 0xffff8405
 _08133024:
-	ldr r0, _0813304C @ =gUnknown_2037AB8
+	ldr r0, _0813304C @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
 	ands r0, r1
@@ -2895,7 +2895,7 @@ _08133046:
 	strh r1, [r6, 0x12]
 	b _081331EA
 	.align 2, 0
-_0813304C: .4byte gUnknown_2037AB8
+_0813304C: .4byte gPaletteFade
 _08133050:
 	movs r0, 0x12
 	ldrsh r1, [r6, r0]
@@ -3035,7 +3035,7 @@ _0813315C:
 	.align 2, 0
 _0813316C: .4byte gMain
 _08133170:
-	ldr r0, _081331F4 @ =gUnknown_2037AB8
+	ldr r0, _081331F4 @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
 	ands r0, r1
@@ -3075,8 +3075,8 @@ _08133170:
 	ldrh r1, [r1]
 	strh r1, [r2, 0xA]
 	bl Free
-	ldr r0, _08133208 @ =gUnknown_20375F8
-	ldr r1, _0813320C @ =gUnknown_20371F8
+	ldr r0, _08133208 @ =gPlttBufferFaded
+	ldr r1, _0813320C @ =gPlttBufferUnfaded
 	movs r2, 0x80
 	lsls r2, 1
 	bl CpuFastSet
@@ -3095,15 +3095,15 @@ _081331EA:
 	strh r0, [r6, 0x10]
 	b _08133232
 	.align 2, 0
-_081331F4: .4byte gUnknown_2037AB8
+_081331F4: .4byte gPaletteFade
 _081331F8: .4byte gSaveBlock1Ptr
 _081331FC: .4byte 0x00000464
 _08133200: .4byte gUnknown_203B11C
 _08133204: .4byte gUnknown_203B10C
-_08133208: .4byte gUnknown_20375F8
-_0813320C: .4byte gUnknown_20371F8
+_08133208: .4byte gPlttBufferFaded
+_0813320C: .4byte gPlttBufferUnfaded
 _08133210:
-	ldr r0, _0813323C @ =gUnknown_2037AB8
+	ldr r0, _0813323C @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
 	ands r0, r1
@@ -3122,7 +3122,7 @@ _08133232:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0813323C: .4byte gUnknown_2037AB8
+_0813323C: .4byte gPaletteFade
 _08133240: .4byte gUnknown_203B10C
 	thumb_func_end sub_8132F60