diff --git a/pokeyellow.map b/pokeyellow.map
index 943b01c0..9016eb07 100644
--- a/pokeyellow.map
+++ b/pokeyellow.map
@@ -19613,34 +19613,34 @@ ROMX bank #62:
 	         $53fa = SurfingPikachuObjectCallbacks
 	         $5404 = SurfingMinigameAnimatedObjectFn_nop
 	         $5405 = SurfingPikachuFrames
-	         $543d = Unkn_f943d
-	         $5440 = Unkn_f9440
-	         $5445 = Unkn_f9445
-	         $544a = Unkn_f944a
-	         $544f = Unkn_f944f
-	         $5454 = Unkn_f9454
-	         $5459 = Unkn_f9459
-	         $545e = Unkn_f945e
-	         $5463 = Unkn_f9463
-	         $5468 = Unkn_f9468
-	         $546d = Unkn_f946d
-	         $5472 = Unkn_f9472
-	         $5477 = Unkn_f9477
-	         $547c = Unkn_f947c
-	         $5481 = Unkn_f9481
-	         $5486 = Unkn_f9486
-	         $548b = Unkn_f948b
-	         $5494 = Unkn_f9494
-	         $5499 = Unkn_f9499
-	         $549e = Unkn_f949e
-	         $54a1 = Unkn_f94a1
-	         $54b0 = Unkn_f94b0
-	         $54bf = Unkn_f94bf
-	         $54ce = Unkn_f94ce
-	         $54dd = Unkn_f94dd
-	         $54ec = Unkn_f94ec
-	         $54fb = Unkn_f94fb
-	         $54fe = Unkn_f94fe
+	         $543d = SurfingPikachuFrames.SingleTile
+	         $5440 = SurfingPikachuFrames.SurfingAngle00
+	         $5445 = SurfingPikachuFrames.SurfingAngle01
+	         $544a = SurfingPikachuFrames.SurfingAngle02
+	         $544f = SurfingPikachuFrames.SurfingAngle03
+	         $5454 = SurfingPikachuFrames.SurfingAngle04
+	         $5459 = SurfingPikachuFrames.SurfingAngle05
+	         $545e = SurfingPikachuFrames.SurfingAngle06
+	         $5463 = SurfingPikachuFrames.SurfingAngle07
+	         $5468 = SurfingPikachuFrames.SurfingAngle08
+	         $546d = SurfingPikachuFrames.SurfingAngle09
+	         $5472 = SurfingPikachuFrames.SurfingAngle10
+	         $5477 = SurfingPikachuFrames.SurfingAngle11
+	         $547c = SurfingPikachuFrames.SurfingAngle12
+	         $5481 = SurfingPikachuFrames.SurfingAngle13
+	         $5486 = SurfingPikachuFrames.SmallSplash
+	         $548b = SurfingPikachuFrames.LargeSplash
+	         $5494 = SurfingPikachuFrames.StartText
+	         $5499 = SurfingPikachuFrames.GoalText
+	         $549e = SurfingPikachuFrames.OhNoText
+	         $54a1 = SurfingPikachuFrames.Plus50Pts
+	         $54b0 = SurfingPikachuFrames.Plus150Pts
+	         $54bf = SurfingPikachuFrames.Plus350Pts
+	         $54ce = SurfingPikachuFrames.Plus750Pts
+	         $54dd = SurfingPikachuFrames.Plus180Pts
+	         $54ec = SurfingPikachuFrames.Plus500Pts
+	         $54fb = SurfingPikachuFrames.WaterSpray
+	         $54fe = SurfingPikachuFrames.IntroPikachu
 	         $5507 = SurfingPikachuOAMData
 	         $5573 = SurfingPikachuOAMData.SingleTile
 	         $5578 = SurfingPikachuOAMData.SurfingPikachu
diff --git a/pokeyellow.sym b/pokeyellow.sym
index 868fd5ac..64dd6a03 100644
--- a/pokeyellow.sym
+++ b/pokeyellow.sym
@@ -19216,34 +19216,34 @@
 3e:53fa SurfingPikachuObjectCallbacks
 3e:5404 SurfingMinigameAnimatedObjectFn_nop
 3e:5405 SurfingPikachuFrames
