diff --git a/data/layouts/MansionFloor3Room3/map.bin b/data/layouts/MansionFloor3Room3/map.bin index 8aadec33290c..501e818c140d 100644 Binary files a/data/layouts/MansionFloor3Room3/map.bin and b/data/layouts/MansionFloor3Room3/map.bin differ diff --git a/data/layouts/MansionFloor3TreasureLeft/map.bin b/data/layouts/MansionFloor3TreasureLeft/map.bin index 82fc93d866d1..1ee7e8baa3eb 100644 --- a/data/layouts/MansionFloor3TreasureLeft/map.bin +++ b/data/layouts/MansionFloor3TreasureLeft/map.bin @@ -1 +1 @@ -�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�28::;:9::<�2�2�2�2�2�2�2�2�2�2�2@&�����-D�2�2�2�2�2�2�2�2�2�2�2@.���4��D�2�2�2�2�2�2�2�2�2�2�2P2222222D�2�2�2�2�2�2�2�2�2�2�2P�2 2 2 2 2 2 2D�2�2�2�2�2�2�2�2�2�2�2XYYYYYYY\�2�2�2�2�2�2�2�2�2�2�8::;:9::<���2�2�2�2�2�2�2�2�@&������D���2�2�2�2�2�2�2�2�@.���4��D���2�2�2�2�2�2�2�2�P222222�2D���2�2�2�2�2�2�2�2�P�2 2�2�2�2 2 2D���2�2�2�2�2�2�2�2�XYYYYYYY\���2�2�2�2�2�2�2�2�8::;:9::<���2�2�2�2�2�2�2�2�@+�,,��-D���2�2�2�2�2�2�2�2�@3���4��D���2�2�2�2�2�2�2�2�P22222D���2�2�2�2�2�2�2�2�P�2 2 2 2 2 2 2D���2�2�2�2�2�2�2�2�XYYYYYYY\���2�2�2 \ No newline at end of file +�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�28::;:9::<�2�2�2�2�2�2�2�2�2�2�2@&�����-D�2�2�2�2�2�2�2�2�2�2�2@.���4��D�2�2�2�2�2�2�2�2�2�2�2P2222222D�2�2�2�2�2�2�2�2�2�2�2P�2 2 2 2 2 2 2D�2�2�2�2�2�2�2�2�2�2�2XYYYYYYY\�2�2�2�2�2�2�2�2�2�2�8::;:9::<���2�2�2�2�2�2�2�2�@&������D���2�2�2�2�2�2�2�2�@.���4��D���2�2�2�2�2�2�2�2�P222222�D���2�2�2�2�2�2�2�2�P�2 2�2�2�2 2 2D���2�2�2�2�2�2�2�2�XYYYYYYY\���2�2�2�2�2�2�2�2�8::;:9::<���2�2�2�2�2�2�2�2�@+�,,��-D���2�2�2�2�2�2�2�2�@3���4��D���2�2�2�2�2�2�2�2�P22222D���2�2�2�2�2�2�2�2�P�2 2 2 2 2 2 2D���2�2�2�2�2�2�2�2�XYYYYYYY\���2�2�2 \ No newline at end of file diff --git a/data/maps/MansionFloor1RoomBoss/scripts.inc b/data/maps/MansionFloor1RoomBoss/scripts.inc index 0038bae1a9c4..0cc4526c6073 100644 --- 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 index c9d5fdc5f236..df744659c20c 100644 --- 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!$" \ No newline at end of file diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index fe8f6608a3b9..c3ce56e8c3bc 100644 --- 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 index 6bd3305030a3..bbb8f0baa4b9 100644 Binary files a/graphics/pokemon/cradily/anim_front.png and b/graphics/pokemon/cradily/anim_front.png differ diff --git a/include/config/debug.h b/include/config/debug.h index 2446b9360c0b..1e1292d9d8e3 100644 --- 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 index d5a1417c20ea..55f8d816d357 100644 --- 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 index 35dce32fa424..eff93482f69d 100644 --- 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,