DizzyEggg · DizzyEggg · Sep 30, 2025 · Sep 30, 2025 · DizzyEggg · Sep 30, 2025
diff --git a/data/layouts/MansionFloor3Room3/map.bin b/data/layouts/MansionFloor3Room3/map.bin
diff --git a/data/layouts/MansionFloor3TreasureLeft/map.bin b/data/layouts/MansionFloor3TreasureLeft/map.bin
@@ -1 +1 @@
-22222222222222222222222222222222222222222222228::;:9::<22222222222@&¤£¤•–-D22222222222@.¬«¬4žŸD22222222222P2222222D22222222222P²2222222D22222222222XYYYYYYY\22222222228::;:9::<22222222@&¤£¤•–§D22222222@.¬«¬4žŸD22222222P222222Ò2D22222222P²22¨2©2ª222D22222222XYYYYYYY\222222228::;:9::<22222222@+£,,•–-D22222222@3«œ4žŸD22222222P22222D22222222P²2222222D22222222XYYYYYYY\222
+22222222222222222222222222222222222222222222228::;:9::<22222222222@&¤£¤•–-D22222222222@.¬«¬4žŸD22222222222P2222222D22222222222P²2222222D22222222222XYYYYYYY\22222222228::;:9::<22222222@&¤£¤•–§D22222222@.¬«¬4žŸD22222222P222222ÒD22222222P²22¨2©2ª222D22222222XYYYYYYY\222222228::;:9::<22222222@+£,,•–-D22222222@3«œ4žŸD22222222P22222D22222222P²2222222D22222222XYYYYYYY\222
diff --git a/data/maps/MansionFloor1RoomBoss/scripts.inc b/data/maps/MansionFloor1RoomBoss/scripts.inc
@@ -312,8 +312,7 @@ MansionFloor1RoomBoss_EventScript_SavorySquadScene1::
 	@clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	goto_if_ne VAR_RESULT, B_OUTCOME_WON, MansionFloor1RoomBoss_EventScript_End
-	@TOFOLD
-	@setflag FLAG_DEFEATED_SAVORY_SQUAD
+	setflag FLAG_DEFEATED_SAVORY_SQUAD
 	setflag FLAG_BOSS1_CLEAR
 	special RemoveCameraObject
 	removeobject LOCALID_FARFETCHD
@@ -390,7 +389,6 @@ MansionFloor1RoomBoss_EventScript_SavorySquadScene2::
 	@clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
 	goto_if_ne VAR_RESULT, B_OUTCOME_WON, MansionFloor1RoomBoss_EventScript_End
-	@TOFOLD
 	setflag FLAG_DEFEATED_SAVORY_SQUAD
 	setflag FLAG_BOSS1_CLEAR
 	removeobject LOCALID_FARFETCHD
@@ -483,7 +481,7 @@ MansionFloor1RoomBoss_NacliAssemble:
 	step_end
 
 
-@@ TOFOLD
+@@ TOFOLD - done in entrance 1, scripted alongside final boss
 MansionFloor1RoomBoss_EventScript_RandomizeBoss::
 	end
 

diff --git a/data/maps/MansionFloor3RoomFinal/scripts.inc b/data/maps/MansionFloor3RoomFinal/scripts.inc
@@ -40,12 +40,12 @@ MansionFloor3RoomFinal_EventScript_Trigger2::
 
 	setflag FLAG_BATTLE_START_LEECH_SEED
 	@settotemboost B_POSITION_OPPONENT_LEFT, 0, 1, 0, 0, 1
-	setwildbattle SPECIES_CRADILY, 96, ITEM_SITRUS_BERRY
+	setwildbattle SPECIES_CRADILY, 96, ITEM_LIFE_ORB
     setenemymonnick 0, sText_CradilyNickname
-	setenemymonmoves 0, MOVE_ROCK_SMASH, MOVE_STOCKPILE, MOVE_PROTECT, 0
+	setenemymonmoves 0, MOVE_ROCK_SMASH, MOVE_STOCKPILE, MOVE_TORMENT, 0
     setenemymonshiny 0, TRUE
     setenemymonability 0, 2
-    setenemymonhp 0, 75
+    setenemymonhp 0, 40
 	@setflag FLAG_SYS_CTRL_OBJ_DELETE
     tryforcedoublebattle
 	dowildbattle
@@ -73,6 +73,7 @@ MansionFloor3RoomFinal_EventScript_DontRelive::
 
 @placeholder, until cutscene done TOFOLD
 MansionFloor3RoomFinal_EventScript_FinalScene::
