8 files changed, 28 insertions, 27 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index f65807005..32d8e6da5 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -690,7 +690,7 @@ BattleScript_1D7377: @ 81D7377
 	resultmessage
 	waitmessage 64
 	jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396
-	copyarray 0x30041c0, 0x20160e0, 6
+	copyarray gUnknown_030041C0, 0x20160e0, 6
 	printstring BATTLE_TEXT_HitMulti
 	waitmessage 64
 
@@ -1493,7 +1493,7 @@ BattleScript_1D7C90: @ 81D7C90
 	resultmessage
 	waitmessage 64
 	jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF
-	copyarray 0x30041c0, 0x20160e0, 6
+	copyarray gUnknown_030041C0, 0x20160e0, 6
 	printstring BATTLE_TEXT_HitMulti
 	waitmessage 64
 
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 4bee5101c..0ed54d11e 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -38,7 +38,7 @@ gUnknown_081D9E98:: @ 81D9E98
 	.4byte BattleScript_1DA00A
 
 BattleScript_1D9EA8: @ 81D9EA8
-	jumpifhalfword 4, 0x20239f8, 512, BattleScript_1D9EB8
+	jumpifhalfword 4, gBattleTypeFlags, 512, BattleScript_1D9EB8
 	printstring BATTLE_TEXT_Used1
 	pokemoncatchfunction
 
@@ -52,7 +52,7 @@ BattleScript_1D9EBC: @ 81D9EBC
 	pokemoncatchfunction
 
 gUnknown_081D9EC2:: @ 81D9EC2
-	jumpifhalfword 0, 0x2024c04, 5, BattleScript_1D9ED0
+	jumpifhalfword 0, gUnknown_02024C04, 5, BattleScript_1D9ED0
 	atk60 11
 
 BattleScript_1D9ED0: @ 81D9ED0
@@ -60,35 +60,35 @@ BattleScript_1D9ED0: @ 81D9ED0
 	capturesomethingf1 BattleScript_1D9EE3
 	printstring BATTLE_TEXT_AddedToDex
 	waitstateatk
-	setbyte 0x2024d1e, 0
+	setbyte gUnknown_02024D1E, 0
 	capturesomethingf2
 
 BattleScript_1D9EE3: @ 81D9EE3
 	printstring BATTLE_TEXT_GiveNickname
 	waitstateatk
-	setbyte 0x2024d1e, 0
+	setbyte gUnknown_02024D1E, 0
 	capturesomethingf3 BattleScript_1D9EF8
 	printstring BATTLE_TEXT_SentToPC
 	waitmessage 64
 
 BattleScript_1D9EF8: @ 81D9EF8
 	catchpoke
-	setbyte 0x2024d26, 7
+	setbyte gUnknown_02024D26, 7
 	activesidesomething
 
 gUnknown_081D9F00:: @ 81D9F00
 	printstring BATTLE_TEXT_BallCaught2
-	setbyte 0x2024d26, 7
+	setbyte gUnknown_02024D26, 7
 	activesidesomething
 
 gUnknown_081D9F0A:: @ 81D9F0A
 	printfromtable BattleTextList_4015E6
 	waitmessage 64
-	jumpifbyte 5, 0x20239f8, 128, BattleScript_1D9F34
-	jumpifbyte 1, 0x2038808, 0, BattleScript_1D9F34
+	jumpifbyte 5, gBattleTypeFlags, 128, BattleScript_1D9F34
+	jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34
 	printstring BATTLE_TEXT_SafariOver
 	waitmessage 64
-	setbyte 0x2024d26, 8
+	setbyte gUnknown_02024D26, 8
 
 BattleScript_1D9F34: @ 81D9F34
 	atkf6
@@ -112,7 +112,7 @@ BattleScript_1D9F4F: @ 81D9F4F
 	printstring BATTLE_TEXT_Used2
 	waitmessage 64
 	atk75
-	orword 0x2024c6c, 0x100
+	orword gUnknown_02024C6C, 0x100
 	graphicalhpupdate USER
 	datahpupdate USER
 	printstring BATTLE_TEXT_RestoredHealth
@@ -161,7 +161,7 @@ BattleScript_1D9FBB: @ 81D9FBB
 
 BattleScript_1D9FDA: @ 81D9FDA
 	atk54 17
-	setbyte 0x2024d26, 4
+	setbyte gUnknown_02024D26, 4
 	activesidesomething
 
 BattleScript_1D9FE4: @ 81D9FE4
diff --git a/data/data2.s b/data/data2.s
index e5802a44f..fd1fcc0a4 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -907,37 +907,37 @@ gUnknown_081F9674:: @ 81F9674
 
 	.align 2
 gUnknown_081F9680:: @ 81F9680
