From e1903f5479370a90b0bfe7e6c051d11a3a7e8083 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sun, 7 May 2023 15:56:41 +0100 Subject: [PATCH] Possible hide/show fix I think this should fix some issues with hide/show, but I have no clue why. --- constants/hide_show_constants.asm | 370 +++++++++++++++--------------- data/maps/hide_show_data.asm | 15 +- gfx/pokemon/front/crobat.png | Bin 653 -> 811 bytes gfx/pokemon/front/slowking.png | Bin 761 -> 907 bytes scripts/SilphCo11F.asm | 1 - 5 files changed, 190 insertions(+), 196 deletions(-) diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 4e07e8c6..2c9cb6e2 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -79,190 +79,188 @@ DEF SHOW EQU $15 const HS_POKEMON_TOWER_5F_ITEM ; 43 X const HS_POKEMON_TOWER_6F_ITEM_1 ; 44 X const HS_POKEMON_TOWER_6F_ITEM_2 ; 45 X - const HS_POKEMON_TOWER_7F_JESSIE ; 46 X - const HS_POKEMON_TOWER_7F_JAMES ; 47 X - const HS_POKEMON_TOWER_7F_MR_FUJI ; 49 - const HS_MR_FUJIS_HOUSE_MR_FUJI ; 4A - const HS_CELADON_MANSION_EEVEE_GIFT ; 4B - const HS_GAME_CORNER_ROCKET ; 4C - const HS_WARDENS_HOUSE_ITEM ; 4D X - const HS_POKEMON_MANSION_1F_ITEM_1 ; 4E X - const HS_POKEMON_MANSION_1F_ITEM_2 ; 4F X - const HS_FIGHTING_DOJO_GIFT_1 ; 50 - const HS_FIGHTING_DOJO_GIFT_2 ; 51 - const HS_SILPH_CO_1F_RECEPTIONIST ; 52 - const HS_VOLTORB_1 ; 53 X - const HS_VOLTORB_2 ; 54 X - const HS_VOLTORB_3 ; 55 X - const HS_ELECTRODE_1 ; 56 X - const HS_VOLTORB_4 ; 57 X - const HS_VOLTORB_5 ; 58 X - const HS_ELECTRODE_2 ; 59 X - const HS_VOLTORB_6 ; 5A X - const HS_ZAPDOS ; 5B X - const HS_POWER_PLANT_ITEM_1 ; 5C X - const HS_POWER_PLANT_ITEM_2 ; 5D X - const HS_POWER_PLANT_ITEM_3 ; 5E X - const HS_POWER_PLANT_ITEM_4 ; 5F X - const HS_POWER_PLANT_ITEM_5 ; 60 X - const HS_GYAOON ; 61 X - const HS_VICTORY_ROAD_2F_ITEM_1 ; 62 X - const HS_VICTORY_ROAD_2F_ITEM_2 ; 63 X - const HS_VICTORY_ROAD_2F_ITEM_3 ; 64 X - const HS_VICTORY_ROAD_2F_ITEM_4 ; 65 X - const HS_VICTORY_ROAD_2F_BOULDER ; 66 - const HS_BILL_POKEMON ; 67 - const HS_BILL_1 ; 68 - const HS_BILL_2 ; 69 - const HS_BILLS_NIDORINO ; 6A - const HS_VIRIDIAN_FOREST_ITEM_1 ; 6B X - const HS_VIRIDIAN_FOREST_ITEM_2 ; 6C X - const HS_VIRIDIAN_FOREST_ITEM_3 ; 6D X - const HS_MT_MOON_1F_ITEM_1 ; 6E X - const HS_MT_MOON_1F_ITEM_2 ; 6F X - const HS_MT_MOON_1F_ITEM_3 ; 70 X - const HS_MT_MOON_1F_ITEM_4 ; 71 X - const HS_MT_MOON_1F_ITEM_5 ; 72 X - const HS_MT_MOON_1F_ITEM_6 ; 73 X - const HS_MT_MOON_B2F_FOSSIL_1 ; 74 - const HS_MT_MOON_B2F_FOSSIL_2 ; 75 - const HS_MT_MOON_B2F_ITEM_1 ; 76 X - const HS_MT_MOON_B2F_ITEM_2 ; 77 X - const HS_MT_MOON_CRATER_GUARD ; 78 - const HS_SS_ANNE_2F_RIVAL ; 79 - const HS_SS_ANNE_1F_ROOMS_ITEM ; 7A X - const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 7B X - const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 7C X - const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7D X - const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7E X - const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 7F X - const HS_WUGTRIO ; 80 X - const HS_VICTORY_ROAD_3F_ITEM_1 ; 81 X - const HS_VICTORY_ROAD_3F_ITEM_2 ; 82 X - const HS_VICTORY_ROAD_3F_BOULDER ; 83 - const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 84 X - const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 85 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 86 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 87 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 88 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 89 X - const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 8A X - const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 8B X - const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 8C - const HS_ROCKET_HIDEOUT_B4F_JAMES ; uhhh 86 - const HS_ROCKET_HIDEOUT_B4F_JESSIE ; uhhh87 - const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 8D X - const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 8E X - const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 8F X - const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 90 - const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 91 - const HS_GARNET_ARTICUNO_G ; 92 - const HS_SILPH_CO_2F_1 ; 93 XXX never (de)activated? - const HS_SILPH_CO_2F_2 ; 94 - const HS_SILPH_CO_3F_1 ; 95 - const HS_SILPH_CO_3F_2 ; 96 - const HS_SILPH_CO_3F_ITEM ; 97 X - const HS_SILPH_CO_4F_1 ; 98 - const HS_SILPH_CO_4F_2 ; 99 - const HS_SILPH_CO_4F_3 ; 9A - const HS_SILPH_CO_4F_ITEM_1 ; 9B X - const HS_SILPH_CO_4F_ITEM_2 ; 9C X - const HS_SILPH_CO_4F_ITEM_3 ; 9D X - const HS_SILPH_CO_5F_1 ; 9E - const HS_SILPH_CO_5F_2 ; 9F - const HS_SILPH_CO_5F_3 ; A0 - const HS_SILPH_CO_5F_4 ; A1 - const HS_SILPH_CO_5F_ITEM_1 ; A2 X - const HS_SILPH_CO_5F_ITEM_2 ; A3 X - const HS_SILPH_CO_5F_ITEM_3 ; A4 X - const HS_SILPH_CO_6F_1 ; A5 - const HS_SILPH_CO_6F_2 ; A6 - const HS_SILPH_CO_6F_3 ; A7 - const HS_SILPH_CO_6F_ITEM_1 ; A8 X - const HS_SILPH_CO_6F_ITEM_2 ; A9 X - const HS_SILPH_CO_7F_1 ; AA - const HS_SILPH_CO_7F_2 ; AB - const HS_SILPH_CO_7F_3 ; AC - const HS_SILPH_CO_7F_4 ; AD - const HS_SILPH_CO_7F_RIVAL ; AE - const HS_SILPH_CO_7F_ITEM_1 ; AF X - const HS_SILPH_CO_7F_ITEM_2 ; B0 X - const HS_SILPH_CO_7F_8 ; B1 XXX sprite doesn't exist - const HS_SILPH_CO_8F_1 ; B2 - const HS_SILPH_CO_8F_2 ; B3 - const HS_SILPH_CO_8F_3 ; B4 - const HS_SILPH_CO_10F_1 ; B5 - const HS_SILPH_CO_10F_2 ; B6 - const HS_SILPH_CO_10F_3 ; B7 XXX never (de)activated? - const HS_SILPH_CO_10F_ITEM_1 ; B8 X - const HS_SILPH_CO_10F_ITEM_2 ; B9 X - const HS_SILPH_CO_10F_ITEM_3 ; BA X - const HS_SILPH_CO_11F_1 ; BB - const HS_SILPH_CO_11F_2 ; BC - const HS_SILPH_CO_11F_3 ; BD - const HS_OMEGA ; BE - const HS_DRAGONITE ; BF - const HS_MOLTRES ; C0 - const HS_POKEMON_MANSION_2F_ITEM ; C1 X - const HS_POKEMON_MANSION_3F_ITEM_1 ; C2 X - const HS_POKEMON_MANSION_3F_ITEM_2 ; C3 X - const HS_POKEMON_MANSION_B1F_ITEM_1 ; C4 X - const HS_POKEMON_MANSION_B1F_ITEM_2 ; C5 X - const HS_POKEMON_MANSION_B1F_ITEM_3 ; C6 X - const HS_POKEMON_MANSION_B1F_ITEM_4 ; C7 X - const HS_POKEMON_MANSION_B1F_ITEM_5 ; C8 X - const HS_MANSION_GUARD ; C9 - const HS_SAFARI_ZONE_EAST_ITEM_1 ; CA X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; CB X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; CC X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; CD X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CE X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CF X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; D0 X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; D1 X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; D2 X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; D3 X - const HS_SAFARI_ZONE_CENTER_ITEM ; D4 X - const HS_CERULEAN_CAVE_2F_ITEM_1 ; D5 X - const HS_CERULEAN_CAVE_2F_ITEM_2 ; D6 X - const HS_CERULEAN_CAVE_2F_ITEM_3 ; D7 X - const HS_MEWTWO ; D8 X - const HS_CERULEAN_CAVE_B1F_ITEM_1 ; D9 X - const HS_CERULEAN_CAVE_B1F_ITEM_2 ; DA X - const HS_VICTORY_ROAD_1F_ITEM_1 ; DB X - const HS_VICTORY_ROAD_1F_ITEM_2 ; DC X - const HS_CHAMPIONS_ROOM_OAK ; DD - const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; DE - const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; DF - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; E0 - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; E1 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; E2 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; E3 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; E4 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; E5 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; E6 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E7 - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E8 - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E9 - const HS_ARTICUNO ; EA - const HS_OLD_SEA_MAP ; EB - const HS_MEW ; EC - const HS_POKEMON_MANSION_B2F_ITEM_1 ; ED - const HS_POKEMON_MANSION_B2F_ITEM_2 ; EE - const HS_ROUTE_1_OAK ; EF - const HS_YUJIROU ; F0 - const HS_YUJIROU_REMATCH ; F1 - const HS_MT_MOON_CRATER_ITEM_1 ; F2 - const HS_MT_MOON_CRATER_ITEM_2 ; F3 - const HS_MT_MOON_CRATER_ITEM_3 ; F4 - const HS_MT_MOON_CRATER_ITEM_4 ; F5 - const HS_MT_MOON_CRATER_ITEM_5 ; F6 - const HS_MT_MOON_CRATER_ITEM_6 ; F7 - const HS_MT_MOON_CRATER_ITEM_7 ; F8 - const HS_MT_MOON_CRATER_ITEM_8 ; F9 - const HS_MT_MOON_CRATER_ITEM_9 ; FA - const HS_MT_MOON_CRATER_ITEM_10 ; FB - const HS_MT_MOON_CRATER_ITEM_11 ; FC - const HS_GIOVANNIS_ROOM_ITEM_1 ; FD - const HS_GIOVANNIS_ROOM_ITEM_2 ; FE uh oh + const HS_POKEMON_TOWER_7F_JESSIE ; 46 X + const HS_POKEMON_TOWER_7F_JAMES ; 47 X + const HS_POKEMON_TOWER_7F_MR_FUJI ; 48 + const HS_MR_FUJIS_HOUSE_MR_FUJI ; 49 + const HS_CELADON_MANSION_EEVEE_GIFT ; 4A + const HS_GAME_CORNER_ROCKET ; 4B + const HS_WARDENS_HOUSE_ITEM ; 4C X + const HS_POKEMON_MANSION_1F_ITEM_1 ; 4D X + const HS_POKEMON_MANSION_1F_ITEM_2 ; 4E X + const HS_FIGHTING_DOJO_GIFT_1 ; 4F + const HS_FIGHTING_DOJO_GIFT_2 ; 50 + const HS_SILPH_CO_1F_RECEPTIONIST ; 51 + const HS_VOLTORB_1 ; 52 X + const HS_VOLTORB_2 ; 53 X + const HS_VOLTORB_3 ; 54 X + const HS_ELECTRODE_1 ; 55 X + const HS_VOLTORB_4 ; 56 X + const HS_VOLTORB_5 ; 57 X + const HS_ELECTRODE_2 ; 58 X + const HS_VOLTORB_6 ; 59 X + const HS_ZAPDOS ; 5A X + const HS_POWER_PLANT_ITEM_1 ; 5B X + const HS_POWER_PLANT_ITEM_2 ; 5C X + const HS_POWER_PLANT_ITEM_3 ; 5D X + const HS_POWER_PLANT_ITEM_4 ; 5E X + const HS_POWER_PLANT_ITEM_5 ; 5F X + const HS_GYAOON ; 60 X + const HS_VICTORY_ROAD_2F_ITEM_1 ; 61 X + const HS_VICTORY_ROAD_2F_ITEM_2 ; 62 X + const HS_VICTORY_ROAD_2F_ITEM_3 ; 63 X + const HS_VICTORY_ROAD_2F_ITEM_4 ; 64 X + const HS_VICTORY_ROAD_2F_BOULDER ; 65 + const HS_BILL_POKEMON ; 66 + const HS_BILL_1 ; 67 + const HS_BILL_2 ; 68 + const HS_BILLS_NIDORINO ; 69 + const HS_VIRIDIAN_FOREST_ITEM_1 ; 6A X + const HS_VIRIDIAN_FOREST_ITEM_2 ; 6B X + const HS_VIRIDIAN_FOREST_ITEM_3 ; 6C X + const HS_MT_MOON_1F_ITEM_1 ; 6D X + const HS_MT_MOON_1F_ITEM_2 ; 6E X + const HS_MT_MOON_1F_ITEM_3 ; 6F X + 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_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_MT_MOON_CRATER_GUARD ; 77 + 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_GIOVANNIS_ROOM_ITEM_1 ; FC + const HS_GIOVANNIS_ROOM_ITEM_2 ; FD DEF NUM_HS_OBJECTS EQU const_value diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 1ffcfb72..dce42648 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -211,7 +211,7 @@ MapHSPointers: dw NoHS dw NoHS dw GarnetCavernB1FHS - dw SilphCo2FHS + dw NoHS dw SilphCo3FHS dw SilphCo4FHS dw SilphCo5FHS @@ -361,9 +361,9 @@ PokemonTower6FHS: db POKEMON_TOWER_6F, $04, SHOW ; HS_POKEMON_TOWER_6F_ITEM_1 db POKEMON_TOWER_6F, $05, SHOW ; HS_POKEMON_TOWER_6F_ITEM_2 PokemonTower7FHS: - db POKEMON_TOWER_7F, $01, HIDE ; jessie & james? - db POKEMON_TOWER_7F, $02, HIDE - db POKEMON_TOWER_7F, $03, SHOW + db POKEMON_TOWER_7F, $01, HIDE ; HS_POKEMON_TOWER_7F_JESSIE + db POKEMON_TOWER_7F, $02, HIDE ; HS_POKEMON_TOWER_7F_JAMES + db POKEMON_TOWER_7F, $03, SHOW ; HS_POKEMON_TOWER_7F_MR_FUJI MrFujisHouseHS: db MR_FUJIS_HOUSE, $05, HIDE ; HS_MR_FUJIS_HOUSE_MR_FUJI CeladonMansionRoofHouseHS: @@ -463,9 +463,6 @@ RocketHideoutB4FHS: db ROCKET_HIDEOUT_B4F, $09, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_5 GarnetCavernB1FHS: db GARNET_CAVERN_B1F, $01, SHOW ; HS_GARNET_ARTICUNO_G, SHOW for testing reasons -SilphCo2FHS: - db SILPH_CO_2F, $01, SHOW ; HS_SILPH_CO_2F_1 - db SILPH_CO_2F, $02, SHOW ; HS_SILPH_CO_2F_2 SilphCo3FHS: db SILPH_CO_3F, $02, SHOW ; HS_SILPH_CO_3F_1 db SILPH_CO_3F, $03, SHOW ; HS_SILPH_CO_3F_2 @@ -603,8 +600,8 @@ MtMoonCraterHS: 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 + db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1 + db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2 db $FF, $01, SHOW ; end assert_table_length NUM_HS_OBJECTS + 1 diff --git a/gfx/pokemon/front/crobat.png b/gfx/pokemon/front/crobat.png index e5d7335518a2a542df7f029bd08d378a0f6f8006..f38e974dd44f732e9037949f585b0ff64ef38f12 100644 GIT binary patch literal 811 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkX+b}oLsBh`yqfkKS=MSdZS=NFaF0&-MKTq8ge08glbfGSez?Yj`bi zDG#V2DmB70&DWPf3&`eRU}Y3yU;F-Q-XmJj-F0_3jtba4#PIA44DVAgF10k#LZ&KfLTNhwcRqny`9SBFKm-)f(; zEulBFMoYrW^S6NN!gSUa@9Ny-4c|0{thr81Z;|^g5+~@Sk-SWMt&X>Di1^2kn-BM; z9a-^h!~Tl6<-0?ZZJvg%I(X9UInTq|l~0Y`&duIhpngSWP4`)~ri)Jx7+YmFKWqJb z_`+|VnB@gIJ0yP3TJ`bb2i85;%Hzu1+t%G*s-t^@&Dy*AVD7mk+9n$X@4U=DubCMk zS?wq#&|8u<)8w(RSK0MUkJS?<@tuFck~#m~uPa6^g1`F3nxcBR_%`Ym%$dCH{-gH$ zlP8^icv_ZIiPia*^*q<#Hm!Y$e`FUQx4FpsG{n8A{^?dLUuT(liZ(V+KPS0WGg=0( zmbp3A{p0epEbC`1|IxPp$;)Q0{w4d|JpU*y=DIvj#(DpfgT)MgMY-?!h&J5U*->=< zooRC3kKnc}>A0hZE=+ZLYZU!-tHh~|2X=0nI^TG1gI(+OiWy%Ih%r-tI2Uf;>K-fb5N)E{-7;b9$%bPCBf>(dMYf@Q$^qn$hUq z|2*y)TV|Qf{MzpOe5QE3oyf1lP3{@|5?;)^!oBKmztbq0@@uY?gL&bvuLsV)U2sC( zB*TmO+G^ku5Y(U=%;WrO#Ux(FKce}+dxa?+alFqnylkuB~ z?T>iFj(t(Kakk&!vOHmV$1K}Qf15D=Q#Z;td9YNr>3!9?V=nSlrZ-Ju`LTD(|MtnR z*FUXjJo5$*qs-$wU&Zg-oxoJn{_vZ|A$AkqRreDUJ=L7#Crk~fFM23ib#}X*g7W$T z{lK}o4znK}O0cu!ICw(MTi~#~)BNfaCLeXba&k<+Sg&uU_Qd>4^yg3ck#V-4nX{)q zS##}kl%tP|UO;F+`;qE*Yv&qopZ1KsCw_Ld;7nQPpFj1)GEWufK5u=)c|rCI;}vU( o_5Kf~XH1))(5_zb{M-Bw{N}>SpAOjyT?WUxr>mdKI;Vst0Gc-VQvd(} diff --git a/gfx/pokemon/front/slowking.png b/gfx/pokemon/front/slowking.png index c9a3f16a7cb85553c1b3ea6f559a2932df1dd594..801650ed2931177392f08cb89a791ac3cbae617d 100644 GIT binary patch literal 907 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkX+b}oLsBh`yqfkKS=MSdZS=NFaF0&-MKTq8RWfWpy2C^7|kbzN(0pw*Mi@}Rg8qN-4)PSl11{9Mp zLOoC&2zUT7NDr8n5BhEbRK@M-;uxZF-uI$owy>iJ`-hd?T%tT()j~ZFPA=e3y5W4f z#z8Ke)r#J$LzTCw%N}!;xc%DvbKqP!)0&t z-2xBhyB8kv{Sok?JowtftIb=t-Q2^v=u_FtmFX6Yj%FvOu24J{+iT9&-)%bNDj}AY1+OO^?##3EX$s_x3mig4#u2xRx=5AeXl0U&X-=prRUe>L1 zyVFxXl}&x&vQ1iN!JUtO&YRhK1;gxqeA=1Du%ts^=KqC~sT_@5JIjKn3tjH2KUq3C zJS2x*Y0|cb*JTTN$KOuCz$uUQ+Hf0X^{v>Qis zT)MM=vBk$Helahc#69)+vnxvvD5mYY_2ZBZ$D4M~MfM#Ne9k_d#mKb8&*9Z;`yX4v UH~Ds4vI3i_@% delta 733 zcmeBX|H(Q*BAA7lfq@}vg_-tI2Uf;>K-7#NsjJzX3_D&~|IXV z>ht;6sO3JZ^ef#xU*Usu!tYl*_8e$m@Q*)i>n-1p_52ZQqCUy4|H!?Yan`YU_6wuW z9o_fvb(zw3Idz^tPPuholMbovU-*O7<_KGUUiFVNPE{K`cJs=2*w$4mJ+N;1p0U?N z%yU++VUffo?$zqg8B3WmdJTmR%fF~xo+qM~dSs$SoP_(cd+R3u@!87SHhF$idRb+~ z$<6zIMtwKR4QQ|bEyGX{lb6O=uQg?_fr?VijRH04kdNPGOf2`j+Hl}i!zU4X>;#be( z{d50}tDjQLLid+ZP21B>C4UiJ6@E8bf2SP7m8j@Mo9B)DI{FOFZYVA&-*jZL;hM^{ zChl46&dJv=yQ?Vi$v^xX%#zn*%6Sk_o$#l{>FR(BDkwlTM zon64*pSO5Z-!9Zvw~_O16n|Bpqjk{F+}ijCH~V3kFe|3O*t==n-~7WFm9FRHJ5+wN z46hcuH{X6kHpi_8b(iCAna&Ge5^2G<`f|!u`_$7@GMAk;J!@>Qyh2m<{GH0}C*l;3 z%ANH8DLgkm^i6}N`HtDUT&(9ad^TI$9{r|%cKC<1L&jfYK&i{q)z4*}Q$iB}B)}|_ diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 14b17aae..3c3deeea 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -199,7 +199,6 @@ MissableObjectIDs_6219b: db HS_SAFFRON_CITY_E db HS_SAFFRON_CITY_F db HS_SAFFRON_CITY_UP_GRADE - db HS_SILPH_CO_2F_2 db HS_SILPH_CO_3F_1 db HS_SILPH_CO_3F_2 db HS_SILPH_CO_4F_1