DizzyEggg · DizzyEggg · Sep 29, 2025 · Sep 29, 2025
diff --git a/data/maps/MansionFloor2RoomLanding/scripts.inc b/data/maps/MansionFloor2RoomLanding/scripts.inc
@@ -65,7 +65,7 @@ MansionFloor2RoomLanding_EventScript_FirstFullVials::
 
 MansionFloor2RoomLanding_Text_FirstFullVials:
 	.string "Oh wait, you made it through\n"
-	.string "without using vials! Nice$"
+	.string "without using vials! Nice!$"
 
 
 MansionFloor2RoomLanding_EventScript_FirstTimeVials::

diff --git a/data/maps/MansionFloor3RoomBoss/scripts.inc b/data/maps/MansionFloor3RoomBoss/scripts.inc
@@ -253,7 +253,7 @@ MansionFloor3RoomBoss_EventScript_BossRipley::
 	msgbox_portrait MansionFloor3RoomBoss_Text_Boss3Ripley1, FIELD_PIC_BLASTOISE_NORMAL
 
 	settotemboost B_POSITION_OPPONENT_LEFT, 0, 1, 0, 0, 1
-	setwildbattle SPECIES_BLASTOISE, 65, ITEM_LEFTOVERS
+	setwildbattle SPECIES_BLASTOISE, 65, ITEM_ROCKY_HELMET
 	setenemymonmoves 0, MOVE_WAVE_CRASH, MOVE_PROTECT, MOVE_AQUA_RING, 0
 	setenemymonnick 0, sText_BlastoiseNickname
 	@setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -264,7 +264,7 @@ MansionFloor3RoomBoss_EventScript_BossRipley::
 	goto_if_ne VAR_RESULT, B_OUTCOME_WON, MansionFloor1RoomBoss_EventScript_End
 	setflag FLAG_BOSS3_CLEAR
 
-	msgbox_portrait MansionFloor3RoomBoss_Text_Boss2Bella2, FIELD_PIC_BLASTOISE_PAIN
+	msgbox_portrait MansionFloor3RoomBoss_Text_Boss3Ripley2, FIELD_PIC_BLASTOISE_PAIN
 	applymovement LOCALID_RIPLEY3, MansionFloor3RoomBoss_Charge1
 	waitmovement 0
 	@hit sound?

diff --git a/data/maps/MansionFloor3RoomFinal/map.json b/data/maps/MansionFloor3RoomFinal/map.json
@@ -16,7 +16,7 @@
   "object_events": [
     {
       "local_id": "LOCALID_CRADILY",
-      "graphics_id": "OBJ_EVENT_GFX_SPECIES_SHINY(CRADILY)",
+      "graphics_id": "OBJ_EVENT_GFX_SPECIES(CRADILY)",
       "x": 10,
       "y": 15,
       "elevation": 0,

diff --git a/data/maps/MansionFloor3RoomFinal/scripts.inc b/data/maps/MansionFloor3RoomFinal/scripts.inc
@@ -8,6 +8,7 @@ MansionFloor3RoomFinal_EventScript_Trigger1::
 	lockall
 	setvar VAR_TEMP_0, 1
 	msgbox_portrait MansionFloor3RoomFinal_Text_Craftily1, FIELD_PIC_CRADILY_DARK
+	closemessage
 	delay 100
 	releaseall
 	end
@@ -28,6 +29,7 @@ MansionFloor3RoomFinal_EventScript_Trigger2::
 	lockall
 	setvar VAR_TEMP_0, 1
 	msgbox_portrait MansionFloor3RoomFinal_Text_Craftily2, FIELD_PIC_CRADILY_DARK
+	closemessage
 	delay 100
 	msgbox_portrait MansionFloor3RoomFinal_Text_Craftily3, FIELD_PIC_CRADILY_DARK
 	applymovement LOCALID_CRADILY, MansionFloor1RoomBoss_LookLeft
@@ -40,7 +42,7 @@ MansionFloor3RoomFinal_EventScript_Trigger2::
 	@settotemboost B_POSITION_OPPONENT_LEFT, 0, 1, 0, 0, 1
 	setwildbattle SPECIES_CRADILY, 96, ITEM_LEFTOVERS
     setenemymonnick 0, sText_CradilyNickname
-	setenemymonmoves 0, MOVE_ROCK_SMASH, MOVE_STOCKPILE, MOVE_PROTECT, MOVE_ROCK_SLIDE
+	setenemymonmoves 0, MOVE_ROCK_SMASH, MOVE_STOCKPILE, MOVE_PROTECT, 0
 	@setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	@clearflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -84,6 +86,7 @@ MansionFloor3RoomFinal_EventScript_FinalScene::
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose17, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose18, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose19, FIELD_PIC_CRADILY_DETERMINED
+	@add a fade to black, warp to end, etc.
 	end
 
 
@@ -193,7 +196,7 @@ MansionFloor3RoomFinal_Text_CraftilyLose06:
 	.string "we did find it.\p"
 	.string "The same Fountain you refer to as the\n"
 	.string "Inkwell; that is the one and only\l"
-	.string "Fountain of Youth of legend.\p"
+	.string "Fountain of Youth of legend.$"
 
 @old ada walking to the well
 MansionFloor3RoomFinal_Text_CraftilyLose07:

diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
@@ -494,6 +494,7 @@ Fountain_EventScript_RecruitBella::
 	playegghatchanim SPECIES_VENIPEDE, TRUE, NULL
     waitstate
 	removeobject LOCALID_EGG_RECRUIT
+	addobject LOCALID_ABRA_WELL
 	addobject LOCALID_BELLA_RECRUIT
 	msgbox_portrait Fountain_Text_RecruitBella2, FIELD_PIC_VENIPEDE_DETERMINED
 	msgbox_portrait Fountain_Text_RecruitBella3, FIELD_PIC_ABRA_HAPPY
@@ -1556,7 +1557,7 @@ Fountain_Text_AbraGraveComplete10:
 	.string "I've always thought that I was useless,\n"
 	.string "that I needed to be protected.\p"
 	.string "But… maybe I'm not useless.\n"
-	.string "Maybe I can learn to fight, with training.\p"
+	.string "Maybe I can learn to fight.\p"
 	.string "So, um, if you'll have me… I can join you\n"
 	.string "in the fight.\p"
 	.string "I mean, I won't be able to Teleport back\n"
@@ -1934,6 +1935,9 @@ Fountain_EventScript_StumpPhotoCheck::
 	checkitem UNIQUE_ITEM_PHOTO_5, 1
 	goto_if_eq VAR_RESULT, NO, Fountain_EventScript_IncompletePhoto
 	msgbox Fountain_Text_CompletePhoto, MSGBOX_NPC
+	callnative ScrCmd_ShowWholePhotoPic
+	waitstate
+	end
 
 Fountain_Text_CompletePhoto:
 	.string "You've found all of the pieces of the\n"

diff --git a/graphics/pokemon/cradily/overworld.png b/graphics/pokemon/cradily/overworld.png
diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h
@@ -8783,7 +8783,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
             ANIMCMD_FRAME(1, 15),
             ANIMCMD_FRAME(0, 15),
         ),
-        .frontAnimId = ANIM_V_SHAKE_TWICE,
+        .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         .backPic = gMonBackPic_Cradily,
         .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(56, 64),
         .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 0,