Merge branch 'master' into link

6 files changed, 25 insertions, 59 deletions

diff --git a/data/data4c.s b/data/data4c.s
index b86cd2add..c18d0d592 100644
--- a/data/data4c.s
+++ b/data/data4c.s
@@ -5,39 +5,6 @@
 
 	.section .rodata
 
-gUnknown_085B21D4:: @ 85B21D4
-	.incbin "baserom.gba", 0x5b21d4, 0x8
-
-gUnknown_085B21DC:: @ 85B21DC
-	.incbin "baserom.gba", 0x5b21dc, 0x18
-
-gUnknown_085B21F4:: @ 85B21F4
-	.incbin "baserom.gba", 0x5b21f4, 0x8
-
-gUnknown_085B21FC:: @ 85B21FC
-	.incbin "baserom.gba", 0x5b21fc, 0xc
-
-gUnknown_085B2208:: @ 85B2208
-	.incbin "baserom.gba", 0x5b2208, 0x10
-
-gUnknown_085B2218:: @ 85B2218
-	.incbin "baserom.gba", 0x5b2218, 0x38
-
-gUnknown_085B2250:: @ 85B2250
-	.incbin "baserom.gba", 0x5b2250, 0x18
-
-gUnknown_085B2268:: @ 85B2268
-	.incbin "baserom.gba", 0x5b2268, 0x38
-
-gUnknown_085B22A0:: @ 85B22A0
-	.incbin "baserom.gba", 0x5b22a0, 0x18
-
-gUnknown_085B22B8:: @ 85B22B8
-	.incbin "baserom.gba", 0x5b22b8, 0x18
-
-gUnknown_085B22D0:: @ 85B22D0
-	.incbin "baserom.gba", 0x5b22d0, 0x2d0
-
 gPokeblockFlavorCompatibilityTable:: @ 85B25A0
 	.incbin "baserom.gba", 0x5b25a0, 0x80
 
diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/scripts/maps/BattleFrontier_Lounge2.inc
index 6b43747cc..bd20f13ac 100644
--- a/data/scripts/maps/BattleFrontier_Lounge2.inc
+++ b/data/scripts/maps/BattleFrontier_Lounge2.inc
@@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F
 	end
 
 BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
-	compare_var_to_value VAR_0x402F, 0
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 0
 	call_if 1, BattleFrontier_Lounge2_EventScript_26070A
-	compare_var_to_value VAR_0x402F, 1
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 1
 	call_if 1, BattleFrontier_Lounge2_EventScript_26070F
-	compare_var_to_value VAR_0x402F, 2
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 2
 	call_if 1, BattleFrontier_Lounge2_EventScript_260714
-	compare_var_to_value VAR_0x402F, 3
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3
 	call_if 1, BattleFrontier_Lounge2_EventScript_260719
-	compare_var_to_value VAR_0x402F, 4
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4
 	call_if 1, BattleFrontier_Lounge2_EventScript_26071E
-	compare_var_to_value VAR_0x402F, 5
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 5
 	call_if 1, BattleFrontier_Lounge2_EventScript_260723
-	compare_var_to_value VAR_0x402F, 6
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 6
 	call_if 1, BattleFrontier_Lounge2_EventScript_260728
-	compare_var_to_value VAR_0x402F, 7
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 7
 	call_if 1, BattleFrontier_Lounge2_EventScript_26072D
-	compare_var_to_value VAR_0x402F, 8
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 8
 	call_if 1, BattleFrontier_Lounge2_EventScript_260732
-	compare_var_to_value VAR_0x402F, 9
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 9
 	call_if 1, BattleFrontier_Lounge2_EventScript_260737
-	compare_var_to_value VAR_0x402F, 3
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3
 	call_if 3, BattleFrontier_Lounge2_EventScript_2606F8
-	compare_var_to_value VAR_0x402F, 4
+	compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4
 	call_if 4, BattleFrontier_Lounge2_EventScript_260701
 	special sub_8139F20
 	waitmessage
diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc
index 0612ccb8e..5fb7a8367 100644
--- a/data/scripts/maps/BattleFrontier_Lounge3.inc
+++ b/data/scripts/maps/BattleFrontier_Lounge3.inc
@@ -32,7 +32,7 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
 
 BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9
 	multichoice 20, 4, 87, 0
-	copyvar VAR_0x4032, VAR_RESULT
+	copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
 	switch VAR_RESULT
 	case 0, BattleFrontier_Lounge3_EventScript_261E30
 	case 1, BattleFrontier_Lounge3_EventScript_261E3B
@@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
 	copyvar VAR_0x8004, VAR_0x8008
 	special sub_813A9A4
-	setvar VAR_0x4033, 1
+	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
 	special sub_813A8FC
 	playse SE_REGI
 	msgbox BattleFrontier_Lounge3_Text_262BE0, 4
@@ -113,37 +113,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
 
 BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
 	msgbox BattleFrontier_Lounge3_Text_26346B, 4
-	compare_var_to_value VAR_0x4033, 1
+	compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
 	goto_if 4, BattleFrontier_Lounge3_EventScript_261F12
 	goto BattleFrontier_Lounge3_EventScript_261DAF
 	end
 
 BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
-	compare_var_to_value VAR_0x4033, 1
+	compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
 	goto_eq BattleFrontier_Lounge3_EventScript_261F9E
-	compare_var_to_value VAR_0x4033, 2
+	compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2
 	goto_eq BattleFrontier_Lounge3_EventScript_261F2E
 	goto BattleFrontier_Lounge3_EventScript_261F71
 	end
 
 BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
 	msgbox BattleFrontier_Lounge3_Text_263334, 4
-	compare_var_to_value VAR_0x4032, 0
+	compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0
 	call_if 1, BattleFrontier_Lounge3_EventScript_261F80
-	compare_var_to_value VAR_0x4032, 1
+	compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1
 	call_if 1, BattleFrontier_Lounge3_EventScript_261F8A
-	compare_var_to_value VAR_0x4032, 2
+	compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2
 	call_if 1, BattleFrontier_Lounge3_EventScript_261F94
 	msgbox BattleFrontier_Lounge3_Text_2633D4, 9
 	special sub_813A9D0
 	msgbox BattleFrontier_Lounge3_Text_2633F2, 4
-	setvar VAR_0x4033, 0
+	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
 	release
 	end
 
 BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71
 	msgbox BattleFrontier_Lounge3_Text_263298, 4
-	setvar VAR_0x4033, 0
+	setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
 	release
 	end
 
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 85952d9f0..05d93c35d 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -114,7 +114,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F
 
 LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849
 	fadescreen 1
-	special Special_StartWallClock
+	special StartWallClock
 	waitstate
 	return
 
diff --git a/data/specials.inc b/data/specials.inc
index bb91806b8..3428e7e08 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -164,7 +164,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_8138B8C
 	def_special sub_814FC9C
 	def_special sub_8085784
-	def_special Special_StartWallClock
+	def_special StartWallClock
 	def_special Special_ViewWallClock
 	def_special sub_80B1138
 	def_special sub_80B086C
diff --git a/data/starter_choose.s b/data/starter_choose.s
index ae81aae20..a951a8987 100644
--- a/data/starter_choose.s
+++ b/data/starter_choose.s
@@ -63,5 +63,4 @@ sSpriteTemplate_PokeBall:: @ 85B1F28
 	.incbin "baserom.gba", 0x5b1f28, 0x18
 
 gUnknown_085B1F40:: @ 85B1F40
-	.incbin "baserom.gba", 0x5b1f40, 0x294
-
+	.incbin "baserom.gba", 0x5b1f40, 0x18