-3e:543d Unkn_f943d
-3e:5440 Unkn_f9440
-3e:5445 Unkn_f9445
-3e:544a Unkn_f944a
-3e:544f Unkn_f944f
-3e:5454 Unkn_f9454
-3e:5459 Unkn_f9459
-3e:545e Unkn_f945e
-3e:5463 Unkn_f9463
-3e:5468 Unkn_f9468
-3e:546d Unkn_f946d
-3e:5472 Unkn_f9472
-3e:5477 Unkn_f9477
-3e:547c Unkn_f947c
-3e:5481 Unkn_f9481
-3e:5486 Unkn_f9486
-3e:548b Unkn_f948b
-3e:5494 Unkn_f9494
-3e:5499 Unkn_f9499
-3e:549e Unkn_f949e
-3e:54a1 Unkn_f94a1
-3e:54b0 Unkn_f94b0
-3e:54bf Unkn_f94bf
-3e:54ce Unkn_f94ce
-3e:54dd Unkn_f94dd
-3e:54ec Unkn_f94ec
-3e:54fb Unkn_f94fb
-3e:54fe Unkn_f94fe
+3e:543d SurfingPikachuFrames.SingleTile
+3e:5440 SurfingPikachuFrames.SurfingAngle00
+3e:5445 SurfingPikachuFrames.SurfingAngle01
+3e:544a SurfingPikachuFrames.SurfingAngle02
+3e:544f SurfingPikachuFrames.SurfingAngle03
+3e:5454 SurfingPikachuFrames.SurfingAngle04
+3e:5459 SurfingPikachuFrames.SurfingAngle05
+3e:545e SurfingPikachuFrames.SurfingAngle06
+3e:5463 SurfingPikachuFrames.SurfingAngle07
+3e:5468 SurfingPikachuFrames.SurfingAngle08
+3e:546d SurfingPikachuFrames.SurfingAngle09
+3e:5472 SurfingPikachuFrames.SurfingAngle10
+3e:5477 SurfingPikachuFrames.SurfingAngle11
+3e:547c SurfingPikachuFrames.SurfingAngle12
+3e:5481 SurfingPikachuFrames.SurfingAngle13
+3e:5486 SurfingPikachuFrames.SmallSplash
+3e:548b SurfingPikachuFrames.LargeSplash
+3e:5494 SurfingPikachuFrames.StartText
+3e:5499 SurfingPikachuFrames.GoalText
+3e:549e SurfingPikachuFrames.OhNoText
+3e:54a1 SurfingPikachuFrames.Plus50Pts
+3e:54b0 SurfingPikachuFrames.Plus150Pts
+3e:54bf SurfingPikachuFrames.Plus350Pts
+3e:54ce SurfingPikachuFrames.Plus750Pts
+3e:54dd SurfingPikachuFrames.Plus180Pts
+3e:54ec SurfingPikachuFrames.Plus500Pts
+3e:54fb SurfingPikachuFrames.WaterSpray
+3e:54fe SurfingPikachuFrames.IntroPikachu
 3e:5507 SurfingPikachuOAMData
 3e:5573 SurfingPikachuOAMData.SingleTile
 3e:5578 SurfingPikachuOAMData.ResultsPikachu
diff --git a/pokeyellow_debug.map b/pokeyellow_debug.map
index df599b2c..e9af2746 100644
--- a/pokeyellow_debug.map
+++ b/pokeyellow_debug.map
@@ -19622,34 +19622,34 @@ ROMX bank #62:
 	         $53fa = SurfingPikachuObjectCallbacks
 	         $5404 = SurfingMinigameAnimatedObjectFn_nop
 	         $5405 = SurfingPikachuFrames
