Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

data/maps/FiveIsland_House1/scripts.inc

@@ -1,6 +1,6 @@
-FiveIsland_House1_MapScripts:: @ 8171D56
+FiveIsland_House1_MapScripts::
 	.byte 0
 
-FiveIsland_House1_EventScript_Woman:: @ 8171D57
+FiveIsland_House1_EventScript_Woman::
 	msgbox FiveIsland_House1_Text_HusbandWentOffFishing, MSGBOX_NPC
 	end

data/maps/FiveIsland_House1/text.inc

@@ -1,11 +1,11 @@
-FiveIsland_House1_JPText_HusbandWentOffFishing:: @ 81A3C71
+FiveIsland_House1_JPText_HusbandWentOffFishing::
     .string "こんばんの　おかずは\n"
     .string "ようい　しなくて　いいぞ！\p"
     .string "って　だんなが\n"
     .string "つりに　いったん　だけど‥\l"
     .string "しんじて　いいのかねえ$"
 
-FiveIsland_House1_Text_HusbandWentOffFishing:: @ 81A3CAC
+FiveIsland_House1_Text_HusbandWentOffFishing::
     .string "Don't worry about buying anything\n"
     .string "for dinner tonight!\p"
     .string "…That's what my husband said when\n"