3 files changed, 77 insertions, 15 deletions
diff --git a/data/data1.s b/data/data1.s
index b9a4e49ad..7f489f35d 100644
--- a/data/data1.s
+++ b/data/data1.s
@@ -3193,10 +3193,22 @@ Route109_EventScript_1A010C:: @ 81A010C
 	setvar 0x4096, 0
 	return
 
-	.global gUnknown_081A0117
-gUnknown_081A0117: @ 81A0117
-
-	.incbin "baserom.gba", 0x1a0117, 0x37
+UseSurfScript:: @ 81A0117
+	checkattack MOVE_SURF
+	compare RESULT, 6
+	jumpeq UseSurfScript_NoMon
+	bufferpartypoke 0, RESULT
+	setanimation 0, RESULT
+	lockall
+	msgbox UseSurfPromptText, 5
+	compare RESULT, 0
+	jumpeq UseSurfScript_No
+	msgbox UsedSurfText, 4
+	doanimation 0x9
+UseSurfScript_No: @ 81A014C
+	releaseall
+UseSurfScript_NoMon: @ 81A014D
+	end
 
 EverGrandeCity_ChampionsRoom_EventScript_1A014E:: @ 81A014E
 LavaridgeTown_EventScript_1A014E:: @ 81A014E
@@ -4459,7 +4471,12 @@ OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
 	.string "While infected, POKéMON are said to\n"
 	.string "grow exceptionally well.$"
 
-	.incbin "baserom.gba", 0x1a1344, 0x47
+UseSurfPromptText: @ 81A1344
+	.string "The water is dyed a deep blue...\n"
+	.string "Would you like to SURF?$"
+
+UsedSurfText: @ 81A137D
+	.string "{STR_VAR_1} used SURF!$"
 
 	.include "data/maps/text/SealedChamber_InnerRoom.s"
 	.include "data/maps/text/AncientTomb.s"
@@ -9890,13 +9907,39 @@ FieryPath_EventScript_1B103A:: @ 81B103A
 	end
 
 	.include "data/maps/text/FieryPath.s"
-	.global gUnknown_081B115A
-gUnknown_081B115A: @ 81B115A
-	.incbin "baserom.gba", 0x001b115a, 0x3a
 
-	.global gUnknown_081B1194
-gUnknown_081B1194: @ 81B1194
-	.incbin "baserom.gba", 0x001b1194, 0x8c
+UseWaterfallScript:: @ 81B115A
+	lockall
+	checkattack MOVE_WATERFALL
+	compare RESULT, 6
+	jumpeq UseWaterfallScript_NoMon
+	bufferpartypoke 0, RESULT
+	setanimation 0, RESULT
+	msgbox UseWaterfallPromptText, 5
+	compare RESULT, 0
+	jumpeq WaterfallScript_Done
+	msgbox UsedWaterfallText, 4
+	doanimation 0x2B
+	jump WaterfallScript_Done
+
+WaterfallScript:: @ 81B1194
+	lockall
+UseWaterfallScript_NoMon: @ 81B1195
+	msgbox WaterfallText, 4
+WaterfallScript_Done:  @ 81B119D
+	releaseall
+	end
+
+WaterfallText: @ 81B119F
+	.string "A wall of water is crashing down with\n"
+	.string "a mighty roar.$"
+
+UseWaterfallPromptText: @ 81B11D4
+	.string "It’s a large waterfall.\n"
+	.string "Would you like to use WATERFALL?$"
+
+UsedWaterfallText: @ 81B120D
+	.string "{STR_VAR_1} used WATERFALL.$"
 
 	.global gUnknown_081B1220
 gUnknown_081B1220: @ 81B1220
diff --git a/data/data2.s b/data/data2.s
index d83c82127..7d8a78d47 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -13186,11 +13186,27 @@ gUnknown_08406334: @ 8406334
 
 	.global gUnknown_0840633A
 gUnknown_0840633A: @ 840633A
-	.incbin "baserom.gba", 0x0040633a, 0x63a
+	.incbin "baserom.gba", 0x0040633a, 0x46
+	.incbin "graphics/intro/intro.4bpp.lz"
 
 	.global gUnknown_08406974
 gUnknown_08406974: @ 8406974
-	.incbin "baserom.gba", 0x00406974, 0x200
+	.incbin "graphics/intro/intro1_bgpal1.gbapal"
+	.incbin "graphics/intro/intro1_bgpal2.gbapal"
+	.incbin "graphics/intro/intro1_bgpal3.gbapal"
+	.incbin "graphics/intro/intro1_bgpal4.gbapal"
+	.incbin "graphics/intro/intro1_bgpal5.gbapal"
+	.incbin "graphics/intro/intro1_bgpal6.gbapal"
+	.incbin "graphics/intro/intro1_bgpal7.gbapal"
+	.incbin "graphics/intro/intro1_bgpal8.gbapal"
+	.incbin "graphics/intro/intro1_bgpal9.gbapal"
+	.incbin "graphics/intro/intro1_bgpal10.gbapal"
+	.incbin "graphics/intro/intro1_bgpal11.gbapal"
+	.incbin "graphics/intro/intro1_bgpal12.gbapal"
+	.incbin "graphics/intro/intro1_bgpal13.gbapal"
+	.incbin "graphics/intro/intro1_bgpal14.gbapal"
+	.incbin "graphics/intro/intro1_bgpal15.gbapal"
+	.incbin "graphics/intro/intro1_bgpal16.gbapal"
 
 	.global gUnknown_08406B74
 gUnknown_08406B74: @ 8406B74
@@ -13210,7 +13226,8 @@ gUnknown_0840754C: @ 840754C
 
 	.global gUnknown_08407764
 gUnknown_08407764: @ 8407764
-	.incbin "baserom.gba", 0x00407764, 0x2170
+@ replacing .incbin "baserom.gba", 0x00407764, 0x2170
+	.incbin "graphics/intro/introgfx.4bpp.lz"
 
 	.global gUnknown_084098D4
 gUnknown_084098D4: @ 84098D4
diff --git a/data/graphics.s b/data/graphics.s
index 717007b9b..a8f2cdf68 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -122,7 +122,9 @@ gInterfacePal_PremierBall:
 
 	.global gUnknown_08D030D0
 gUnknown_08D030D0: @ 8D030D0
-	.incbin "baserom.gba", 0xD030D0, 0x6B78
+	.incbin "graphics/interface/ball_open.4bpp.lz"
+	.incbin "graphics/interface/blank.4bpp.lz"
+	.incbin "baserom.gba", 0x00d03248, 0x6A00
 
 	.global gUnknown_08D09C48
 gUnknown_08D09C48: @ 8D09C48