+	lockall
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose02, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose03, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose04, FIELD_PIC_CRADILY_DETERMINED
@@ -92,8 +93,7 @@ MansionFloor3RoomFinal_EventScript_FinalScene::
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose18, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_CraftilyLose19, FIELD_PIC_CRADILY_DETERMINED
 	fadescreenspeed FADE_TO_BLACK, 2
-
-	@add a fade to black, warp to end, etc.
+	goto MansionFloor3RoomFinal_BadEnding
 	end
 
 
@@ -357,11 +357,14 @@ MansionFloor3RoomFinal_Text_CraftilyLose19:
 
 
 MansionFloor3RoomFinal_EventScript_SecretEnding::
+	lockall
 	msgbox_portrait MansionFloor3RoomFinal_Text_SecretEnding1, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_SecretEnding2, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_SecretEnding3, FIELD_PIC_CRADILY_DETERMINED
 	msgbox_portrait MansionFloor3RoomFinal_Text_SecretEnding4, FIELD_PIC_CRADILY_DETERMINED
+	closemessage
 	fadescreenspeed FADE_TO_BLACK, 2
+	goto MansionFloor3RoomFinal_GoodEnding
 	end
 
 
@@ -388,3 +391,149 @@ MansionFloor3RoomFinal_Text_SecretEnding4:
 	.string "I feel like I can move, a little.\p"
 	.string "We can start again.$"
 
