4 files changed, 155 insertions, 5 deletions
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index 0d058b2d5..e141634eb 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -101,20 +101,20 @@ CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
 	release
 	end
 
-FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8
+FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga:: @ 81ACEB8
 	lock
 	faceplayer
 	famechecker FAMECHECKER_KOGA, 4
 	textcolor 3
-	msgbox gUnknown_81B16A8
+	msgbox PokemonJournal_Text_SpecialFeatureKoga
 	release
 	end
 
-SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3
+SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3
 	lock
 	faceplayer
 	famechecker FAMECHECKER_KOGA, 5
-	msgbox Text_177C47
+	msgbox SafariZone_West_Text_KogaPatrolsSafariEverySoOften
 	release
 	end
 
diff --git a/data/scripts/flavor_text.inc b/data/scripts/flavor_text.inc
new file mode 100644
index 000000000..7ea879b04
--- /dev/null
+++ b/data/scripts/flavor_text.inc
@@ -0,0 +1,113 @@
+@ Flavor text for interacting with various background objects
+
+gUnknown_81A7606:: @ 81A7606
+	msgbox gUnknown_81C0DB0, MSGBOX_SIGN
+	end
+
+gUnknown_81A760F:: @ 81A760F
+	msgbox gUnknown_81C0DFD, MSGBOX_SIGN
+	end
+
+gUnknown_81A7618:: @ 81A7618
+	msgbox gUnknown_81C0F99, MSGBOX_SIGN
+	end
+
+gUnknown_81A7621:: @ 81A7621
+	msgbox gUnknown_81C12A7, MSGBOX_SIGN
+	end
+
+gUnknown_81A762A:: @ 81A762A
+	msgbox gUnknown_81C10C1, MSGBOX_SIGN
+	end
+
+gUnknown_81A7633:: @ 81A7633
+	msgbox gUnknown_81C1273, MSGBOX_SIGN
+	end
+
+gUnknown_81A763C:: @ 81A763C
+	msgbox gUnknown_81C0FD8, MSGBOX_SIGN
+	end
+
+gUnknown_81A7645:: @ 81A7645
+	msgbox gUnknown_81C12D6, MSGBOX_SIGN
+	end
+
+gUnknown_81A764E:: @ 81A764E
+	msgbox gUnknown_81C1300, MSGBOX_SIGN
+	end
+
+gUnknown_81A7657:: @ 81A7657
+	msgbox Text_DishesPlatesNeatlyLinedUp, MSGBOX_SIGN
+	end
+
+gUnknown_81A7660:: @ 81A7660
+	msgbox gUnknown_81C0E40, MSGBOX_SIGN
+	end
+
+gUnknown_81A7669:: @ 81A7669
+	msgbox gUnknown_81C0E73, MSGBOX_SIGN
+	end
+
+gUnknown_81A7672:: @ 81A7672
+	msgbox gUnknown_81C0EAC, MSGBOX_SIGN
+	end
+
+gUnknown_81A767B:: @ 81A767B
+	msgbox gUnknown_81C101B, MSGBOX_SIGN
+	end
+
+gUnknown_81A7684:: @ 81A7684
+	msgbox gUnknown_81C1060, MSGBOX_SIGN
+	end
+
+gUnknown_81A768D:: @ 81A768D
+	msgbox gUnknown_81C109C, MSGBOX_SIGN
+	end
+
+gUnknown_81A7696:: @ 81A7696
+	msgbox gUnknown_81C10FC, MSGBOX_SIGN
+	end
+
+gUnknown_81A769F:: @ 81A769F
+	msgbox gUnknown_81C1134, MSGBOX_SIGN
+	end
+
+gUnknown_81A76A8:: @ 81A76A8
+	msgbox gUnknown_81C116E, MSGBOX_SIGN
+	end
+
+gUnknown_81A76B1:: @ 81A76B1
+	msgbox gUnknown_81C1194, MSGBOX_SIGN
+	end
+
+gUnknown_81A76BA:: @ 81A76BA
+	msgbox gUnknown_81C11BA, MSGBOX_SIGN
+	end
+
+gUnknown_81A76C3:: @ 81A76C3
+	msgbox gUnknown_81C11DC, MSGBOX_SIGN
+	end
+
+gUnknown_81A76CC:: @ 81A76CC
+	msgbox gUnknown_81C1217, MSGBOX_SIGN
+	end
+
+gUnknown_81A76D5:: @ 81A76D5
+	msgbox gUnknown_81C124B, MSGBOX_SIGN
+	end
+
+gUnknown_81A76DE:: @ 81A76DE
+	msgbox gUnknown_81C0ECB, MSGBOX_SIGN
+	end
+
+gUnknown_81A76E7:: @ 81A76E7
+	msgbox gUnknown_81C0EF7, MSGBOX_SIGN
+	end
+
+gUnknown_81A76F0:: @ 81A76F0
+	msgbox gUnknown_81C0F19, MSGBOX_SIGN
+	end
+
+gUnknown_81A76F9:: @ 81A76F9
+	msgbox gUnknown_81C0F59, MSGBOX_SIGN
+	end
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index ed8aef9d4..f6662368c 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -398,7 +398,7 @@ CeruleanCave_B1F_EventScript_ItemUltraBall:: @ 81BEA95
 	finditem ITEM_ULTRA_BALL
 	end
 
-FuchsiaCity_Building1_EventScript_ItemRareCandy:: @ 81BEAA2
+FuchsiaCity_WardensHouse_EventScript_ItemRareCandy:: @ 81BEAA2
 	finditem ITEM_RARE_CANDY
 	end
 
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
new file mode 100644
index 000000000..15c735821
--- /dev/null
+++ b/data/scripts/safari_zone.inc
@@ -0,0 +1,37 @@
+SafariZone_EventScript_OutOfBallsMidBattle:: @ 81BFB87
+	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3
+	special ExitSafariMode
+	setwarp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1
+	end
+
+SafariZone_EventScript_Exit:: @ 81BFB98
+	setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1
+	special ExitSafariMode
+	warp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1
+	waitstate
+	end
+
+SafariZone_EventScript_RetirePrompt:: @ 81BFBAA
+	lockall
+	msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SafariZone_EventScript_Retire
+	releaseall
+	end
+
+SafariZone_EventScript_Retire:: @ 81BFBC0
+	goto SafariZone_EventScript_Exit
+
+SafariZone_EventScript_TimesUp:: @ 81BFBC5
+	lockall
+	playse SE_PINPON
+	msgbox SafariZone_Text_TimesUp
+	goto SafariZone_EventScript_Exit
+	end
+
+SafariZone_EventScript_OutOfBalls:: @ 81BFBD7
+	lockall
+	playse SE_PINPON
+	msgbox SafariZone_Text_OutOfBalls
+	goto SafariZone_EventScript_Exit
+	end