-	         $543d = Unkn_f943d
-	         $5440 = Unkn_f9440
-	         $5445 = Unkn_f9445
-	         $544a = Unkn_f944a
-	         $544f = Unkn_f944f
-	         $5454 = Unkn_f9454
-	         $5459 = Unkn_f9459
-	         $545e = Unkn_f945e
-	         $5463 = Unkn_f9463
-	         $5468 = Unkn_f9468
-	         $546d = Unkn_f946d
-	         $5472 = Unkn_f9472
-	         $5477 = Unkn_f9477
-	         $547c = Unkn_f947c
-	         $5481 = Unkn_f9481
-	         $5486 = Unkn_f9486
-	         $548b = Unkn_f948b
-	         $5494 = Unkn_f9494
-	         $5499 = Unkn_f9499
-	         $549e = Unkn_f949e
-	         $54a1 = Unkn_f94a1
-	         $54b0 = Unkn_f94b0
-	         $54bf = Unkn_f94bf
-	         $54ce = Unkn_f94ce
-	         $54dd = Unkn_f94dd
-	         $54ec = Unkn_f94ec
-	         $54fb = Unkn_f94fb
-	         $54fe = Unkn_f94fe
+	         $543d = SurfingPikachuFrames.SingleTile
+	         $5440 = SurfingPikachuFrames.SurfingAngle00
+	         $5445 = SurfingPikachuFrames.SurfingAngle01
+	         $544a = SurfingPikachuFrames.SurfingAngle02
+	         $544f = SurfingPikachuFrames.SurfingAngle03
+	         $5454 = SurfingPikachuFrames.SurfingAngle04
+	         $5459 = SurfingPikachuFrames.SurfingAngle05
+	         $545e = SurfingPikachuFrames.SurfingAngle06
+	         $5463 = SurfingPikachuFrames.SurfingAngle07
+	         $5468 = SurfingPikachuFrames.SurfingAngle08
+	         $546d = SurfingPikachuFrames.SurfingAngle09
+	         $5472 = SurfingPikachuFrames.SurfingAngle10
+	         $5477 = SurfingPikachuFrames.SurfingAngle11
+	         $547c = SurfingPikachuFrames.SurfingAngle12
+	         $5481 = SurfingPikachuFrames.SurfingAngle13
+	         $5486 = SurfingPikachuFrames.SmallSplash
+	         $548b = SurfingPikachuFrames.LargeSplash
+	         $5494 = SurfingPikachuFrames.StartText
+	         $5499 = SurfingPikachuFrames.GoalText
+	         $549e = SurfingPikachuFrames.OhNoText
+	         $54a1 = SurfingPikachuFrames.Plus50Pts
+	         $54b0 = SurfingPikachuFrames.Plus150Pts
+	         $54bf = SurfingPikachuFrames.Plus350Pts
+	         $54ce = SurfingPikachuFrames.Plus750Pts
+	         $54dd = SurfingPikachuFrames.Plus180Pts
+	         $54ec = SurfingPikachuFrames.Plus500Pts
+	         $54fb = SurfingPikachuFrames.WaterSpray
+	         $54fe = SurfingPikachuFrames.IntroPikachu
 	         $5507 = SurfingPikachuOAMData
 	         $5573 = SurfingPikachuOAMData.SingleTile
 	         $5578 = SurfingPikachuOAMData.SurfingPikachu
diff --git a/pokeyellow_debug.sym b/pokeyellow_debug.sym
index 8846e095..5cf1f65a 100644
--- a/pokeyellow_debug.sym
+++ b/pokeyellow_debug.sym
@@ -19224,34 +19224,34 @@
 3e:53fa SurfingPikachuObjectCallbacks
 3e:5404 SurfingMinigameAnimatedObjectFn_nop
 3e:5405 SurfingPikachuFrames
-3e:543d Unkn_f943d
-3e:5440 Unkn_f9440
-3e:5445 Unkn_f9445
-3e:544a Unkn_f944a
-3e:544f Unkn_f944f
-3e:5454 Unkn_f9454
-3e:5459 Unkn_f9459
-3e:545e Unkn_f945e
-3e:5463 Unkn_f9463
-3e:5468 Unkn_f9468
-3e:546d Unkn_f946d
-3e:5472 Unkn_f9472
-3e:5477 Unkn_f9477
-3e:547c Unkn_f947c
-3e:5481 Unkn_f9481
-3e:5486 Unkn_f9486
-3e:548b Unkn_f948b
-3e:5494 Unkn_f9494
-3e:5499 Unkn_f9499
-3e:549e Unkn_f949e
-3e:54a1 Unkn_f94a1
-3e:54b0 Unkn_f94b0
-3e:54bf Unkn_f94bf
-3e:54ce Unkn_f94ce
-3e:54dd Unkn_f94dd
-3e:54ec Unkn_f94ec
-3e:54fb Unkn_f94fb
-3e:54fe Unkn_f94fe
+3e:543d SurfingPikachuFrames.SingleTile
+3e:5440 SurfingPikachuFrames.SurfingAngle00
+3e:5445 SurfingPikachuFrames.SurfingAngle01
+3e:544a SurfingPikachuFrames.SurfingAngle02
+3e:544f SurfingPikachuFrames.SurfingAngle03
+3e:5454 SurfingPikachuFrames.SurfingAngle04
+3e:5459 SurfingPikachuFrames.SurfingAngle05
+3e:545e SurfingPikachuFrames.SurfingAngle06
+3e:5463 SurfingPikachuFrames.SurfingAngle07
+3e:5468 SurfingPikachuFrames.SurfingAngle08
+3e:546d SurfingPikachuFrames.SurfingAngle09
+3e:5472 SurfingPikachuFrames.SurfingAngle10
+3e:5477 SurfingPikachuFrames.SurfingAngle11
+3e:547c SurfingPikachuFrames.SurfingAngle12
+3e:5481 SurfingPikachuFrames.SurfingAngle13
+3e:5486 SurfingPikachuFrames.SmallSplash
+3e:548b SurfingPikachuFrames.LargeSplash
+3e:5494 SurfingPikachuFrames.StartText
+3e:5499 SurfingPikachuFrames.GoalText
+3e:549e SurfingPikachuFrames.OhNoText
+3e:54a1 SurfingPikachuFrames.Plus50Pts
+3e:54b0 SurfingPikachuFrames.Plus150Pts
+3e:54bf SurfingPikachuFrames.Plus350Pts
+3e:54ce SurfingPikachuFrames.Plus750Pts
+3e:54dd SurfingPikachuFrames.Plus180Pts
+3e:54ec SurfingPikachuFrames.Plus500Pts
+3e:54fb SurfingPikachuFrames.WaterSpray
+3e:54fe SurfingPikachuFrames.IntroPikachu
 3e:5507 SurfingPikachuOAMData
 3e:5573 SurfingPikachuOAMData.SingleTile
 3e:5578 SurfingPikachuOAMData.ResultsPikachu