+
+
+
+
+MansionFloor3RoomFinal_BadEnding::
+	lockall
+	playse SE_EXIT
+	waitse
+	msgbox MansionFloor3RoomFinal_Text_BadEnding1, MSGBOX_NPC
+	closemessage
+	delay 80
+	msgbox MansionFloor3RoomFinal_Text_BadEnding2, MSGBOX_NPC
+	closemessage
+	delay 80
+	msgbox MansionFloor3RoomFinal_Text_BadEnding3, MSGBOX_NPC
+	closemessage
+	delay 40
+	playse SE_M_DIVE
+	waitse
+	delay 80
+	goto MansionFloor3RoomFinal_Credits
+	end
+
+
+
+MansionFloor3RoomFinal_GoodEnding::
+	delay 50
+	playse SE_EXIT
+	waitse
+	msgbox MansionFloor3RoomFinal_Text_GoodEnding1, MSGBOX_NPC
+	msgbox MansionFloor3RoomFinal_Text_GoodEnding2, MSGBOX_NPC
+	closemessage
+	delay 80
+	playegghatchanim SPECIES_LILEEP, TRUE, NULL
+    waitstate
+	goto MansionFloor3RoomFinal_Credits
+	end
+
+MansionFloor3RoomFinal_Text_GoodEnding1:
+	.string "Ripley: â€¦\p"
+	.string "Isâ€¦ Is it working?$"
+
+MansionFloor3RoomFinal_Text_GoodEnding2:
+	.string "Dali: Shh! Look!$"
+
+
+
+MansionFloor3RoomFinal_Text_BadEnding1:
+	.string "Dali: Soâ€¦\p"
+	.string "He's dead.\p"
+	.string "He did some terrible things to us.\p"
+	.string "But if what he said was true, we\n"
+	.string "abandoned him.\p"
+	.string "As soon as we had our immortality,\n"
+	.string "we forgot our friend.\p"
+	.string "I can't imagine the suffering he\n"
+	.string "endured at our hands.\p"
+	.string "Maybe, if we'd really worked hard,\n"
+	.string "we could have overcome his curse.\p"
+	.string "If only there was a wayâ€¦$"
+
+MansionFloor3RoomFinal_Text_BadEnding2:
+	.string "Dali: It's okayâ€¦\p"
+	.string "No need to cry.\p"
+	.string "You all can forget this.\p"
+	.string "Go into the Fountain, and you'll come\n"
+	.string "out happy and refreshed.\p"
+	.string "I will keep Craftily's and Ada's\n"
+	.string "memories alive.\p"
+	.string "And I will try and think of a way that\n"
+	.string "we could have saved him.\p"
+	.string "Go on.$"
+
+MansionFloor3RoomFinal_Text_BadEnding3:
+	.string "Dali: Go.$"
+
+
+
+
+
+
+
+MansionFloor3RoomFinal_Credits::
+	playbgm MUS_OCEANIC_MUSEUM, FALSE
+	msgbox MansionFloor3RoomFinal_Text_Credits, MSGBOX_NPC
+	msgbox MansionFloor3RoomFinal_Text_Credits2, MSGBOX_NPC
+	fadeoutbgm 0
+	delay 70
+	callnative DoSoftReset
+	end
+
+MansionFloor3RoomFinal_Text_Credits:
+	.string "Inkwell\p"
+	.string "by Unfolding and DizzyEgg\p"
+	.string "Resources Used:\p"
+	.string "PMD Sprite Repository:\p"
+	.string "Mugshots by Emmuffin, shystarryrain,\n"
+	.string "prismatic, baronessfaron, Tacocoa,\l"
+	.string "comsosully, CHUNSOFT, NOLASMOR,\l"
+	.string "Noo, EzerArt, and PhillipsYoung.\p"
+	.string "Tilesets:\p"
+	.string "Dojo Interior, by Rejuvenation dev team\n"
+	.string "and rahtak.\p"
+	.string "Shady Forest, by Yumekua, EKAT, Vurtax,\n"
+	.string "Heartlessdragoon, and rahtak.\p"
+	.string "Music:\p"
+	.string "Pokemon Mystery Dungeon: Red Rescue,\n"
+	.string "and Aichiya's voicegroup and rip.\p"
+	.string "Tools Used:\p"
+	.string "Porymap, by huderlem\p"
+	.string "PokÃ©mon Emerald Textbox Simulator,\n"
+	.string "by meejle\p"	
+	.string "pokeemerald-expansion, by the\n"
+	.string "incomparably brilliant DizzyEgg.\p"
+	.string "Seriously, what a legend.\p"
+	.string "Credits: written by Unfolding :D$"
+
+MansionFloor3RoomFinal_Text_Credits2:
+	.string "Special Thanks:\p"
+	.string "GameFreak and Nintendo, for graphics,\n"
+	.string "music, and everything POKÃ©MON.\p"
+	.string "Team Aqua's Hideout, for hosting and\n"
+	.string "holding up our community.\p"
+	.string "Anthroyd's Community Server, for MAGM,\n"
+	.string "likely the first romhacking contest.\p"
+	.string "Anercomp and Doc Breeb, the\n"
+	.string "superstar eleventh hour playtesters.\p"
+	.string "And Unfolding has a tradition now to\n"
+	.string "list better games you could be playing,\l"
+	.string "so go play Jdaster's Tower of Trials\l"
+	.string "and InfernoPlus's Cursed Halo Again.\p"
+	.string "These are fangames with an incredible\p"
+	.string "degree of passion and polish that are\l"
+	.string "absolutely worth your time!\p"
+	.string "POKÃ©MON Emerald belongs to Nintendo,\n"
+	.string "GameFreak, the POKÃ©MON company,\l"
+	.string "Creatures Inc., etc. Please support\l"
+	.string "their official releases.\p"
+	.string "We claim ownership of nothing, and\n"
+	.string "we do not support the sale or\l"
+	.string "monetization of fangames in any way.\p"
+	.string "Congratulations, and thank you for\n"
+	.string "playing!\p"
+	.string "There's two endings, and as usual,\n"
+	.string "one is pretty hard to get!\p"
+	.string "Good luck!$"
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
@@ -1913,11 +1913,6 @@ Fountain_Text_Abra_Gate2:
 
 
 
-@TOFOLD
-
-
-
-
 @@@@@ Static Events - TOFOLD
 
 Fountain_EventScript_Grave::

diff --git a/graphics/pokemon/cradily/anim_front.png b/graphics/pokemon/cradily/anim_front.png
diff --git a/include/config/debug.h b/include/config/debug.h
@@ -8,10 +8,10 @@
 #define DEBUG_OVERWORLD_IN_MENU         FALSE               // Replaces the overworld debug menu button combination with a start menu entry (above PokÃ©dex).
 
 // Battle Debug Menu
-#define DEBUG_BATTLE_MENU               TRUE    // If set to TRUE, enables a debug menu to use in battles by pressing the Select button.
+#define DEBUG_BATTLE_MENU               TRUE   // If set to TRUE, enables a debug menu to use in battles by pressing the Select button.
 #define DEBUG_AI_DELAY_TIMER            FALSE   // If set to TRUE, displays the number of frames it takes for the AI to choose a move. Replaces the "What will PKMN do" text. Useful for devs or anyone who modifies the AI code and wants to see if it doesn't take too long to run.
 
 // PokÃ©mon Debug
