From 6d4b0f7a4e73e1cb0ab187969c9acb1d868f1833 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 25 May 2023 23:54:19 +0100 Subject: [PATCH] Small edits - Attempted to fix the Mt. Moon J&J encounter (did not work, will look at the script file) - Fixed a few bugged warps relating to Mt. Moon Square/Crater - Fixed the credits text layout (just need to figure out how to decrease the delay between them, so it still matches the music...) - Added the Crater guard back - Changed the silhouettes in the credits to be more prominent Pokemon (Leader and E4 aces, plus some postgame teasers in Omega for the Chief fight, and the legendary wings) --- constants/event_constants.asm | 3 +- constants/hide_show_constants.asm | 281 ++++++++++++------------ data/credits/credits_mons.asm | 36 +-- data/credits/credits_text.asm | 38 ++-- data/maps/hide_show_data.asm | 15 +- data/maps/objects/MtMoonB2F.asm | 5 +- data/maps/objects/MtMoonCrater.asm | 16 +- data/maps/objects/MtMoonSquare.asm | 5 +- data/maps/objects/MtMoonSquareHouse.asm | 4 +- maps/MtMoonSquare.blk | 2 +- scripts/HallOfFame.asm | 6 +- scripts/MtMoonB2F.asm | 5 + scripts/MtMoonCrater.asm | 2 - 13 files changed, 209 insertions(+), 209 deletions(-) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 971d5d62..73fe458e 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -595,13 +595,14 @@ const EVENT_BEAT_MT_MOON_1_TRAINER_4 const EVENT_BEAT_MT_MOON_1_TRAINER_5 const EVENT_BEAT_MT_MOON_1_TRAINER_6 - const EVENT_GOT_DOME_FOSSIL + const_skip const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD const EVENT_BEAT_MT_MOON_3_TRAINER_0 const EVENT_BEAT_MT_MOON_3_TRAINER_1 const EVENT_BEAT_MT_MOON_3_TRAINER_2 const EVENT_BEAT_MT_MOON_3_TRAINER_3 const EVENT_57E ; Jessie & James related. + const EVENT_GOT_DOME_FOSSIL const EVENT_GOT_HELIX_FOSSIL ; S.S. Anne events diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 1870f53a..f8867aa7 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -124,148 +124,147 @@ DEF SHOW EQU $15 const HS_MT_MOON_1F_ITEM_4 ; 70 X const HS_MT_MOON_1F_ITEM_5 ; 71 X const HS_MT_MOON_1F_ITEM_6 ; 72 X - const HS_MT_MOON_B2F_JESSIE ; UHH 6D - const HS_MT_MOON_B2F_JAMES ; uhhh 6E - const HS_MT_MOON_B2F_FOSSIL_1 ; 73 - const HS_MT_MOON_B2F_FOSSIL_2 ; 74 - const HS_MT_MOON_B2F_ITEM_1 ; 75 X - const HS_MT_MOON_B2F_ITEM_2 ; 76 X - const HS_SS_ANNE_2F_RIVAL ; 78 - const HS_SS_ANNE_1F_ROOMS_ITEM ; 79 X - const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 7A X - const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 7B X - const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7C X - const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7D X - const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 7E X - const HS_WUGTRIO ; 7F X - const HS_VICTORY_ROAD_3F_ITEM_1 ; 80 X - const HS_VICTORY_ROAD_3F_ITEM_2 ; 81 X - const HS_VICTORY_ROAD_3F_BOULDER ; 82 - const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 83 X - const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 84 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 85 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 86 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 87 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 88 X - const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 89 X - const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 8A X - const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 8B - const HS_ROCKET_HIDEOUT_B4F_JAMES ; 8C - const HS_ROCKET_HIDEOUT_B4F_JESSIE ; 8D - const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 8E X - const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 8F X - const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 90 X - const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 91 - const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 92 - const HS_GARNET_ARTICUNO_G ; 93 - const HS_SILPH_CO_3F_1 ; 94 - const HS_SILPH_CO_3F_2 ; 95 - const HS_SILPH_CO_3F_ITEM ; 96 X - const HS_SILPH_CO_4F_1 ; 97 - const HS_SILPH_CO_4F_2 ; 98 - const HS_SILPH_CO_4F_3 ; 99 - const HS_SILPH_CO_4F_ITEM_1 ; 9A X - const HS_SILPH_CO_4F_ITEM_2 ; 9B X - const HS_SILPH_CO_4F_ITEM_3 ; 9C X - const HS_SILPH_CO_5F_1 ; 9D - const HS_SILPH_CO_5F_2 ; 9E - const HS_SILPH_CO_5F_3 ; 9F - const HS_SILPH_CO_5F_4 ; A0 - const HS_SILPH_CO_5F_ITEM_1 ; A1 X - const HS_SILPH_CO_5F_ITEM_2 ; A2 X - const HS_SILPH_CO_5F_ITEM_3 ; A3 X - const HS_SILPH_CO_6F_1 ; A4 - const HS_SILPH_CO_6F_2 ; A5 - const HS_SILPH_CO_6F_3 ; A6 - const HS_SILPH_CO_6F_ITEM_1 ; A7 X - const HS_SILPH_CO_6F_ITEM_2 ; A8 X - const HS_SILPH_CO_7F_1 ; A9 - const HS_SILPH_CO_7F_2 ; AA - const HS_SILPH_CO_7F_3 ; AB - const HS_SILPH_CO_7F_4 ; AC - const HS_SILPH_CO_7F_RIVAL ; AD - const HS_SILPH_CO_7F_ITEM_1 ; AE X - const HS_SILPH_CO_7F_ITEM_2 ; AF X - const HS_SILPH_CO_7F_8 ; B0 XXX sprite doesn't exist - const HS_SILPH_CO_8F_1 ; B1 - const HS_SILPH_CO_8F_2 ; B2 - const HS_SILPH_CO_8F_3 ; B3 - const HS_SILPH_CO_10F_1 ; B4 - const HS_SILPH_CO_10F_2 ; B5 - const HS_SILPH_CO_10F_3 ; B6 XXX never (de)activated? - const HS_SILPH_CO_10F_ITEM_1 ; B7 X - const HS_SILPH_CO_10F_ITEM_2 ; B8 X - const HS_SILPH_CO_10F_ITEM_3 ; B9 X - const HS_SILPH_CO_11F_1 ; BA - const HS_SILPH_CO_11F_2 ; BB - const HS_SILPH_CO_11F_3 ; BC - const HS_OMEGA ; BD - const HS_DRAGONITE ; BE - const HS_MOLTRES ; BF - const HS_POKEMON_MANSION_2F_ITEM ; C0 X - const HS_POKEMON_MANSION_3F_ITEM_1 ; C1 X - const HS_POKEMON_MANSION_3F_ITEM_2 ; C2 X - const HS_POKEMON_MANSION_B1F_ITEM_1 ; C3 X - const HS_POKEMON_MANSION_B1F_ITEM_2 ; C4 X - const HS_POKEMON_MANSION_B1F_ITEM_3 ; C5 X - const HS_POKEMON_MANSION_B1F_ITEM_4 ; C6 X - const HS_POKEMON_MANSION_B1F_ITEM_5 ; C7 X - const HS_MANSION_GUARD ; C8 - const HS_SAFARI_ZONE_EAST_ITEM_1 ; C9 X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; CA X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; CB X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; CC X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CD X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CE X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; CF X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; D0 X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; D1 X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; D2 X - const HS_SAFARI_ZONE_CENTER_ITEM ; D3 X - const HS_CERULEAN_CAVE_2F_ITEM_1 ; D4 X - const HS_CERULEAN_CAVE_2F_ITEM_2 ; D5 X - const HS_CERULEAN_CAVE_2F_ITEM_3 ; D6 X - const HS_MEWTWO ; D7 X - const HS_CERULEAN_CAVE_B1F_ITEM_1 ; D8 X - const HS_CERULEAN_CAVE_B1F_ITEM_2 ; D9 X - const HS_VICTORY_ROAD_1F_ITEM_1 ; DA X - const HS_VICTORY_ROAD_1F_ITEM_2 ; DB X - const HS_CHAMPIONS_ROOM_OAK ; DC - const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; DD - const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; DE - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; DF - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; E0 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; E1 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; E2 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; E3 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; E4 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; E5 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E6 - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E7 - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E8 - const HS_ARTICUNO ; E9 - const HS_OLD_SEA_MAP ; EA - const HS_MEW ; EB - const HS_POKEMON_MANSION_B2F_ITEM_1 ; EC - const HS_POKEMON_MANSION_B2F_ITEM_2 ; ED - const HS_ROUTE_1_OAK ; EE - const HS_YUJIROU ; EF - const HS_YUJIROU_REMATCH ; F0 - const HS_MT_MOON_CRATER_ITEM_1 ; F1 - const HS_MT_MOON_CRATER_ITEM_2 ; F2 - const HS_MT_MOON_CRATER_ITEM_3 ; F3 - const HS_MT_MOON_CRATER_ITEM_4 ; F4 - const HS_MT_MOON_CRATER_ITEM_5 ; F5 - const HS_MT_MOON_CRATER_ITEM_6 ; F6 - const HS_MT_MOON_CRATER_ITEM_7 ; F7 - const HS_MT_MOON_CRATER_ITEM_8 ; F8 - const HS_MT_MOON_CRATER_ITEM_9 ; F9 - const HS_MT_MOON_CRATER_ITEM_10 ; FA - const HS_MT_MOON_CRATER_ITEM_11 ; FB + const HS_MT_MOON_B2F_JESSIE ; 73 + const HS_MT_MOON_B2F_JAMES ; 74 + const HS_MT_MOON_B2F_FOSSIL_1 ; 75 + const HS_MT_MOON_B2F_FOSSIL_2 ; 76 + const HS_MT_MOON_B2F_ITEM_1 ; 77 X + const HS_MT_MOON_B2F_ITEM_2 ; 78 X + const HS_MT_MOON_CRATER_GUARD ; 79 + const HS_SS_ANNE_2F_RIVAL ; 7A + const HS_SS_ANNE_1F_ROOMS_ITEM ; 7B X + const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 7C X + const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 7D X + const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7E X + const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7F X + const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 80 X + const HS_WUGTRIO ; 81 X + const HS_VICTORY_ROAD_3F_ITEM_1 ; 82 X + const HS_VICTORY_ROAD_3F_ITEM_2 ; 83 X + const HS_VICTORY_ROAD_3F_BOULDER ; 84 + const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 85 X + const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 86 X + const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 87 X + const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 88 X + const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 89 X + const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 8A X + const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 8B X + const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 8C X + const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 8D + const HS_ROCKET_HIDEOUT_B4F_JAMES ; 8E + const HS_ROCKET_HIDEOUT_B4F_JESSIE ; 8F + const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 90 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 91 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 92 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 93 + const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 94 + const HS_GARNET_ARTICUNO_G ; 95 + const HS_SILPH_CO_3F_1 ; 96 + const HS_SILPH_CO_3F_2 ; 97 + const HS_SILPH_CO_3F_ITEM ; 98 X + const HS_SILPH_CO_4F_1 ; 99 + const HS_SILPH_CO_4F_2 ; 9A + const HS_SILPH_CO_4F_3 ; 9B + const HS_SILPH_CO_4F_ITEM_1 ; 9C X + const HS_SILPH_CO_4F_ITEM_2 ; 9D X + const HS_SILPH_CO_4F_ITEM_3 ; 9E X + const HS_SILPH_CO_5F_1 ; 9F + const HS_SILPH_CO_5F_2 ; A0 + const HS_SILPH_CO_5F_3 ; A1 + const HS_SILPH_CO_5F_4 ; A2 + const HS_SILPH_CO_5F_ITEM_1 ; A3 X + const HS_SILPH_CO_5F_ITEM_2 ; A4 X + const HS_SILPH_CO_5F_ITEM_3 ; A5 X + const HS_SILPH_CO_6F_1 ; A6 + const HS_SILPH_CO_6F_2 ; A7 + const HS_SILPH_CO_6F_3 ; A8 + const HS_SILPH_CO_6F_ITEM_1 ; A9 X + const HS_SILPH_CO_6F_ITEM_2 ; AA X + const HS_SILPH_CO_7F_1 ; AB + const HS_SILPH_CO_7F_2 ; AC + const HS_SILPH_CO_7F_3 ; AD + const HS_SILPH_CO_7F_4 ; AE + const HS_SILPH_CO_7F_RIVAL ; AF + const HS_SILPH_CO_7F_ITEM_1 ; B0 X + const HS_SILPH_CO_7F_ITEM_2 ; B1 X + const HS_SILPH_CO_7F_8 ; B2 XXX sprite doesn't exist + const HS_SILPH_CO_8F_1 ; B3 + const HS_SILPH_CO_8F_2 ; B4 + const HS_SILPH_CO_8F_3 ; B5 + const HS_SILPH_CO_10F_1 ; B6 + const HS_SILPH_CO_10F_2 ; B7 + const HS_SILPH_CO_10F_3 ; B8 XXX never (de)activated? + const HS_SILPH_CO_10F_ITEM_1 ; B9 X + const HS_SILPH_CO_10F_ITEM_2 ; BA X + const HS_SILPH_CO_10F_ITEM_3 ; BB X + const HS_SILPH_CO_11F_1 ; BC + const HS_SILPH_CO_11F_2 ; BD + const HS_SILPH_CO_11F_3 ; BE + const HS_OMEGA ; BF + const HS_DRAGONITE ; C0 + const HS_MOLTRES ; C1 + const HS_POKEMON_MANSION_2F_ITEM ; C2 X + const HS_POKEMON_MANSION_3F_ITEM_1 ; C3 X + const HS_POKEMON_MANSION_3F_ITEM_2 ; C4 X + const HS_POKEMON_MANSION_B1F_ITEM_1 ; C5 X + const HS_POKEMON_MANSION_B1F_ITEM_2 ; C6 X + const HS_POKEMON_MANSION_B1F_ITEM_3 ; C7 X + const HS_POKEMON_MANSION_B1F_ITEM_4 ; C8 X + const HS_POKEMON_MANSION_B1F_ITEM_5 ; C9 X + const HS_MANSION_GUARD ; CA + const HS_SAFARI_ZONE_EAST_ITEM_1 ; CB X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; CC X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; CD X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; CE X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CF X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; D0 X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; D1 X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; D2 X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; D3 X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; D4 X + const HS_SAFARI_ZONE_CENTER_ITEM ; D5 X + const HS_CERULEAN_CAVE_2F_ITEM_1 ; D6 X + const HS_CERULEAN_CAVE_2F_ITEM_2 ; D7 X + const HS_CERULEAN_CAVE_2F_ITEM_3 ; D8 X + const HS_MEWTWO ; D9 X + const HS_CERULEAN_CAVE_B1F_ITEM_1 ; DA X + const HS_CERULEAN_CAVE_B1F_ITEM_2 ; DB X + const HS_VICTORY_ROAD_1F_ITEM_1 ; DC X + const HS_VICTORY_ROAD_1F_ITEM_2 ; DD X + const HS_CHAMPIONS_ROOM_OAK ; DE + const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; DF + const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; E0 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; E1 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; E2 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; E3 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; E4 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; E5 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; E6 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; E7 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E8 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E9 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; EA + const HS_ARTICUNO ; EB + const HS_OLD_SEA_MAP ; EC (can be removed, we can make the it a hidden item instead) + const HS_MEW ; ED + const HS_POKEMON_MANSION_B2F_ITEM_1 ; EE + const HS_POKEMON_MANSION_B2F_ITEM_2 ; EF + const HS_ROUTE_1_OAK ; F0 + const HS_YUJIROU ; F1 + const HS_YUJIROU_REMATCH ; F2 + const HS_MT_MOON_CRATER_ITEM_1 ; F3 + const HS_MT_MOON_CRATER_ITEM_2 ; F4 + const HS_MT_MOON_CRATER_ITEM_3 ; F5 + const HS_MT_MOON_CRATER_ITEM_4 ; F6 + const HS_MT_MOON_CRATER_ITEM_5 ; F7 + const HS_MT_MOON_CRATER_ITEM_6 ; F8 + const HS_MT_MOON_CRATER_ITEM_7 ; F9 + const HS_MT_MOON_CRATER_ITEM_8 ; FA + const HS_MT_MOON_CRATER_ITEM_9 ; FB const HS_GIOVANNIS_ROOM_ITEM_1 ; FC const HS_GIOVANNIS_ROOM_ITEM_2 ; FD const HS_ROCK_TUNNEL_B1F_DOME ; FE - const HS_ROCK_TUNNEL_B1F_HELIX ; FF uh oh - const HS_ROCK_TUNNEL_B1F_AMBER ; $100 seems this still works? - const HS_ROCK_TUNNEL_B1F_WING ; $101 + const HS_ROCK_TUNNEL_B1F_HELIX ; FF + const HS_ROCK_TUNNEL_B1F_AMBER ; 100 + const HS_ROCK_TUNNEL_B1F_WING ; 101 DEF NUM_HS_OBJECTS EQU const_value diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm index f74430f0..25a30d9d 100644 --- a/data/credits/credits_mons.asm +++ b/data/credits/credits_mons.asm @@ -1,21 +1,21 @@ CreditsMons: ; one entry per CRED_TEXT_MON or CRED_TEXT_FADE_MON in CreditsOrder - db VENUSAUR - db ARBOK - db RHYHORN - db FEAROW - db ABRA - db GRAVELER - db HITMONLEE - db TANGELA + db ONIX db STARMIE - db GYARADOS - db DITTO - db OMASTAR - db VILEPLUME - db NIDOKING - db PARASECT - db TAUROS_P - db CRYITHAN - db SANDY_SHOCKS - db TANGROWTH + db GOROCHU + db BELLOSSOM + db CROBAT + db ALAKAZAM + db MAGMORTAR + db RHYPERIOR + db LAPRAS + db MACHAMP + db GENGAR + db DRAGONITE + db VENUSAUR + db CHARIZARD + db TOTARTLE + db OMEGA + db ARTICUNO_G + db ZAPDOS_G + db MOLTRES_G diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index 985b4606..356b8206 100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -216,42 +216,42 @@ CredClub: CredPAAD: db -5, "PAAD TESTING@" CredKEP: - db -5, "KEP STAFF@" + db -4, "KEP STAFF@" CredKEPDevs: - db -4, "KEP DEVELOPERS@" + db -6, "KEP DEVELOPERS@" CredPvK: - db -5, "PLAGUE VON KARMA@" + db -7, "PLAGUE VON KARMA@" CredMAH: - db -6, "MEMENTOMARTHA@" + db -9, "MARTHA'S A. HUMANITY@" CredEma: - db -7, "EMA SKYE@" + db -4, "EMA SKYE@" CredKEPSprites: - db -4, "KEP SPRITES@" + db -5, "KEP SPRITES@" CredAlba: - db -5, "ALBATROSS@" + db -4, "ALBATROSS@" CredHelix: db -6, "HELIX CHAMBER@" CredFO: - db -7, "FRENCH ORANGE@" + db -6, "FRENCH ORANGE@" CredPSDevs: - db -4, "SHOWDOWN MOD@" + db -5, "SHOWDOWN MOD@" CredAus: - db -5, "AUSMA@" + db -2, "AUSMA@" CredPaul: - db -6, "PAULLUXX@" + db -4, "PAULLUXX@" CredDuo: - db -7, "DUOM2@" + db -2, "DUOM2@" CredKEPThanks: - db -4, "SPECIAL THANKS@" + db -6, "SPECIAL THANKS@" CredFrrf: - db -5, "FRRF@" + db -2, "FRRF@" CredDannye: - db -6, "DANNYE33@" + db -4, "DANNYE33@" CredEro: - db -7, "EROSUNICA@" + db -4, "EROSUNICA@" CredChatot: - db -8, "CHATOT4444@" + db -4, "CHATOT4444@" CredEni: - db -9, "ENIGAMI@" + db -3, "ENIGAMI@" CredVort: - db -10, "VORTIENE@" + db -4, "VORTIENE@" diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 4ac45ce3..e7f90cf5 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -422,12 +422,13 @@ MtMoon1FHS: db MT_MOON_1F, $0C, SHOW ; HS_MT_MOON_1F_ITEM_5 db MT_MOON_1F, $0D, SHOW ; HS_MT_MOON_1F_ITEM_6 MtMoonB2FHS: - db MT_MOON_B2F, $02, HIDE ; Jessie - db MT_MOON_B2F, $06, HIDE ; James - db MT_MOON_B2F, $07, SHOW ; Fossil 1 - db MT_MOON_B2F, $08, SHOW ; Fossil 2 - db MT_MOON_B2F, $09, SHOW ; Item 1 - db MT_MOON_B2F, $0A, SHOW ; Item 2 + db MT_MOON_B2F, $02, HIDE ; HS_MT_MOON_B2F_JESSIE + db MT_MOON_B2F, $06, HIDE ; HS_MT_MOON_B2F_JAMES + db MT_MOON_B2F, $07, SHOW ; HS_MT_MOON_B2F_FOSSIL_1 + db MT_MOON_B2F, $08, SHOW ; HS_MT_MOON_B2F_FOSSIL_2 + db MT_MOON_B2F, $09, SHOW ; HS_MT_MOON_B2F_ITEM_1 + db MT_MOON_B2F, $0A, SHOW ; HS_MT_MOON_B2F_ITEM_2 + db MT_MOON_B2F, $0B, HIDE ; HS_MT_MOON_CRATER_GUARD SSAnne2FHS: db SS_ANNE_2F, $02, HIDE ; HS_SS_ANNE_2F_RIVAL SSAnne1FRoomsHS: @@ -601,8 +602,6 @@ MtMoonCraterHS: db MT_MOON_CRATER, $07, SHOW ; HS_MT_MOON_CRATER_ITEM_7 db MT_MOON_CRATER, $08, SHOW ; HS_MT_MOON_CRATER_ITEM_8 db MT_MOON_CRATER, $09, SHOW ; HS_MT_MOON_CRATER_ITEM_9 - db MT_MOON_CRATER, $0A, SHOW ; HS_MT_MOON_CRATER_ITEM_10 - db MT_MOON_CRATER, $0B, SHOW ; HS_MT_MOON_CRATER_ITEM_11 GiovannisRoomHS: db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1 db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2 diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 3f2f4a48..632680a8 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -14,12 +14,13 @@ MtMoonB2F_Object: object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 object_event 9, 3, SPRITE_JESSIE, STAY, LEFT, 2 object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2 - object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 + object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 3 object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 1 object_event 9, 4, SPRITE_JAMES, STAY, LEFT, 6 object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP - object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 10, WING_FOSSIL + object_event 35, 6, SPRITE_FOSSIL, STAY, NONE, 10, WING_FOSSIL + object_event 29, 8, SPRITE_SCIENTIST, STAY, NONE, 11, ; Crater Guard def_warps_to MT_MOON_B2F diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm index cc574777..4f2a1d2d 100644 --- a/data/maps/objects/MtMoonCrater.asm +++ b/data/maps/objects/MtMoonCrater.asm @@ -2,8 +2,8 @@ MtMoonCrater_Object: db $03 ; border block def_warp_events - warp_event 23, 49, MT_MOON_SQUARE, 3 - warp_event 22, 49, MT_MOON_SQUARE, 3 + warp_event 23, 49, MT_MOON_SQUARE, 2 + warp_event 22, 49, MT_MOON_SQUARE, 2 def_bg_events @@ -12,12 +12,10 @@ MtMoonCrater_Object: object_event 33, 17, SPRITE_FOSSIL, STAY, NONE, 2, DOME_FOSSIL object_event 25, 21, SPRITE_FOSSIL, STAY, NONE, 3, WING_FOSSIL object_event 33, 16, SPRITE_FOSSIL, STAY, NONE, 4, HELIX_FOSSIL - object_event 26, 20, SPRITE_FOSSIL, STAY, NONE, 5, OLD_AMBER - object_event 25, 4, SPRITE_POKE_BALL, STAY, NONE, 6, HYPER_POTION - object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 7, MAX_ETHER - object_event 44, 17, SPRITE_POKE_BALL, STAY, NONE, 8, MAX_REVIVE - object_event 17, 20, SPRITE_POKE_BALL, STAY, NONE, 9, HEART_STONE - object_event 20, 20, SPRITE_POKE_BALL, STAY, NONE, 10, POISON_STONE - object_event 32, 45, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_ETHER + object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_ETHER + object_event 44, 17, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE + object_event 17, 20, SPRITE_POKE_BALL, STAY, NONE, 7, HEART_STONE + object_event 20, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POISON_STONE + object_event 32, 45, SPRITE_POKE_BALL, STAY, NONE, 9, MAX_ETHER def_warps_to MT_MOON_CRATER \ No newline at end of file diff --git a/data/maps/objects/MtMoonSquare.asm b/data/maps/objects/MtMoonSquare.asm index 079254c0..898a15d0 100644 --- a/data/maps/objects/MtMoonSquare.asm +++ b/data/maps/objects/MtMoonSquare.asm @@ -2,10 +2,9 @@ MtMoonSquare_Object: db $2C ; border block def_warp_events - warp_event 16, 3, MT_MOON_1F, 10 - warp_event 20, 9, MT_MOON_1F, 10 + warp_event 16, 3, MT_MOON_B1F, 10 warp_event 22, 1, MT_MOON_CRATER, 1 - warp_event 11, 5, MT_MOON_SQUARE_HOUSE, 2 + warp_event 11, 5, MT_MOON_SQUARE_HOUSE, 1 def_bg_events bg_event 15, 5, 4 ; Sign diff --git a/data/maps/objects/MtMoonSquareHouse.asm b/data/maps/objects/MtMoonSquareHouse.asm index 9c39bbfd..e9465a7c 100644 --- a/data/maps/objects/MtMoonSquareHouse.asm +++ b/data/maps/objects/MtMoonSquareHouse.asm @@ -2,8 +2,8 @@ MtMoonSquareHouse_Object: db $a ; border block def_warp_events - warp_event 4, 7, MT_MOON_SQUARE, 4 - warp_event 5, 7, MT_MOON_SQUARE, 4 + warp_event 4, 7, MT_MOON_SQUARE, 3 + warp_event 5, 7, MT_MOON_SQUARE, 3 def_bg_events diff --git a/maps/MtMoonSquare.blk b/maps/MtMoonSquare.blk index c4c776b4..6e317260 100644 --- a/maps/MtMoonSquare.blk +++ b/maps/MtMoonSquare.blk @@ -3,4 +3,4 @@ tn()NttM111 >??,)P -O/$W*)11111111111(,???????????, \ No newline at end of file +O/$WW*)11111111111(,???????????, \ No newline at end of file diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 721bb558..d7e8add7 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -97,9 +97,9 @@ HallofFameRoomScript1: ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject - ;ld a, HS_MT_MOON_CRATER_GUARD - ;ld [wMissableObjectIndex], a - ;predef HideObject + ld a, HS_MT_MOON_CRATER_GUARD + ld [wMissableObjectIndex], a + predef HideObject ld a, HS_ROUTE_1_OAK ld [wMissableObjectIndex], a predef ShowObject diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index 6b0e71e2..239fc791 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -413,6 +413,7 @@ MtMoonB2F_TextPointers: dw MtMoon3Text12 dw MtMoon3Text13 dw MtMoon3Text14 + dw MtMoonCraterGuard MtMoon3TrainerHeaders: def_trainers 3 @@ -640,4 +641,8 @@ MtMoon3EndBattleText5: MtMoon3AfterBattleText5: text_far _MtMoon3AfterBattleText5 + text_end + +MtMoonCraterGuard: + text_far _MtMoonCraterGuard text_end \ No newline at end of file diff --git a/scripts/MtMoonCrater.asm b/scripts/MtMoonCrater.asm index 436b9b4a..dbcccaa9 100644 --- a/scripts/MtMoonCrater.asm +++ b/scripts/MtMoonCrater.asm @@ -15,7 +15,5 @@ MtMoonCrater_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText - dw PickUpItemText - dw PickUpItemText text_end ; unused