diff --git a/pokeyellow_vc.map b/pokeyellow_vc.map
index 5194172d..8ec7e28f 100644
--- a/pokeyellow_vc.map
+++ b/pokeyellow_vc.map
@@ -19674,34 +19674,34 @@ ROMX bank #62:
 	         $53fa = SurfingPikachuObjectCallbacks
 	         $5404 = SurfingMinigameAnimatedObjectFn_nop
 	         $5405 = SurfingPikachuFrames
-	         $543d = Unkn_f943d
-	         $5440 = Unkn_f9440
-	         $5445 = Unkn_f9445
-	         $544a = Unkn_f944a
-	         $544f = Unkn_f944f
-	         $5454 = Unkn_f9454
-	         $5459 = Unkn_f9459
-	         $545e = Unkn_f945e
-	         $5463 = Unkn_f9463
-	         $5468 = Unkn_f9468
-	         $546d = Unkn_f946d
-	         $5472 = Unkn_f9472
-	         $5477 = Unkn_f9477
-	         $547c = Unkn_f947c
-	         $5481 = Unkn_f9481
-	         $5486 = Unkn_f9486
-	         $548b = Unkn_f948b
-	         $5494 = Unkn_f9494
-	         $5499 = Unkn_f9499
-	         $549e = Unkn_f949e
-	         $54a1 = Unkn_f94a1
-	         $54b0 = Unkn_f94b0
-	         $54bf = Unkn_f94bf
-	         $54ce = Unkn_f94ce
-	         $54dd = Unkn_f94dd
-	         $54ec = Unkn_f94ec
-	         $54fb = Unkn_f94fb
-	         $54fe = Unkn_f94fe
+	         $543d = SurfingPikachuFrames.SingleTile
+	         $5440 = SurfingPikachuFrames.SurfingAngle00
+	         $5445 = SurfingPikachuFrames.SurfingAngle01
+	         $544a = SurfingPikachuFrames.SurfingAngle02
+	         $544f = SurfingPikachuFrames.SurfingAngle03
+	         $5454 = SurfingPikachuFrames.SurfingAngle04
+	         $5459 = SurfingPikachuFrames.SurfingAngle05
+	         $545e = SurfingPikachuFrames.SurfingAngle06
+	         $5463 = SurfingPikachuFrames.SurfingAngle07
+	         $5468 = SurfingPikachuFrames.SurfingAngle08
+	         $546d = SurfingPikachuFrames.SurfingAngle09
+	         $5472 = SurfingPikachuFrames.SurfingAngle10
+	         $5477 = SurfingPikachuFrames.SurfingAngle11
+	         $547c = SurfingPikachuFrames.SurfingAngle12
+	         $5481 = SurfingPikachuFrames.SurfingAngle13
+	         $5486 = SurfingPikachuFrames.SmallSplash
+	         $548b = SurfingPikachuFrames.LargeSplash
+	         $5494 = SurfingPikachuFrames.StartText
+	         $5499 = SurfingPikachuFrames.GoalText
+	         $549e = SurfingPikachuFrames.OhNoText
+	         $54a1 = SurfingPikachuFrames.Plus50Pts
+	         $54b0 = SurfingPikachuFrames.Plus150Pts
+	         $54bf = SurfingPikachuFrames.Plus350Pts
+	         $54ce = SurfingPikachuFrames.Plus750Pts
+	         $54dd = SurfingPikachuFrames.Plus180Pts
+	         $54ec = SurfingPikachuFrames.Plus500Pts
+	         $54fb = SurfingPikachuFrames.WaterSpray
+	         $54fe = SurfingPikachuFrames.IntroPikachu
 	         $5507 = SurfingPikachuOAMData
 	         $5573 = SurfingPikachuOAMData.SingleTile
 	         $5578 = SurfingPikachuOAMData.SurfingPikachu