-#define DEBUG_POKEMON_SPRITE_VISUALIZER TRUE    // Enables a debug menu for PokÃ©mon sprites and icons, accessed by pressing Select in the summary screen.
+#define DEBUG_POKEMON_SPRITE_VISUALIZER FALSE   // Enables a debug menu for PokÃ©mon sprites and icons, accessed by pressing Select in the summary screen.
 
 #endif // GUARD_CONFIG_DEBUG_H
diff --git a/src/data/pokemon/level_up_learnsets/gen_9.h b/src/data/pokemon/level_up_learnsets/gen_9.h
@@ -1673,7 +1673,7 @@ static const struct LevelUpMove sAbraLevelUpLearnset[] = {
     LEVEL_UP_MOVE( 1, MOVE_TELEPORT),
     LEVEL_UP_MOVE( 1, MOVE_FLASH),
     LEVEL_UP_MOVE( 5, MOVE_PROTECT),
-    LEVEL_UP_MOVE(10, MOVE_SKILL_SWAP),
+    LEVEL_UP_MOVE(10, MOVE_SIMPLE_BEAM),
     LEVEL_UP_MOVE(15, MOVE_INSTRUCT),
     LEVEL_UP_MOVE(20, MOVE_PSYCH_UP),
     LEVEL_UP_MOVE(25, MOVE_PSYBEAM),
@@ -1690,7 +1690,7 @@ static const struct LevelUpMove sAbraLevelUpLearnset[] = {
 static const struct LevelUpMove sKadabraLevelUpLearnset[] = {
     LEVEL_UP_MOVE( 0, MOVE_CONFUSION),
     LEVEL_UP_MOVE( 5, MOVE_PROTECT),
-    LEVEL_UP_MOVE(10, MOVE_SKILL_SWAP),
+    LEVEL_UP_MOVE(10, MOVE_SIMPLE_BEAM),
     LEVEL_UP_MOVE(15, MOVE_INSTRUCT),
     LEVEL_UP_MOVE(20, MOVE_PSYCH_UP),
     LEVEL_UP_MOVE(25, MOVE_CHARGE_BEAM),

diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h
@@ -8733,11 +8733,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
     [SPECIES_CRADILY] =
     {
         .baseHP        = 86,
-        .baseAttack    = 81,
-        .baseDefense   = 97,
+        .baseAttack    = 50,
+        .baseDefense   = 50,
         .baseSpeed     = 43,
         .baseSpAttack  = 81,
-        .baseSpDefense = 107,
+        .baseSpDefense = 50,
         .types = MON_TYPES(TYPE_ROCK, TYPE_GRASS),
         .catchRate = 45,
     #if P_UPDATED_EXP_YIELDS >= GEN_5
@@ -8754,7 +8754,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
         .friendship = STANDARD_FRIENDSHIP,
         .growthRate = GROWTH_ERRATIC,
         .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_3),
-        .abilities = { ABILITY_SUCTION_CUPS, ABILITY_NONE, ABILITY_STORM_DRAIN },
+        .abilities = { ABILITY_STORM_DRAIN, ABILITY_NONE, ABILITY_STORM_DRAIN },
         .bodyColor = BODY_COLOR_GREEN,
         .speciesName = _("Cradily"),
         .cryId = CRY_CRADILY,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		22222222222222222222222222222222222222222222228::;:9::<22222222222@&¤£¤•–-D22222222222@.¬«¬4žŸD22222222222P2222222D22222222222P²2222222D22222222222XYYYYYYY\22222222228::;:9::<22222222@&¤£¤•–§D22222222@.¬«¬4žŸD22222222P222222Ò2D22222222P²22¨2©2ª222D22222222XYYYYYYY\222222228::;:9::<22222222@+£,,•–-D22222222@3«œ4žŸD22222222P22222D22222222P²2222222D22222222XYYYYYYY\222
		22222222222222222222222222222222222222222222228::;:9::<22222222222@&¤£¤•–-D22222222222@.¬«¬4žŸD22222222222P2222222D22222222222P²2222222D22222222222XYYYYYYY\22222222228::;:9::<22222222@&¤£¤•–§D22222222@.¬«¬4žŸD22222222P222222ÒD22222222P²22¨2©2ª222D22222222XYYYYYYY\222222228::;:9::<22222222@+£,,•–-D22222222@3«œ4žŸD22222222P22222D22222222P²2222222D22222222XYYYYYYY\222
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1913,11 +1913,6 @@ Fountain_Text_Abra_Gate2:



		@TOFOLD




		@@@@@ Static Events - TOFOLD

		Fountain_EventScript_Grave::
Expand Down