-	.4byte 0x030041D0
+	.4byte gUnknown_030041D0
 	.2byte 0x20
 	.byte 0x13
 	.byte 0x10
 	.4byte BG_VRAM + 0xE104
 
-	.4byte 0x03004250
+	.4byte gUnknown_03004250
 	.2byte 0x40
 	.byte 0x13
 	.byte 0x10
 	.4byte BG_VRAM + 0xF104
 
-	.4byte 0x030041D0
+	.4byte gUnknown_030041D0
 	.2byte 0x60
 	.byte 0x13
 	.byte 0x30
 	.4byte BG_VRAM + 0xE204
 
-	.4byte 0x03004250
+	.4byte gUnknown_03004250
 	.2byte 0x80
 	.byte 0x13
 	.byte 0x30
 	.4byte BG_VRAM + 0xF204
 
-	.4byte 0x030041D0
+	.4byte gUnknown_030041D0
 	.2byte 0x20
 	.byte 0x13
 	.byte 0x18
 	.4byte BG_VRAM + 0xE1C4
 
-	.4byte 0x03004250
+	.4byte gUnknown_03004250
 	.2byte 0x40
 	.byte 0x13
 	.byte 0x18
diff --git a/data/decoration.s b/data/decoration.s
index 0ca44c847..d37e41823 100644
--- a/data/decoration.s
+++ b/data/decoration.s
@@ -169,7 +169,7 @@ gSpriteAnimTable_83EC930:: @ 83EC930
 
 	.align 2
 gSpriteImageTable_83EC934: @ 83EC934
-	obj_frame_tiles 0x02038984, 0x800
+	obj_frame_tiles gUnknown_02038900+0x84, 0x800
 
 	.align 2
 gSpriteTemplate_83EC93C:: @ 83EC93C
@@ -177,7 +177,7 @@ gSpriteTemplate_83EC93C:: @ 83EC93C
 
 	.align 2
 gUnknown_083EC954:: @ 83EC954
-	obj_pal 0x02039184, 3000
+	obj_pal gUnknown_02038900+0x884, 3000
 
 	.align 2
 gUnknown_083EC95C:: @ 83EC95C
diff --git a/data/menu_cursor.s b/data/menu_cursor.s
index 0e12c519c..f3c5fe956 100644
--- a/data/menu_cursor.s
+++ b/data/menu_cursor.s
@@ -134,11 +134,11 @@ gUnknown_0842F1C0:: @ 842F1C0
 
 	.align 2
 gUnknown_0842F240:: @ 842F240
-	obj_pal 0x0203a360, 0xfff0
+	obj_pal gUnknown_0203A360, 0xfff0
 
 	.align 2
 gUnknown_0842F248:: @ 842F248
-	obj_pal 0x0203a360, 0xfff1
+	obj_pal gUnknown_0203A360, 0xfff1
 
 	.align 2
 gSpriteTemplate_842F250:: @ 842F250
diff --git a/data/record_mixing.s b/data/record_mixing.s
index 329651039..8b46e1ed3 100644
--- a/data/record_mixing.s
+++ b/data/record_mixing.s
@@ -28,11 +28,11 @@ recordMixingEasyChatPairs:: @ 83D027C
 
 	.align 2
 gUnknown_083D0280:: @ 83D0280
-	.4byte 0x02038738
+	.4byte gUnknown_02038738
 
 	.align 2
 gUnknown_083D0284:: @ 83D0284
-	.4byte 0x02024f4c
+	.4byte gSaveBlock2+0xA8
 
 gUnknown_083D0288:: @ 83D0288
 	.byte 1, 0
diff --git a/data/rom_81258BC.s b/data/rom_81258BC.s
index b07fdddf1..7b46c77e7 100644
--- a/data/rom_81258BC.s
+++ b/data/rom_81258BC.s
@@ -689,7 +689,8 @@ gUnknown_08402D08:: @ 8402D08
 	.byte 1, 9, 2, 0
 	.space 8
 
-	.incbin "baserom.gba", 0x402d48, 0x8
+	.4byte 0xFF00FFEF
+	.4byte gTileBuffer
 
 	.align 2
 gOamData_8402D50:: @ 8402D50
diff --git a/data/weather.s b/data/weather.s
index 814030248..44ef8a8da 100644
--- a/data/weather.s
+++ b/data/weather.s
@@ -40,7 +40,7 @@ gUnknown_08396FA8:: @ 8396FA8
 
 	.align 2
 gUnknown_08396FC4:: @ 8396FC4
-	.4byte 0x0202f7e8
+	.4byte gUnknown_0202F7E8
 
 	.align 2
 gUnknown_08396FC8:: @ 8396FC8