diff --git a/maps/CeruleanCaveB1F.asm b/maps/CeruleanCaveB1F.asm index f49dd2c..73321fd 100644 --- a/maps/CeruleanCaveB1F.asm +++ b/maps/CeruleanCaveB1F.asm @@ -34,6 +34,7 @@ CeruleanCaveB1F_MapEvents: def_bg_events bg_event 8, 6, BGEVENT_ITEM + MAX_REVIVE, EVENT_CERULEAN_CAVE_B1F_HIDDEN_MAX_REVIVE bg_event 24, 11, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL + bg_event 7, 13, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene def_object_events object_event 7, 13, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, MEWTWO, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, CeruleanCaveMewtwo, EVENT_CERULEAN_CAVE_MEWTWO diff --git a/maps/CeruleanCity.ablk b/maps/CeruleanCity.ablk index 9995648..d308f02 100644 --- a/maps/CeruleanCity.ablk +++ b/maps/CeruleanCity.ablk @@ -6,9 +6,9 @@ t -n1m0m+% +n1m0mWp t -tttm%Ct +tttmKt t diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 2482d7d..44e87c5 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -283,6 +283,7 @@ CeruleanCity_MapEvents: warp_event 19, 21, CERULEAN_POKECENTER_1F, 1 warp_event 30, 23, CERULEAN_GYM, 1 warp_event 25, 29, CERULEAN_MART, 2 + warp_event 2, 11, CERULEAN_CAVE_1F, 1 def_coord_events @@ -295,7 +296,7 @@ CeruleanCity_MapEvents: bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign - bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene + ;bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene ; To be moved to where Mewtwo will have been sitting. def_object_events object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 diff --git a/maps/Route4.ablk b/maps/Route4.ablk index dd1244a..4b329fc 100644 --- a/maps/Route4.ablk +++ b/maps/Route4.ablk @@ -9,14 +9,14 @@ X $WW+% Z/[Y XX -Z/a) +Z) Y XZ/C)/[ -Z/ook) +Z/oo\k) diff --git a/maps/unused/BetaSproutTower7.ablk b/maps/unused/BetaSproutTower7.ablk index 69da4e7..11adf5b 100644 --- a/maps/unused/BetaSproutTower7.ablk +++ b/maps/unused/BetaSproutTower7.ablk @@ -2,7 +2,7 @@     -      +            \ No newline at end of file