diff --git a/gflib/sprite.c b/gflib/sprite.c index 17257276bf..3236fa6558 100644 --- a/gflib/sprite.c +++ b/gflib/sprite.c @@ -932,12 +932,16 @@ void AnimCmd_frame(struct Sprite *sprite) if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) SetSpriteOamFlipBits(sprite, hFlip, vFlip); - if (sprite->usingSheet) { + if (sprite->usingSheet) + { if (OW_GFX_COMPRESS && sprite->sheetSpan) imageValue = (imageValue + 1) << sprite->sheetSpan; sprite->oam.tileNum = sprite->sheetTileStart + imageValue; - } else + } + else + { RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); + } } void AnimCmd_end(struct Sprite *sprite) @@ -968,12 +972,16 @@ void AnimCmd_jump(struct Sprite *sprite) if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) SetSpriteOamFlipBits(sprite, hFlip, vFlip); - if (sprite->usingSheet) { + if (sprite->usingSheet) + { if (OW_GFX_COMPRESS && sprite->sheetSpan) imageValue = (imageValue + 1) << sprite->sheetSpan; sprite->oam.tileNum = sprite->sheetTileStart + imageValue; - } else + } + else + { RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); + } } void AnimCmd_loop(struct Sprite *sprite) @@ -1449,7 +1457,8 @@ u16 LoadSpriteSheet(const struct SpriteSheet *sheet) } // Like LoadSpriteSheet, but checks if already loaded, and uses template image frames -u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u32 frame, s32 offset) { +u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u32 frame, s32 offset) +{ u16 tileStart; struct SpriteSheet sheet; // error if template is null or tile tag or images not set @@ -1750,6 +1759,7 @@ static const u8 sSpanPerImage[4][4] = // For a given sprite shape & size, returns // the value for sheetSpan: // i.e, a 32x32 sprite has span 4, because 1 << 4 == 16 == 4x4 tiles -u32 GetSpanPerImage(u32 shape, u32 size) { +u32 GetSpanPerImage(u32 shape, u32 size) +{ return sSpanPerImage[shape][size]; } diff --git a/extract_sprites.py b/migration_scripts/followers/extract_sprites.py similarity index 100% rename from extract_sprites.py rename to migration_scripts/followers/extract_sprites.py diff --git a/follower_emotions.py b/migration_scripts/followers/follower_emotions.py similarity index 100% rename from follower_emotions.py rename to migration_scripts/followers/follower_emotions.py diff --git a/front_palette.py b/migration_scripts/followers/front_palette.py similarity index 100% rename from front_palette.py rename to migration_scripts/followers/front_palette.py diff --git a/palette.py b/migration_scripts/followers/palette.py old mode 100755 new mode 100644 similarity index 100% rename from palette.py rename to migration_scripts/followers/palette.py diff --git a/rename.sh b/migration_scripts/followers/rename.sh similarity index 100% rename from rename.sh rename to migration_scripts/followers/rename.sh diff --git a/tools/test.py b/migration_scripts/followers/rename_to_graphics_pokemon.py similarity index 83% rename from tools/test.py rename to migration_scripts/followers/rename_to_graphics_pokemon.py index e06ec82037..bad1758b0c 100644 --- a/tools/test.py +++ b/migration_scripts/followers/rename_to_graphics_pokemon.py @@ -4,8 +4,14 @@ import json import os import subprocess -# get compatibility from jsons -def construct_compatibility_dict(): +# THIS IS A TEMPORARY SCRIPT MADE TO MOVE EXISTING FOLLOWER GRAPHICS FROM A SINGLE DIRECTORY. +# IT TAKES FOLLOWER GRAPHICS FROM a 'followers' FOLDER IN THE ROOT FOLDER AND MOVES THEM BASED ON THEIR NAME. +# EG. 'followers/bulbasaur.png' WILL BE MOVED to 'graphics/pokemon/bulbasaur/follower.png'. +# +# I'M SAVING IT HERE IN CASE IT'S NEEDED SOMEWHERE IN THE FUTURE, THOUGH TWEAKING MIGHT BE NEEDED. +# - AsparagusEduardo + +def rellocate_follower_graphics(): dict_out = {} count = 0 for pth in sorted(glob.glob('followers/*.png')): @@ -55,4 +61,4 @@ def construct_compatibility_dict(): #print(pth) #subprocess.run(["tools/gbagfx/gbagfx " + name +".png " + name + "_normal.pal'" + str(count) + "'"]) -construct_compatibility_dict() +rellocate_follower_graphics() diff --git a/src/battle_main.c b/src/battle_main.c index e00e84367d..6d31fd776d 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3243,21 +3243,29 @@ void SpriteCB_PlayerMonFromBall(struct Sprite *sprite) BattleAnimateBackSprite(sprite, sprite->sSpeciesId); } -void SpriteCB_PlayerMonSlideIn(struct Sprite *sprite) { - if (sprite->data[3] == 0) { +void SpriteCB_PlayerMonSlideIn(struct Sprite *sprite) +{ + if (sprite->data[3] == 0) + { PlaySE(SE_BALL_TRAY_ENTER); sprite->data[3]++; - } else if (sprite->data[3] == 1) { + } + else if (sprite->data[3] == 1) + { if (sprite->animEnded) return; sprite->data[4] = sprite->x; sprite->x = -33; sprite->invisible = FALSE; sprite->data[3]++; - } else if (sprite->data[3] < 27) { + } + else if (sprite->data[3] < 27) + { sprite->x += 4; sprite->data[3]++; - } else { + } + else + { sprite->data[3] = 0; sprite->x = sprite->data[4]; sprite->data[4] = 0; diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 366861db80..dcd16ef19a 100755 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -28,13 +28,45 @@ static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {TAG_NONE, TAG_WEATHER_START, &gObjectEventBaseOam_8x8, sAnimTable_Shadow, sPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = { + .tileTag = TAG_NONE, + .paletteTag = TAG_WEATHER_START, + .oam = &gObjectEventBaseOam_8x8, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowSmall, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {TAG_NONE, TAG_WEATHER_START, &gObjectEventBaseOam_16x8, sAnimTable_Shadow, sPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = { + .tileTag = TAG_NONE, + .paletteTag = TAG_WEATHER_START, + .oam = &gObjectEventBaseOam_16x8, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowMedium, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {TAG_NONE, TAG_WEATHER_START, &gObjectEventBaseOam_32x8, sAnimTable_Shadow, sPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = { + .tileTag = TAG_NONE, + .paletteTag = TAG_WEATHER_START, + .oam = &gObjectEventBaseOam_32x8, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowLarge, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {TAG_NONE, TAG_WEATHER_START, &gObjectEventBaseOam_64x32, sAnimTable_Shadow, sPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = { + .tileTag = TAG_NONE, + .paletteTag = TAG_WEATHER_START, + .oam = &gObjectEventBaseOam_64x32, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowExtraLarge, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; static const struct SpriteFrameImage sPicTable_TallGrass[] = { overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), diff --git a/src/data/object_events/object_event_graphics_info_followers.h b/src/data/object_events/object_event_graphics_info_followers.h index 12ded86610..7441c00bb7 100644 --- a/src/data/object_events/object_event_graphics_info_followers.h +++ b/src/data/object_events/object_event_graphics_info_followers.h @@ -31,17 +31,12 @@ const struct ObjectEventGraphicsInfo gPokeballGraphics[POKEBALL_COUNT] = { POKEBALL_GFX_INFO(LUXURY), POKEBALL_GFX_INFO(PREMIER), // Gen IV/Sinnoh pokeballs - #ifdef ITEM_DUSK_BALL POKEBALL_GFX_INFO(DUSK), POKEBALL_GFX_INFO(HEAL), POKEBALL_GFX_INFO(QUICK), POKEBALL_GFX_INFO(CHERISH), - #endif - #ifdef ITEM_PARK_BALL POKEBALL_GFX_INFO(PARK), - #endif // Gen II/Johto Apricorn pokeballs - #ifdef ITEM_FAST_BALL POKEBALL_GFX_INFO(FAST), POKEBALL_GFX_INFO(LEVEL), POKEBALL_GFX_INFO(LURE), @@ -50,15 +45,10 @@ const struct ObjectEventGraphicsInfo gPokeballGraphics[POKEBALL_COUNT] = { POKEBALL_GFX_INFO(FRIEND), POKEBALL_GFX_INFO(MOON), POKEBALL_GFX_INFO(SPORT), - #endif // Gen V - #ifdef ITEM_DREAM_BALL POKEBALL_GFX_INFO(DREAM), - #endif // Gen VII - #ifdef ITEM_BEAST_BALL POKEBALL_GFX_INFO(BEAST), - #endif // Gen VIII #ifdef ITEM_STRANGE_BALL POKEBALL_GFX_INFO(STRANGE), diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 463dadd0b6..0b30c0f65b 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -7,71 +7,30 @@ { "type": "land_mons", "encounter_rates": [ - 20, - 20, - 10, - 10, - 10, - 10, - 5, - 5, - 4, - 4, - 1, - 1 + 20, 20, 10, 10, 10, 10, 5, 5, 4, 4, 1, 1 ] }, { "type": "water_mons", "encounter_rates": [ - 60, - 30, - 5, - 4, - 1 + 60, 30, 5, 4, 1 ] }, { "type": "rock_smash_mons", "encounter_rates": [ - 60, - 30, - 5, - 4, - 1 + 60, 30, 5, 4, 1 ] }, { "type": "fishing_mons", "encounter_rates": [ - 70, - 30, - 60, - 20, - 20, - 40, - 40, - 15, - 4, - 1 + 70, 30, 60, 20, 20, 40, 40, 15, 4, 1 ], "groups": { - "good_rod": [ - 2, - 3, - 4 - ], - "old_rod": [ - 0, - 1 - ], - "super_rod": [ - 5, - 6, - 7, - 8, - 9 - ] + "old_rod": [0, 1], + "good_rod": [2, 3, 4], + "super_rod": [5, 6, 7, 8, 9] } } ], @@ -148,61 +107,6 @@ { "map": "MAP_ROUTE102", "base_label": "gRoute102", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_CORPHISH" - } - ] - }, "land_mons": { "encounter_rate": 20, "mons": [ @@ -297,11 +201,7 @@ "species": "SPECIES_GOLDEEN" } ] - } - }, - { - "map": "MAP_ROUTE103", - "base_label": "gRoute103", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -313,7 +213,7 @@ { "min_level": 5, "max_level": 10, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_GOLDEEN" }, { "min_level": 10, @@ -323,40 +223,44 @@ { "min_level": 10, "max_level": 30, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_GOLDEEN" }, { "min_level": 10, "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_SHARPEDO" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" + "species": "SPECIES_CORPHISH" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_WAILMER" + "species": "SPECIES_CORPHISH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_CORPHISH" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_CORPHISH" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_WAILMER" + "species": "SPECIES_CORPHISH" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_WAILMER" + "species": "SPECIES_CORPHISH" } ] - }, + } + }, + { + "map": "MAP_ROUTE103", + "base_label": "gRoute103", "land_mons": { "encounter_rate": 20, "mons": [ @@ -451,11 +355,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE104", - "base_label": "gRoute104", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -467,7 +367,7 @@ { "min_level": 5, "max_level": 10, - "species": "SPECIES_MAGIKARP" + "species": "SPECIES_TENTACOOL" }, { "min_level": 10, @@ -477,40 +377,44 @@ { "min_level": 10, "max_level": 30, - "species": "SPECIES_MAGIKARP" + "species": "SPECIES_TENTACOOL" }, { "min_level": 10, "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_MAGIKARP" + "species": "SPECIES_WAILMER" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_MAGIKARP" + "species": "SPECIES_SHARPEDO" }, { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_MAGIKARP" + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_MAGIKARP" + "species": "SPECIES_WAILMER" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_MAGIKARP" + "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ROUTE104", + "base_label": "gRoute104", "land_mons": { "encounter_rate": 20, "mons": [ @@ -605,11 +509,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE105", - "base_label": "gRoute105", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -621,7 +521,7 @@ { "min_level": 5, "max_level": 10, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_MAGIKARP" }, { "min_level": 10, @@ -631,40 +531,44 @@ { "min_level": 10, "max_level": 30, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_MAGIKARP" }, { "min_level": 10, "max_level": 30, - "species": "SPECIES_WAILMER" + "species": "SPECIES_MAGIKARP" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_WAILMER" + "species": "SPECIES_MAGIKARP" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_WAILMER" + "species": "SPECIES_MAGIKARP" }, { "min_level": 20, "max_level": 25, - "species": "SPECIES_WAILMER" + "species": "SPECIES_MAGIKARP" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_WAILMER" + "species": "SPECIES_MAGIKARP" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_WAILMER" + "species": "SPECIES_MAGIKARP" } ] - }, + } + }, + { + "map": "MAP_ROUTE105", + "base_label": "gRoute105", "water_mons": { "encounter_rate": 4, "mons": [ @@ -694,11 +598,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE110", - "base_label": "gRoute110", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -753,7 +653,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ROUTE110", + "base_label": "gRoute110", "land_mons": { "encounter_rate": 20, "mons": [ @@ -848,11 +752,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE111", - "base_label": "gRoute111", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -864,7 +764,7 @@ { "min_level": 5, "max_level": 10, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_TENTACOOL" }, { "min_level": 10, @@ -874,40 +774,44 @@ { "min_level": 10, "max_level": 30, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_TENTACOOL" }, { "min_level": 10, "max_level": 30, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WAILMER" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WAILMER" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WAILMER" }, { "min_level": 20, "max_level": 25, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WAILMER" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WAILMER" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ROUTE111", + "base_label": "gRoute111", "land_mons": { "encounter_rate": 10, "mons": [ @@ -973,6 +877,36 @@ } ] }, + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 20, + "max_level": 30, + "species": "SPECIES_MARILL" + }, + { + "min_level": 10, + "max_level": 20, + "species": "SPECIES_MARILL" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_MARILL" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MARILL" + }, + { + "min_level": 20, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + } + ] + }, "rock_smash_mons": { "encounter_rate": 20, "mons": [ @@ -1003,33 +937,58 @@ } ] }, - "water_mons": { - "encounter_rate": 4, + "fishing_mons": { + "encounter_rate": 30, "mons": [ { - "min_level": 20, - "max_level": 30, - "species": "SPECIES_MARILL" - }, - { - "min_level": 10, - "max_level": 20, - "species": "SPECIES_MARILL" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_MARILL" + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" }, { "min_level": 5, "max_level": 10, - "species": "SPECIES_MARILL" + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_BARBOACH" }, { "min_level": 20, - "max_level": 30, - "species": "SPECIES_GOLDEEN" + "max_level": 25, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_BARBOACH" } ] } @@ -1175,61 +1134,6 @@ { "map": "MAP_ROUTE114", "base_label": "gRoute114", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_BARBOACH" - } - ] - }, "land_mons": { "encounter_rate": 20, "mons": [ @@ -1295,6 +1199,36 @@ } ] }, + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 20, + "max_level": 30, + "species": "SPECIES_MARILL" + }, + { + "min_level": 10, + "max_level": 20, + "species": "SPECIES_MARILL" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_MARILL" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MARILL" + }, + { + "min_level": 20, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + } + ] + }, "rock_smash_mons": { "encounter_rate": 20, "mons": [ @@ -1325,33 +1259,58 @@ } ] }, - "water_mons": { - "encounter_rate": 4, + "fishing_mons": { + "encounter_rate": 30, "mons": [ { - "min_level": 20, - "max_level": 30, - "species": "SPECIES_MARILL" - }, - { - "min_level": 10, - "max_level": 20, - "species": "SPECIES_MARILL" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_MARILL" + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" }, { "min_level": 5, "max_level": 10, - "species": "SPECIES_MARILL" + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_BARBOACH" }, { "min_level": 20, - "max_level": 30, - "species": "SPECIES_GOLDEEN" + "max_level": 25, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_BARBOACH" } ] } @@ -1428,61 +1387,6 @@ { "map": "MAP_ROUTE117", "base_label": "gRoute117", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_CORPHISH" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_CORPHISH" - } - ] - }, "land_mons": { "encounter_rate": 20, "mons": [ @@ -1577,11 +1481,7 @@ "species": "SPECIES_GOLDEEN" } ] - } - }, - { - "map": "MAP_ROUTE118", - "base_label": "gRoute118", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -1593,7 +1493,7 @@ { "min_level": 5, "max_level": 10, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_GOLDEEN" }, { "min_level": 10, @@ -1603,40 +1503,44 @@ { "min_level": 10, "max_level": 30, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_GOLDEEN" }, { "min_level": 10, "max_level": 30, - "species": "SPECIES_CARVANHA" + "species": "SPECIES_CORPHISH" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_CORPHISH" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_SHARPEDO" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_CARVANHA" + "species": "SPECIES_CORPHISH" }, { "min_level": 20, "max_level": 25, - "species": "SPECIES_CARVANHA" + "species": "SPECIES_CORPHISH" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_CARVANHA" + "species": "SPECIES_CORPHISH" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_CARVANHA" + "species": "SPECIES_CORPHISH" } ] - }, + } + }, + { + "map": "MAP_ROUTE118", + "base_label": "gRoute118", "land_mons": { "encounter_rate": 20, "mons": [ @@ -1731,11 +1635,96 @@ "species": "SPECIES_PELIPPER" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_CARVANHA" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_SHARPEDO" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_CARVANHA" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_CARVANHA" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_CARVANHA" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_CARVANHA" + } + ] } }, { "map": "MAP_ROUTE124", "base_label": "gRoute124", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -1790,36 +1779,6 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { @@ -2342,6 +2301,36 @@ { "map": "MAP_ABANDONED_SHIP_ROOMS_B1F", "base_label": "gAbandonedShip_Rooms_B1F", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_TENTACRUEL" + } + ] + }, "fishing_mons": { "encounter_rate": 20, "mons": [ @@ -2396,36 +2385,6 @@ "species": "SPECIES_TENTACRUEL" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_TENTACRUEL" - } - ] } }, { @@ -2599,61 +2558,6 @@ { "map": "MAP_METEOR_FALLS_B1F_2R", "base_label": "gMeteorFalls_B1F_2R", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WHISCASH" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WHISCASH" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WHISCASH" - } - ] - }, "land_mons": { "encounter_rate": 10, "mons": [ @@ -2748,6 +2652,61 @@ "species": "SPECIES_SOLROCK" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WHISCASH" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WHISCASH" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WHISCASH" + } + ] } }, { @@ -2822,6 +2781,36 @@ { "map": "MAP_ROUTE106", "base_label": "gRoute106", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -2876,41 +2865,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE107", "base_label": "gRoute107", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -2965,41 +2954,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE108", "base_label": "gRoute108", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -3054,96 +3043,11 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE109", "base_label": "gRoute109", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WAILMER" - } - ] - }, "water_mons": { "encounter_rate": 4, "mons": [ @@ -3173,11 +3077,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE115", - "base_label": "gRoute115", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -3232,7 +3132,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ROUTE115", + "base_label": "gRoute115", "land_mons": { "encounter_rate": 20, "mons": [ @@ -3327,6 +3231,61 @@ "species": "SPECIES_PELIPPER" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { @@ -3401,61 +3360,6 @@ { "map": "MAP_ROUTE119", "base_label": "gRoute119", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_CARVANHA" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_CARVANHA" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_CARVANHA" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_CARVANHA" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_CARVANHA" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_CARVANHA" - } - ] - }, "land_mons": { "encounter_rate": 15, "mons": [ @@ -3550,11 +3454,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE120", - "base_label": "gRoute120", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -3566,7 +3466,7 @@ { "min_level": 5, "max_level": 10, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_TENTACOOL" }, { "min_level": 10, @@ -3576,40 +3476,44 @@ { "min_level": 10, "max_level": 30, - "species": "SPECIES_GOLDEEN" + "species": "SPECIES_TENTACOOL" }, { "min_level": 10, "max_level": 30, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_CARVANHA" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_CARVANHA" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_CARVANHA" }, { "min_level": 20, "max_level": 25, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_CARVANHA" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_CARVANHA" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_CARVANHA" } ] - }, + } + }, + { + "map": "MAP_ROUTE120", + "base_label": "gRoute120", "land_mons": { "encounter_rate": 20, "mons": [ @@ -3704,11 +3608,7 @@ "species": "SPECIES_GOLDEEN" } ] - } - }, - { - "map": "MAP_ROUTE121", - "base_label": "gRoute121", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -3720,7 +3620,7 @@ { "min_level": 5, "max_level": 10, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_GOLDEEN" }, { "min_level": 10, @@ -3730,40 +3630,44 @@ { "min_level": 10, "max_level": 30, - "species": "SPECIES_TENTACOOL" + "species": "SPECIES_GOLDEEN" }, { "min_level": 10, "max_level": 30, - "species": "SPECIES_WAILMER" + "species": "SPECIES_BARBOACH" }, { "min_level": 25, "max_level": 30, - "species": "SPECIES_WAILMER" + "species": "SPECIES_BARBOACH" }, { "min_level": 30, "max_level": 35, - "species": "SPECIES_WAILMER" + "species": "SPECIES_BARBOACH" }, { "min_level": 20, "max_level": 25, - "species": "SPECIES_WAILMER" + "species": "SPECIES_BARBOACH" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_WAILMER" + "species": "SPECIES_BARBOACH" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_WAILMER" + "species": "SPECIES_BARBOACH" } ] - }, + } + }, + { + "map": "MAP_ROUTE121", + "base_label": "gRoute121", "land_mons": { "encounter_rate": 20, "mons": [ @@ -3858,11 +3762,96 @@ "species": "SPECIES_PELIPPER" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { "map": "MAP_ROUTE122", "base_label": "gRoute122", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -3917,96 +3906,11 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE123", "base_label": "gRoute123", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WAILMER" - } - ] - }, "land_mons": { "encounter_rate": 20, "mons": [ @@ -4101,6 +4005,61 @@ "species": "SPECIES_PELIPPER" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { @@ -4658,6 +4617,36 @@ { "map": "MAP_ROUTE125", "base_label": "gRoute125", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -4712,41 +4701,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE126", "base_label": "gRoute126", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -4801,41 +4790,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE127", "base_label": "gRoute127", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -4890,7 +4879,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ROUTE128", + "base_label": "gRoute128", "water_mons": { "encounter_rate": 4, "mons": [ @@ -4920,11 +4913,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE128", - "base_label": "gRoute128", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -4979,96 +4968,11 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE129", "base_label": "gRoute129", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_SHARPEDO" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WAILMER" - } - ] - }, "water_mons": { "encounter_rate": 4, "mons": [ @@ -5098,11 +5002,7 @@ "species": "SPECIES_WAILORD" } ] - } - }, - { - "map": "MAP_ROUTE130", - "base_label": "gRoute130", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -5157,7 +5057,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ROUTE130", + "base_label": "gRoute130", "land_mons": { "encounter_rate": 20, "mons": [ @@ -5252,11 +5156,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_ROUTE131", - "base_label": "gRoute131", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -5311,7 +5211,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ROUTE131", + "base_label": "gRoute131", "water_mons": { "encounter_rate": 4, "mons": [ @@ -5341,11 +5245,96 @@ "species": "SPECIES_PELIPPER" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_SHARPEDO" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { "map": "MAP_ROUTE132", "base_label": "gRoute132", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -5400,41 +5389,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE133", "base_label": "gRoute133", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -5489,41 +5478,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_ROUTE134", "base_label": "gRoute134", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -5578,7 +5567,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "base_label": "gAbandonedShip_HiddenFloorCorridors", "water_mons": { "encounter_rate": 4, "mons": [ @@ -5588,31 +5581,27 @@ "species": "SPECIES_TENTACOOL" }, { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" }, { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" }, { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" }, { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" + "min_level": 30, + "max_level": 35, + "species": "SPECIES_TENTACRUEL" } ] - } - }, - { - "map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", - "base_label": "gAbandonedShip_HiddenFloorCorridors", + }, "fishing_mons": { "encounter_rate": 20, "mons": [ @@ -5667,36 +5656,6 @@ "species": "SPECIES_TENTACRUEL" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_TENTACRUEL" - } - ] } }, { @@ -6047,61 +6006,6 @@ { "map": "MAP_SEAFLOOR_CAVERN_ROOM6", "base_label": "gSeafloorCavern_Room6", - "fishing_mons": { - "encounter_rate": 10, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WAILMER" - } - ] - }, "land_mons": { "encounter_rate": 4, "mons": [ @@ -6196,66 +6100,66 @@ "species": "SPECIES_GOLBAT" } ] + }, + "fishing_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { "map": "MAP_SEAFLOOR_CAVERN_ROOM7", "base_label": "gSeafloorCavern_Room7", - "fishing_mons": { - "encounter_rate": 10, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WAILMER" - } - ] - }, "land_mons": { "encounter_rate": 4, "mons": [ @@ -6350,6 +6254,61 @@ "species": "SPECIES_GOLBAT" } ] + }, + "fishing_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { @@ -6424,6 +6383,36 @@ { "map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", "base_label": "gSeafloorCavern_Entrance", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_ZUBAT" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_ZUBAT" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_GOLBAT" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_GOLBAT" + } + ] + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -6478,36 +6467,6 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_ZUBAT" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_ZUBAT" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_GOLBAT" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_GOLBAT" - } - ] } }, { @@ -6927,61 +6886,6 @@ { "map": "MAP_SAFARI_ZONE_SOUTHWEST", "base_label": "gSafariZone_Southwest", - "fishing_mons": { - "encounter_rate": 35, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 25, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_SEAKING" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_SEAKING" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_SEAKING" - } - ] - }, "land_mons": { "encounter_rate": 25, "mons": [ @@ -7076,6 +6980,61 @@ "species": "SPECIES_PSYDUCK" } ] + }, + "fishing_mons": { + "encounter_rate": 35, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 25, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_SEAKING" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_SEAKING" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_SEAKING" + } + ] } }, { @@ -7180,61 +7139,6 @@ { "map": "MAP_SAFARI_ZONE_NORTHWEST", "base_label": "gSafariZone_Northwest", - "fishing_mons": { - "encounter_rate": 35, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 25, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_SEAKING" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_SEAKING" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_SEAKING" - } - ] - }, "land_mons": { "encounter_rate": 25, "mons": [ @@ -7329,6 +7233,61 @@ "species": "SPECIES_GOLDUCK" } ] + }, + "fishing_mons": { + "encounter_rate": 35, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 25, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_SEAKING" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_SEAKING" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_SEAKING" + } + ] } }, { @@ -7433,61 +7392,6 @@ { "map": "MAP_VICTORY_ROAD_B2F", "base_label": "gVictoryRoad_B2F", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WHISCASH" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WHISCASH" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WHISCASH" - } - ] - }, "land_mons": { "encounter_rate": 10, "mons": [ @@ -7582,11 +7486,7 @@ "species": "SPECIES_GOLBAT" } ] - } - }, - { - "map": "MAP_METEOR_FALLS_1F_1R", - "base_label": "gMeteorFalls_1F_1R", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -7626,22 +7526,26 @@ "species": "SPECIES_BARBOACH" }, { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_BARBOACH" + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WHISCASH" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WHISCASH" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_BARBOACH" + "species": "SPECIES_WHISCASH" } ] - }, + } + }, + { + "map": "MAP_METEOR_FALLS_1F_1R", + "base_label": "gMeteorFalls_1F_1R", "land_mons": { "encounter_rate": 10, "mons": [ @@ -7736,11 +7640,7 @@ "species": "SPECIES_SOLROCK" } ] - } - }, - { - "map": "MAP_METEOR_FALLS_1F_2R", - "base_label": "gMeteorFalls_1F_2R", + }, "fishing_mons": { "encounter_rate": 30, "mons": [ @@ -7780,22 +7680,26 @@ "species": "SPECIES_BARBOACH" }, { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WHISCASH" + "min_level": 20, + "max_level": 25, + "species": "SPECIES_BARBOACH" }, { "min_level": 35, "max_level": 40, - "species": "SPECIES_WHISCASH" + "species": "SPECIES_BARBOACH" }, { "min_level": 40, "max_level": 45, - "species": "SPECIES_WHISCASH" + "species": "SPECIES_BARBOACH" } ] - }, + } + }, + { + "map": "MAP_METEOR_FALLS_1F_2R", + "base_label": "gMeteorFalls_1F_2R", "land_mons": { "encounter_rate": 10, "mons": [ @@ -7890,66 +7794,66 @@ "species": "SPECIES_SOLROCK" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WHISCASH" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WHISCASH" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WHISCASH" + } + ] } }, { "map": "MAP_METEOR_FALLS_B1F_1R", "base_label": "gMeteorFalls_B1F_1R", - "fishing_mons": { - "encounter_rate": 30, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_BARBOACH" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WHISCASH" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WHISCASH" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WHISCASH" - } - ] - }, "land_mons": { "encounter_rate": 10, "mons": [ @@ -8044,6 +7948,61 @@ "species": "SPECIES_SOLROCK" } ] + }, + "fishing_mons": { + "encounter_rate": 30, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_BARBOACH" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WHISCASH" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WHISCASH" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WHISCASH" + } + ] } }, { @@ -8187,61 +8146,6 @@ { "map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", "base_label": "gShoalCave_LowTideInnerRoom", - "fishing_mons": { - "encounter_rate": 10, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WAILMER" - } - ] - }, "land_mons": { "encounter_rate": 10, "mons": [ @@ -8336,66 +8240,66 @@ "species": "SPECIES_SPHEAL" } ] + }, + "fishing_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { "map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", "base_label": "gShoalCave_LowTideEntranceRoom", - "fishing_mons": { - "encounter_rate": 10, - "mons": [ - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 20, - "max_level": 25, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_WAILMER" - }, - { - "min_level": 40, - "max_level": 45, - "species": "SPECIES_WAILMER" - } - ] - }, "land_mons": { "encounter_rate": 10, "mons": [ @@ -8490,11 +8394,96 @@ "species": "SPECIES_SPHEAL" } ] + }, + "fishing_mons": { + "encounter_rate": 10, + "mons": [ + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 20, + "max_level": 25, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_WAILMER" + }, + { + "min_level": 40, + "max_level": 45, + "species": "SPECIES_WAILMER" + } + ] } }, { "map": "MAP_LILYCOVE_CITY", "base_label": "gLilycoveCity", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -8549,7 +8538,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_DEWFORD_TOWN", + "base_label": "gDewfordTown", "water_mons": { "encounter_rate": 4, "mons": [ @@ -8579,11 +8572,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_DEWFORD_TOWN", - "base_label": "gDewfordTown", + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -8638,41 +8627,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_SLATEPORT_CITY", "base_label": "gSlateportCity", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -8727,7 +8716,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_MOSSDEEP_CITY", + "base_label": "gMossdeepCity", "water_mons": { "encounter_rate": 4, "mons": [ @@ -8757,11 +8750,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_MOSSDEEP_CITY", - "base_label": "gMossdeepCity", + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -8816,41 +8805,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_PACIFIDLOG_TOWN", "base_label": "gPacifidlogTown", + "water_mons": { + "encounter_rate": 4, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_TENTACOOL" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_WINGULL" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_PELIPPER" + } + ] + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -8905,7 +8894,11 @@ "species": "SPECIES_WAILMER" } ] - }, + } + }, + { + "map": "MAP_EVER_GRANDE_CITY", + "base_label": "gEverGrandeCity", "water_mons": { "encounter_rate": 4, "mons": [ @@ -8935,11 +8928,7 @@ "species": "SPECIES_PELIPPER" } ] - } - }, - { - "map": "MAP_EVER_GRANDE_CITY", - "base_label": "gEverGrandeCity", + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -8994,41 +8983,41 @@ "species": "SPECIES_WAILMER" } ] - }, - "water_mons": { - "encounter_rate": 4, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_TENTACOOL" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_WINGULL" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_PELIPPER" - } - ] } }, { "map": "MAP_PETALBURG_CITY", "base_label": "gPetalburgCity", + "water_mons": { + "encounter_rate": 1, + "mons": [ + { + "min_level": 20, + "max_level": 30, + "species": "SPECIES_MARILL" + }, + { + "min_level": 10, + "max_level": 20, + "species": "SPECIES_MARILL" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_MARILL" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MARILL" + }, + { + "min_level": 5, + "max_level": 10, + "species": "SPECIES_MARILL" + } + ] + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -9083,36 +9072,6 @@ "species": "SPECIES_CORPHISH" } ] - }, - "water_mons": { - "encounter_rate": 1, - "mons": [ - { - "min_level": 20, - "max_level": 30, - "species": "SPECIES_MARILL" - }, - { - "min_level": 10, - "max_level": 20, - "species": "SPECIES_MARILL" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_MARILL" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MARILL" - }, - { - "min_level": 5, - "max_level": 10, - "species": "SPECIES_MARILL" - } - ] } }, { @@ -9290,6 +9249,36 @@ { "map": "MAP_SOOTOPOLIS_CITY", "base_label": "gSootopolisCity", + "water_mons": { + "encounter_rate": 1, + "mons": [ + { + "min_level": 5, + "max_level": 35, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 10, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 15, + "max_level": 25, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + } + ] + }, "fishing_mons": { "encounter_rate": 10, "mons": [ @@ -9344,36 +9333,6 @@ "species": "SPECIES_GYARADOS" } ] - }, - "water_mons": { - "encounter_rate": 1, - "mons": [ - { - "min_level": 5, - "max_level": 35, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 10, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 15, - "max_level": 25, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - } - ] } }, { @@ -9517,61 +9476,6 @@ { "map": "MAP_SAFARI_ZONE_SOUTHEAST", "base_label": "gSafariZone_Southeast", - "fishing_mons": { - "encounter_rate": 35, - "mons": [ - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_MAGIKARP" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_REMORAID" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_GOLDEEN" - }, - { - "min_level": 25, - "max_level": 30, - "species": "SPECIES_REMORAID" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_REMORAID" - }, - { - "min_level": 30, - "max_level": 35, - "species": "SPECIES_REMORAID" - }, - { - "min_level": 35, - "max_level": 40, - "species": "SPECIES_OCTILLERY" - } - ] - }, "land_mons": { "encounter_rate": 25, "mons": [ @@ -9666,6 +9570,61 @@ "species": "SPECIES_QUAGSIRE" } ] + }, + "fishing_mons": { + "encounter_rate": 35, + "mons": [ + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_MAGIKARP" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_REMORAID" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_GOLDEEN" + }, + { + "min_level": 25, + "max_level": 30, + "species": "SPECIES_REMORAID" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_REMORAID" + }, + { + "min_level": 30, + "max_level": 35, + "species": "SPECIES_REMORAID" + }, + { + "min_level": 35, + "max_level": 40, + "species": "SPECIES_OCTILLERY" + } + ] } }, { @@ -11495,6 +11454,8 @@ ] }, { + "label": "gBattlePyramidWildMonHeaders", + "for_maps": false, "encounters": [ { "base_label": "gBattlePyramid_1", @@ -11502,63 +11463,63 @@ "encounter_rate": 4, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BULBASAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BULBASAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BULBASAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BULBASAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_IVYSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_IVYSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" } ] @@ -11570,63 +11531,63 @@ "encounter_rate": 4, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_IVYSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_IVYSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_IVYSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_IVYSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" } ] @@ -11638,63 +11599,63 @@ "encounter_rate": 4, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_VENUSAUR" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" } ] @@ -11706,63 +11667,63 @@ "encounter_rate": 4, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMANDER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" } ] @@ -11774,63 +11735,63 @@ "encounter_rate": 4, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" } ] @@ -11842,63 +11803,63 @@ "encounter_rate": 4, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" } ] @@ -11910,73 +11871,73 @@ "encounter_rate": 8, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WARTORTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SQUIRTLE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARIZARD" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_CHARMELEON" } ] } } - ], - "for_maps": false, - "label": "gBattlePyramidWildMonHeaders" + ] }, { + "label": "gBattlePikeWildMonHeaders", + "for_maps": false, "encounters": [ { "base_label": "gBattlePike_1", @@ -11984,63 +11945,63 @@ "encounter_rate": 10, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_DUSCLOPS" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_DUSCLOPS" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_DUSCLOPS" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_DUSCLOPS" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_DUSCLOPS" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_DUSCLOPS" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" } ] @@ -12052,63 +12013,63 @@ "encounter_rate": 10, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_ELECTRODE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_ELECTRODE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_ELECTRODE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_ELECTRODE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_ELECTRODE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_ELECTRODE" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" } ] @@ -12120,63 +12081,63 @@ "encounter_rate": 10, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BRELOOM" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BRELOOM" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BRELOOM" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BRELOOM" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BRELOOM" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_BRELOOM" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" } ] @@ -12188,71 +12149,69 @@ "encounter_rate": 10, "mons": [ { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WOBBUFFET" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WOBBUFFET" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WOBBUFFET" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WOBBUFFET" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WOBBUFFET" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_WOBBUFFET" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_SEVIPER" }, { - "max_level": 5, "min_level": 5, + "max_level": 5, "species": "SPECIES_MILOTIC" } ] } } - ], - "for_maps": false, - "label": "gBattlePikeWildMonHeaders" + ] } ] } diff --git a/src/decompress.c b/src/decompress.c index c9d84eda0b..4c34ea2cff 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -21,7 +21,8 @@ void LZDecompressVram(const u32 *src, void *dest) // Checks if `ptr` is likely LZ77 data // Checks word-alignment, min/max size, and header byte // Returns uncompressed size if true, 0 otherwise -u32 IsLZ77Data(const void *ptr, u32 minSize, u32 maxSize) { +u32 IsLZ77Data(const void *ptr, u32 minSize, u32 maxSize) +{ const u8 *data = ptr; u32 size; // Compressed data must be word aligned @@ -51,7 +52,8 @@ u16 LoadCompressedSpriteSheet(const struct CompressedSpriteSheet *src) } // This can be used for either compressed or uncompressed sprite sheets -u16 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s32 offset) { +u16 LoadCompressedSpriteSheetByTemplate(const struct SpriteTemplate *template, s32 offset) +{ struct SpriteTemplate myTemplate; struct SpriteFrameImage myImage; u32 size; diff --git a/src/decoration.c b/src/decoration.c index c050fc3506..4b8e27e5e9 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1628,7 +1628,8 @@ static bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) } // If sprite(like), check if there is an available object event slot for it - if (decoration->permission == DECORPERM_SPRITE) { + if (decoration->permission == DECORPERM_SPRITE) + { for (i = 0; i < NUM_DECORATION_FLAGS; i++) if (FlagGet(FLAG_DECORATION_1 + i) == TRUE) return TRUE; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 6edcf16022..b3e1a4ae41 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1464,16 +1464,19 @@ void RemoveAllObjectEventsExceptPlayer(void) // Free a sprite's current tiles and reallocate with a new size // Used when changing to a gfx info with a larger size -static s16 ReallocSpriteTiles(struct Sprite *sprite, u32 byteSize) { +static s16 ReallocSpriteTiles(struct Sprite *sprite, u32 byteSize) +{ s16 i; bool32 wasVisible = sprite->invisible; sprite->invisible = TRUE; i = CopySprite(sprite, sprite->x, sprite->y, 0xFF); - if (i < MAX_SPRITES) { + if (i < MAX_SPRITES) + { DestroySprite(&gSprites[i]); i = AllocSpriteTiles(byteSize / TILE_SIZE_4BPP); - if (i >= 0) { + if (i >= 0) + { // Fill the allocated area with zeroes // To avoid visual glitches if the frame hasn't been copied yet CpuFastFill16(0, (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * i, byteSize); @@ -1490,14 +1493,17 @@ static s16 ReallocSpriteTiles(struct Sprite *sprite, u32 byteSize) { u16 LoadSheetGraphicsInfo(const struct ObjectEventGraphicsInfo *info, u16 uuid, struct Sprite *sprite) { u16 tag = info->tileTag; - if (tag != TAG_NONE || info->compressed) { // sheet-based gfx + if (tag != TAG_NONE || info->compressed) + { + // sheet-based gfx u32 sheetSpan = GetSpanPerImage(info->oam->shape, info->oam->size); u16 oldTiles = 0; u16 tileStart; if (tag == TAG_NONE) tag = COMP_OW_TILE_TAG_BASE + uuid; - if (sprite) { + if (sprite) + { oldTiles = sprite->sheetTileStart; sprite->sheetTileStart = 0; // mark unused // Note: If sprite was not allocated to use a sheet, @@ -1508,18 +1514,22 @@ u16 LoadSheetGraphicsInfo(const struct ObjectEventGraphicsInfo *info, u16 uuid, tileStart = GetSpriteTileStartByTag(tag); // sheet not loaded; unload any old tiles and load it - if (tileStart == TAG_NONE) { + if (tileStart == TAG_NONE) + { struct SpriteFrameImage image = {.size = info->size, .data = info->images->data}; struct SpriteTemplate template = {.tileTag = tag, .images = &image}; if (oldTiles) FieldEffectFreeTilesIfUnused(oldTiles); tileStart = LoadCompressedSpriteSheetByTemplate(&template, TILE_SIZE_4BPP << sheetSpan); // sheet loaded; unload any *other* sheet for sprite - } else if (oldTiles && oldTiles != tileStart) { + } + else if (oldTiles && oldTiles != tileStart) + { FieldEffectFreeTilesIfUnused(oldTiles); } - if (sprite) { + if (sprite) + { sprite->sheetTileStart = tileStart; sprite->sheetSpan = sheetSpan; sprite->usingSheet = TRUE; @@ -1530,11 +1540,16 @@ u16 LoadSheetGraphicsInfo(const struct ObjectEventGraphicsInfo *info, u16 uuid, // larger than the allocated prefix space, // in which case we would have to realloc // TODO: Realloc usingSheet -> !usingSheet larger gfx - } else if (sprite && sprite->usingSheet) { + } + else if (sprite && sprite->usingSheet) + { sprite->oam.tileNum = sprite->sheetTileStart; sprite->usingSheet = FALSE; - // Not usingSheet and info size differs; realloc tiles - } else if (sprite && !sprite->sheetTileStart && sprite->oam.size != info->oam->size) { + + } + else if (sprite && !sprite->sheetTileStart && sprite->oam.size != info->oam->size) + { + // Not usingSheet and info size differs; realloc tiles ReallocSpriteTiles(sprite, info->images->size); } return tag; @@ -1947,7 +1962,8 @@ static void RefreshFollowerGraphics(struct ObjectEvent *objEvent) struct Sprite *sprite = &gSprites[objEvent->spriteId]; u32 i = FindObjectEventPaletteIndexByTag(graphicsInfo->paletteTag); - if (graphicsInfo->oam->size != sprite->oam.size) { + if (graphicsInfo->oam->size != sprite->oam.size) + { #if LARGE_OW_SUPPORT && !OW_GFX_COMPRESS ReallocSpriteTiles(sprite, graphicsInfo->images->size); #endif @@ -2182,7 +2198,8 @@ static u32 FindMetatileBehaviorWithinRange(s32 x, s32 y, u32 mb, u8 distance) } // Check a single follower message condition -bool32 CheckMsgCondition(const struct MsgCondition *cond, struct Pokemon *mon, u32 species, struct ObjectEvent *obj) { +bool32 CheckMsgCondition(const struct MsgCondition *cond, struct Pokemon *mon, u32 species, struct ObjectEvent *obj) +{ u32 multi; if (species == SPECIES_NONE) species = GetMonData(mon, MON_DATA_SPECIES); @@ -2235,17 +2252,21 @@ bool32 CheckMsgCondition(const struct MsgCondition *cond, struct Pokemon *mon, u // Check if follower info can be displayed in the current situation; // i.e, if all its conditions match -bool32 CheckMsgInfo(const struct FollowerMsgInfoExtended *info, struct Pokemon *mon, u32 species, struct ObjectEvent *obj) { +bool32 CheckMsgInfo(const struct FollowerMsgInfoExtended *info, struct Pokemon *mon, u32 species, struct ObjectEvent *obj) +{ u32 i; - // any condition matches - if (info->orFlag) { + if (info->orFlag) + { + // any condition matches for (i = 0; i < ARRAY_COUNT(info->conditions) && info->conditions[i].type; i++) if (CheckMsgCondition(&info->conditions[i], mon, species, obj)) return TRUE; return FALSE; - // all conditions must match - } else { + } + else + { + // all conditions must match for (i = 0; i < ARRAY_COUNT(info->conditions) && info->conditions[i].type; i++) if (!CheckMsgCondition(&info->conditions[i], mon, species, obj)) return FALSE; @@ -5447,16 +5468,23 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri } sprite->sActionFuncId = 0; #else - if (GetLedgeJumpDirection(x, y, direction) != DIR_NONE) { + if (GetLedgeJumpDirection(x, y, direction) != DIR_NONE) + { // InitJumpRegular will set the proper speed ObjectEventSetSingleMovement(objectEvent, sprite, GetJump2MovementAction(direction)); - } else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH)) { + } + else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH)) + { // Set follow speed according to player's speed ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastMovementAction(direction)); - } else if (PlayerGetCopyableMovement() == COPY_MOVE_JUMP2) { + } + else if (PlayerGetCopyableMovement() == COPY_MOVE_JUMP2) + { // If *player* jumps, make step take twice as long ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkSlowMovementAction(direction)); - } else { + } + else + { ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(direction)); if (OW_MON_BOBBING == TRUE) sprite->y2 = -1; @@ -7030,18 +7058,22 @@ static u8 LoadFillColorPalette(u16 color, u16 paletteTag, struct Sprite *sprite) return UpdateSpritePalette(&dynamicPalette, sprite); } -static void ObjectEventSetPokeballGfx(struct ObjectEvent *objEvent) { +static void ObjectEventSetPokeballGfx(struct ObjectEvent *objEvent) +{ #if OW_MON_POKEBALLS u32 ball = BALL_POKE; - if (objEvent->localId == OBJ_EVENT_ID_FOLLOWER) { + if (objEvent->localId == OBJ_EVENT_ID_FOLLOWER) + { struct Pokemon *mon = GetFirstLiveMon(); if (mon) ball = ItemIdToBallId(GetMonData(mon, MON_DATA_POKEBALL)); } - if (ball != BALL_POKE && ball < POKEBALL_COUNT) { + if (ball != BALL_POKE && ball < POKEBALL_COUNT) + { const struct ObjectEventGraphicsInfo *info = &gPokeballGraphics[ball]; - if (info->tileTag == TAG_NONE) { + if (info->tileTag == TAG_NONE) + { ObjectEventSetGraphics(objEvent, info); return; } @@ -9232,7 +9264,8 @@ static void UpdateObjectEventElevationAndPriority(struct ObjectEvent *objEvent, return; ObjectEventUpdateElevation(objEvent, sprite); - if (objEvent->localId == OBJ_EVENT_ID_FOLLOWER) { + if (objEvent->localId == OBJ_EVENT_ID_FOLLOWER) + { #if LARGE_OW_SUPPORT // keep subspriteMode synced with player's // so that it disappears under bridges when they do @@ -9264,7 +9297,8 @@ void ObjectEventUpdateElevation(struct ObjectEvent *objEvent, struct Sprite *spr u8 curElevation = MapGridGetElevationAt(objEvent->currentCoords.x, objEvent->currentCoords.y); u8 prevElevation = MapGridGetElevationAt(objEvent->previousCoords.x, objEvent->previousCoords.y); - if (curElevation == 15 || prevElevation == 15) { + if (curElevation == 15 || prevElevation == 15) + { #if LARGE_OW_SUPPORT // Ignore subsprite priorities under bridges // so all subsprites will display below it diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 5015fc04d8..8ae4ad4263 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -112,12 +112,14 @@ static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct } // Apply a blue tint effect to a palette -static void ApplyPondFilter(u8 paletteNum, u16 *dest) { +static void ApplyPondFilter(u8 paletteNum, u16 *dest) +{ u32 i, r, g, b; // CpuCopy16(gPlttBufferUnfaded + 0x100 + paletteNum * 16, dest, 32); u16 *src = gPlttBufferUnfaded + OBJ_PLTT_ID(paletteNum); *dest++ = *src++; // copy transparency - for (i = 0; i < 16 - 1; i++) { + for (i = 0; i < 16 - 1; i++) + { r = GET_R(src[i]); g = GET_G(src[i]); b = GET_B(src[i]); @@ -129,12 +131,14 @@ static void ApplyPondFilter(u8 paletteNum, u16 *dest) { } // Apply a ice tint effect to a palette -static void ApplyIceFilter(u8 paletteNum, u16 *dest) { +static void ApplyIceFilter(u8 paletteNum, u16 *dest) +{ u32 i, r, g, b; // CpuCopy16(gPlttBufferUnfaded + 0x100 + paletteNum * 16, dest, 32); u16 *src = gPlttBufferUnfaded + OBJ_PLTT_ID(paletteNum); *dest++ = *src++; // copy transparency - for (i = 0; i < 16 - 1; i++) { + for (i = 0; i < 16 - 1; i++) + { r = GET_R(src[i]); r -= 5; if (r > 31) @@ -157,7 +161,9 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, u16 baseTag = GetSpritePaletteTagByPaletteNum(mainSprite->oam.paletteNum); u16 paletteTag = REFLECTION_PAL_TAG(baseTag, mainSprite->oam.paletteNum); u8 paletteNum = IndexOfSpritePaletteTag(paletteTag); - if (paletteNum <= 16) { // Load filtered palette + if (paletteNum <= 16) + { + // Load filtered palette u16 filteredData[16]; struct SpritePalette filteredPal = {.tag = paletteTag, .data = filteredData}; if (sprite->sIsStillReflection == FALSE) @@ -196,22 +202,24 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) // Only filter palette if not using the high bridge blue palette // This is basically a copy of LoadObjectRegularReflectionPalette - if (IndexOfSpritePaletteTag(HIGH_BRIDGE_PAL_TAG) != reflectionSprite->oam.paletteNum) { + if (IndexOfSpritePaletteTag(HIGH_BRIDGE_PAL_TAG) != reflectionSprite->oam.paletteNum) + { u16 baseTag = GetSpritePaletteTagByPaletteNum(mainSprite->oam.paletteNum); u16 paletteTag = REFLECTION_PAL_TAG(baseTag, mainSprite->oam.paletteNum); u8 paletteNum = IndexOfSpritePaletteTag(paletteTag); - if (paletteNum >= 16) { // Build filtered palette + if (paletteNum >= 16) + { + // Build filtered palette u16 filteredData[16]; struct SpritePalette filteredPal = {.tag = paletteTag, .data = filteredData}; // Free palette if unused reflectionSprite->inUse = FALSE; FieldEffectFreePaletteIfUnused(reflectionSprite->oam.paletteNum); reflectionSprite->inUse = TRUE; - if (reflectionSprite->sIsStillReflection == FALSE) { + if (reflectionSprite->sIsStillReflection == FALSE) ApplyPondFilter(mainSprite->oam.paletteNum, filteredData); - } else { + else ApplyIceFilter(mainSprite->oam.paletteNum, filteredData); - } paletteNum = LoadSpritePalette(&filteredPal); UpdateSpritePaletteWithWeather(paletteNum); } @@ -236,7 +244,8 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->invisible = TRUE; // Support "virtual" sprites which can't be rotated via affines - if (reflectionSprite->subspriteTables[0].subsprites) { + if (reflectionSprite->subspriteTables[0].subsprites) + { reflectionSprite->oam.affineMode = ST_OAM_AFFINE_OFF; return; }