diff --git a/pokeyellow_vc.sym b/pokeyellow_vc.sym
index 8de0b93d..1d54909d 100644
--- a/pokeyellow_vc.sym
+++ b/pokeyellow_vc.sym
@@ -19277,34 +19277,34 @@
 3e:53fa SurfingPikachuObjectCallbacks
 3e:5404 SurfingMinigameAnimatedObjectFn_nop
 3e:5405 SurfingPikachuFrames
-3e:543d Unkn_f943d
-3e:5440 Unkn_f9440
-3e:5445 Unkn_f9445
-3e:544a Unkn_f944a
-3e:544f Unkn_f944f
-3e:5454 Unkn_f9454
-3e:5459 Unkn_f9459
-3e:545e Unkn_f945e
-3e:5463 Unkn_f9463
-3e:5468 Unkn_f9468
-3e:546d Unkn_f946d
-3e:5472 Unkn_f9472
-3e:5477 Unkn_f9477
-3e:547c Unkn_f947c
-3e:5481 Unkn_f9481
-3e:5486 Unkn_f9486
-3e:548b Unkn_f948b
-3e:5494 Unkn_f9494
-3e:5499 Unkn_f9499
-3e:549e Unkn_f949e
-3e:54a1 Unkn_f94a1
-3e:54b0 Unkn_f94b0
-3e:54bf Unkn_f94bf
-3e:54ce Unkn_f94ce
-3e:54dd Unkn_f94dd
-3e:54ec Unkn_f94ec
-3e:54fb Unkn_f94fb
-3e:54fe Unkn_f94fe
+3e:543d SurfingPikachuFrames.SingleTile
+3e:5440 SurfingPikachuFrames.SurfingAngle00
+3e:5445 SurfingPikachuFrames.SurfingAngle01
+3e:544a SurfingPikachuFrames.SurfingAngle02
+3e:544f SurfingPikachuFrames.SurfingAngle03
+3e:5454 SurfingPikachuFrames.SurfingAngle04
+3e:5459 SurfingPikachuFrames.SurfingAngle05
+3e:545e SurfingPikachuFrames.SurfingAngle06
+3e:5463 SurfingPikachuFrames.SurfingAngle07
+3e:5468 SurfingPikachuFrames.SurfingAngle08
+3e:546d SurfingPikachuFrames.SurfingAngle09
+3e:5472 SurfingPikachuFrames.SurfingAngle10
+3e:5477 SurfingPikachuFrames.SurfingAngle11
+3e:547c SurfingPikachuFrames.SurfingAngle12
+3e:5481 SurfingPikachuFrames.SurfingAngle13
+3e:5486 SurfingPikachuFrames.SmallSplash
+3e:548b SurfingPikachuFrames.LargeSplash
+3e:5494 SurfingPikachuFrames.StartText
+3e:5499 SurfingPikachuFrames.GoalText
+3e:549e SurfingPikachuFrames.OhNoText
+3e:54a1 SurfingPikachuFrames.Plus50Pts
+3e:54b0 SurfingPikachuFrames.Plus150Pts
+3e:54bf SurfingPikachuFrames.Plus350Pts
+3e:54ce SurfingPikachuFrames.Plus750Pts
+3e:54dd SurfingPikachuFrames.Plus180Pts
+3e:54ec SurfingPikachuFrames.Plus500Pts
+3e:54fb SurfingPikachuFrames.WaterSpray
+3e:54fe SurfingPikachuFrames.IntroPikachu
 3e:5507 SurfingPikachuOAMData
 3e:5573 SurfingPikachuOAMData.SingleTile
 3e:5578 SurfingPikachuOAMData.ResultsPikachu