From f5b07a0d225032a25117f6ecd3225ca341bb8b0d Mon Sep 17 00:00:00 2001 From: Sahith Nallapareddy Date: Sun, 19 Jan 2020 23:58:47 -0500 Subject: [PATCH] added mewtwo --- data/event_scripts.s | 3 + .../BattleFrontier_OutsideWest/map.bin | Bin 8064 -> 8064 bytes data/layouts/CeruleanCave_1F/border.bin | 1 + data/layouts/CeruleanCave_1F/map.bin | Bin 0 -> 1840 bytes data/layouts/CeruleanCave_2F/border.bin | 1 + data/layouts/CeruleanCave_2F/map.bin | 5 + data/layouts/CeruleanCave_B1F/border.bin | 1 + data/layouts/CeruleanCave_B1F/map.bin | Bin 0 -> 1840 bytes data/layouts/layouts.json | 8858 +++++++++-------- data/maps/BattleFrontier_OutsideWest/map.json | 922 +- data/maps/CeruleanCave_1F/map.json | 158 + data/maps/CeruleanCave_1F/scripts.inc | 2 + data/maps/CeruleanCave_2F/map.json | 196 + data/maps/CeruleanCave_2F/scripts.inc | 2 + data/maps/CeruleanCave_B1F/map.json | 161 + data/maps/CeruleanCave_B1F/scripts.inc | 22 + data/maps/CeruleanCave_B1F/text.inc | 3 + data/maps/FarawayIsland_Interior/map.json | 98 +- data/maps/GraniteCave_1F/map.json | 152 +- data/maps/LittlerootTown/map.json | 532 +- data/maps/map_groups.json | 1317 ++- graphics/event_objects/palettes/mewtwo.pal | 19 + .../event_objects/pics/pokemon/mewtwo.png | Bin 0 -> 2085 bytes include/constants/event_objects.h | 2 +- include/constants/flags.h | 4 +- include/constants/layouts.h | 3 + include/constants/map_groups.h | 3 + .../field_event_obj/event_object_graphics.h | 2 +- .../event_object_graphics_info.h | 2 +- .../event_object_graphics_info_pointers.h | 4 +- .../field_event_obj/event_object_pic_tables.h | 7 +- src/data/wild_encounters.json | 462 + 32 files changed, 6983 insertions(+), 5959 deletions(-) create mode 100644 data/layouts/CeruleanCave_1F/border.bin create mode 100644 data/layouts/CeruleanCave_1F/map.bin create mode 100644 data/layouts/CeruleanCave_2F/border.bin create mode 100644 data/layouts/CeruleanCave_2F/map.bin create mode 100644 data/layouts/CeruleanCave_B1F/border.bin create mode 100644 data/layouts/CeruleanCave_B1F/map.bin create mode 100644 data/maps/CeruleanCave_1F/map.json create mode 100644 data/maps/CeruleanCave_1F/scripts.inc create mode 100644 data/maps/CeruleanCave_2F/map.json create mode 100644 data/maps/CeruleanCave_2F/scripts.inc create mode 100644 data/maps/CeruleanCave_B1F/map.json create mode 100644 data/maps/CeruleanCave_B1F/scripts.inc create mode 100644 data/maps/CeruleanCave_B1F/text.inc create mode 100644 graphics/event_objects/palettes/mewtwo.pal create mode 100644 graphics/event_objects/pics/pokemon/mewtwo.png diff --git a/data/event_scripts.s b/data/event_scripts.s index 2d56bae9fbb2..15fcf6a67983 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -547,6 +547,9 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/NavelRock_Down11/scripts.inc" .include "data/maps/NavelRock_Bottom/scripts.inc" .include "data/maps/TrainerHill_Elevator/scripts.inc" + .include "data/maps/CeruleanCave_1F/scripts.inc" + .include "data/maps/CeruleanCave_2F/scripts.inc" + .include "data/maps/CeruleanCave_B1F/scripts.inc" .include "data/maps/Route104_Prototype/scripts.inc" .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc" .include "data/maps/Route109_SeashoreHouse/scripts.inc" diff --git a/data/layouts/BattleFrontier_OutsideWest/map.bin b/data/layouts/BattleFrontier_OutsideWest/map.bin index d43111bda9d96982e9677ccd8f3897c447672c99..f4575502309ad4b01c68496060e8a18c0b9ea187 100644 GIT binary patch delta 37 qcmZp$Z?NC+N}O{(%Sx6SAf7+@vv@k!a)ufpuZCqg!{!tT8Fl~#?+k+g delta 37 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 P00000NkvXXu0mjf0PWol literal 0 HcmV?d00001 diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index d60c05bb4e82..6b5906fed837 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -81,7 +81,7 @@ #define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77 #define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78 #define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL 79 -#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL 80 +#define EVENT_OBJ_GFX_MEWTWO 80 #define EVENT_OBJ_GFX_SNORLAX 81 #define EVENT_OBJ_GFX_CUTTABLE_TREE 82 #define EVENT_OBJ_GFX_MART_EMPLOYEE 83 diff --git a/include/constants/flags.h b/include/constants/flags.h index ffc57139bfd5..defe96e846f1 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -502,13 +502,13 @@ #define FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL 0x1D8 #define FLAG_ENABLE_JUAN_MATCH_CALL 0x1D9 -#define FLAG_SNORLAX 0x1DA // Unused Flag +#define FLAG_SNORLAX 0x1DA // used Snorlax #define FLAG_HAS_MYSTIC_TICKET 0x1DB #define FLAG_DEFEATED_HO_OH 0x1DC #define FLAG_DEFEATED_LUGIA 0x1DD -#define FLAG_UNUSED_0x1DE 0x1DE // Unused Flag +#define FLAG_MEWTWO 0x1DE // used MewTwo #define FLAG_UNUSED_0x1DF 0x1DF // Unused Flag #define FLAG_UNUSED_0x1E0 0x1E0 // Unused Flag #define FLAG_UNUSED_0x1E1 0x1E1 // Unused Flag diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 3e876f4993ab..3ed570427d80 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -442,5 +442,8 @@ #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441 +#define LAYOUT_CERULEAN_CAVE_1F 442 +#define LAYOUT_CERULEAN_CAVE_2F 443 +#define LAYOUT_CERULEAN_CAVE_B1F 444 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 17fe7ab5336e..fedf712be8e9 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -550,6 +550,9 @@ #define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) #define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) #define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) +#define MAP_CERULEAN_CAVE_1F (89 | (26 << 8)) +#define MAP_CERULEAN_CAVE_2F (90 | (26 << 8)) +#define MAP_CERULEAN_CAVE_B1F (91 | (26 << 8)) // Map Group 27 #define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index fcdaea929839..430cf61369e5 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -186,7 +186,7 @@ const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/ const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); -const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gEventObjectPic_MewTwo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mewtwo.4bpp"); const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h index 21bc7526143b..f5cc0666b344 100755 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -41,6 +41,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xFF const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MewTwo = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MewTwo, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Snorlax = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SnorlaxStill, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; @@ -79,7 +80,6 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = { const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 17408562a0c2..af3adaa43bcc 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -79,7 +79,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MewTwo; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee; @@ -328,7 +328,7 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gEventObjectGraphicsInfo_UnusedSquirtleDoll, [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gEventObjectGraphicsInfo_UnusedWooperDoll, - [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_UnusedPikachuDoll, + [EVENT_OBJ_GFX_MEWTWO] = &gEventObjectGraphicsInfo_MewTwo, [EVENT_OBJ_GFX_SNORLAX] = &gEventObjectGraphicsInfo_Snorlax, [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gEventObjectGraphicsInfo_CuttableTree, [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gEventObjectGraphicsInfo_MartEmployee, diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index 83dbfaa97f9d..97d5c59a6a56 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -847,8 +847,11 @@ const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { obj_frame_tiles(gEventObjectPic_UnusedWooperDoll), }; -const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll), +const struct SpriteFrameImage gEventObjectPicTable_MewTwo[] = { + obj_frame_tiles(gEventObjectPic_MewTwo), + obj_frame_tiles(gEventObjectPic_MewTwo), + obj_frame_tiles(gEventObjectPic_MewTwo), + obj_frame_tiles(gEventObjectPic_MewTwo), }; const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 63238b345b24..81743407b715 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -13460,6 +13460,468 @@ } ] } + }, + { + "map": "MAP_CERULEAN_CAVE_1F", + "base_label": "gCeruleanCave_1F", + "land_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 49, + "max_level": 52, + "species": "SPECIES_PARASECT" + }, + { + "min_level": 49, + "max_level": 49, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 50, + "max_level": 50, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 49, + "max_level": 49, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 52, + "max_level": 56, + "species": "SPECIES_PARASECT" + }, + { + "min_level": 52, + "max_level": 55, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 55, + "max_level": 56, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 56, + "max_level": 57, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 55, + "max_level": 55, + "species": "SPECIES_DITTO" + }, + { + "min_level": 55, + "max_level": 55, + "species": "SPECIES_DITTO" + }, + { + "min_level": 56, + "max_level": 56, + "species": "SPECIES_WOBBUFFET" + }, + { + "min_level": 58, + "max_level": 58, + "species": "SPECIES_WOBBUFFET" + } + ] + }, + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 50, + "max_level": 55, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 55, + "max_level": 60, + "species": "SPECIES_GOLDUCK" + }, + { + "min_level": 40, + "max_level": 60, + "species": "SPECIES_GOLDUCK" + } + ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 30, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 30, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 45, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 45, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + } + ] + } + }, + { + "map": "MAP_CERULEAN_CAVE_2F", + "base_label": "gCeruleanCave_2F", + "land_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 49, + "max_level": 52, + "species": "SPECIES_PARASECT" + }, + { + "min_level": 49, + "max_level": 49, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 50, + "max_level": 50, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 49, + "max_level": 49, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 52, + "max_level": 56, + "species": "SPECIES_PARASECT" + }, + { + "min_level": 52, + "max_level": 55, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 55, + "max_level": 56, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 56, + "max_level": 57, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 55, + "max_level": 55, + "species": "SPECIES_DITTO" + }, + { + "min_level": 55, + "max_level": 55, + "species": "SPECIES_DITTO" + }, + { + "min_level": 56, + "max_level": 56, + "species": "SPECIES_WOBBUFFET" + }, + { + "min_level": 58, + "max_level": 58, + "species": "SPECIES_WOBBUFFET" + } + ] + }, + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 50, + "max_level": 55, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 55, + "max_level": 60, + "species": "SPECIES_GOLDUCK" + }, + { + "min_level": 40, + "max_level": 60, + "species": "SPECIES_GOLDUCK" + } + ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 30, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 30, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 45, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 45, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + } + ] + } + }, + { + "map": "MAP_CERULEAN_CAVE_B1F", + "base_label": "gCeruleanCave_B1F", + "land_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 49, + "max_level": 52, + "species": "SPECIES_PARASECT" + }, + { + "min_level": 49, + "max_level": 49, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 50, + "max_level": 50, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 49, + "max_level": 49, + "species": "SPECIES_MAGNETON" + }, + { + "min_level": 52, + "max_level": 56, + "species": "SPECIES_PARASECT" + }, + { + "min_level": 52, + "max_level": 55, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 55, + "max_level": 56, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 56, + "max_level": 57, + "species": "SPECIES_PRIMEAPE" + }, + { + "min_level": 55, + "max_level": 55, + "species": "SPECIES_DITTO" + }, + { + "min_level": 55, + "max_level": 55, + "species": "SPECIES_DITTO" + }, + { + "min_level": 56, + "max_level": 56, + "species": "SPECIES_WOBBUFFET" + }, + { + "min_level": 58, + "max_level": 58, + "species": "SPECIES_WOBBUFFET" + } + ] + }, + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 50, + "max_level": 55, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_SLOWPOKE" + }, + { + "min_level": 55, + "max_level": 60, + "species": "SPECIES_GOLDUCK" + }, + { + "min_level": 40, + "max_level": 60, + "species": "SPECIES_GOLDUCK" + } + ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 30, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 30, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 40, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 45, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 45, + "max_level": 50, + "species": "SPECIES_GYARADOS" + }, + { + "min_level": 40, + "max_level": 55, + "species": "SPECIES_GYARADOS" + } + ] + } } ] },