diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index dd1f29c4d2..0425252232 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -25,8 +25,8 @@ gFieldEffectScriptPointers:: .4byte gFieldEffectScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH .4byte gFieldEffectScript_LongGrass @ FLDEFF_LONG_GRASS .4byte gFieldEffectScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS - .4byte gFieldEffectScript_ShakingGrass @ FLDEFF_SHAKING_GRASS - .4byte gFieldEffectScript_ShakingGrass2 @ FLDEFF_SHAKING_LONG_GRASS + .4byte gFieldEffectScript_ShakingGrass @ FLDEFF_SHAKING_GRASS + .4byte gFieldEffectScript_ShakingGrass2 @ FLDEFF_SHAKING_LONG_GRASS .4byte gFieldEffectScript_UnusedSand @ FLDEFF_SAND_HOLE .4byte gFieldEffectScript_WaterSurfacing @ FLDEFF_WATER_SURFACING .4byte gFieldEffectScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE diff --git a/data/scripts/dexnav.inc b/data/scripts/dexnav.inc index 8cd9c5ebf5..2e8dffd916 100644 --- a/data/scripts/dexnav.inc +++ b/data/scripts/dexnav.inc @@ -4,44 +4,44 @@ EventScript_StartDexNavBattle:: applymovement OBJ_EVENT_ID_PLAYER Common_Movement_ExclamationMark waitmovement 0 waitse - dowildbattle + dowildbattle release end EventScript_NotFoundNearby:: - msgbox sText_NotFoundNearby, MSGBOX_SIGN - end + msgbox sText_NotFoundNearby, MSGBOX_SIGN + end sText_NotFoundNearby: - .string "It couldn't be found nearby.\n" - .string "Try looking in a different area!$" + .string "It couldn't be found nearby.\n" + .string "Try looking in a different area!$" EventScript_MovedTooFast:: - msgbox sText_TryMovingSlower, MSGBOX_SIGN - end + msgbox sText_TryMovingSlower, MSGBOX_SIGN + end sText_TryMovingSlower: - .string "The Pokémon got away!\n" - .string "Try moving more slowly.$" + .string "The Pokémon got away!\n" + .string "Try moving more slowly.$" EventScript_PokemonGotAway:: - msgbox sText_PokemonGotAway, MSGBOX_SIGN - end + msgbox sText_PokemonGotAway, MSGBOX_SIGN + end sText_PokemonGotAway: - .string "The Pokémon got away!$" + .string "The Pokémon got away!$" EventScript_LostSignal:: - msgbox sText_LostSignal, MSGBOX_SIGN - end + msgbox sText_LostSignal, MSGBOX_SIGN + end sText_LostSignal: - .string "There is no reaction.\n" - .string "The signal was lost!$" + .string "There is no reaction.\n" + .string "The signal was lost!$" EventScript_TooDark:: - msgbox sText_TooDark, MSGBOX_SIGN - end + msgbox sText_TooDark, MSGBOX_SIGN + end sText_TooDark: - .string "It's too dark to search\nfor a Pokémon!$" + .string "It's too dark to search\nfor a Pokémon!$" diff --git a/include/config/dexnav.h b/include/config/dexnav.h index 035b7a12cf..759f5514f2 100644 --- a/include/config/dexnav.h +++ b/include/config/dexnav.h @@ -10,7 +10,7 @@ #define CREEPING_PROXIMITY 2 #define MAX_PROXIMITY 20 -#define DEXNAV_CHAIN_MAX 100 // maximum valud of 255 +#define DEXNAV_CHAIN_MAX 100 // maximum chain value //hidden pokemon options - no info so I just guessed at values #define HIDDEN_MON_STEP_COUNT 100 //look for hidden pokemon every x steps diff --git a/include/constants/flags.h b/include/constants/flags.h index 1ca6052888..c5838321ce 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1384,7 +1384,7 @@ #define FLAG_NURSE_UNION_ROOM_REMINDER (SYSTEM_FLAGS + 0x20) #define FLAG_SYS_DEXNAV_SEARCH (SYSTEM_FLAGS + 0x21) -#define FLAG_SHINY_CREATION (SYSTEM_FLAGS + 0x22) // force creation of a shiny mon +#define FLAG_SHINY_CREATION (SYSTEM_FLAGS + 0x22) // force creation of a shiny mon #define FLAG_UNUSED_0x883 (SYSTEM_FLAGS + 0x23) // Unused Flag #define FLAG_UNUSED_0x884 (SYSTEM_FLAGS + 0x24) // Unused Flag #define FLAG_UNUSED_0x885 (SYSTEM_FLAGS + 0x25) // Unused Flag diff --git a/include/dexnav.h b/include/dexnav.h index 66e0295060..51daebb526 100644 --- a/include/dexnav.h +++ b/include/dexnav.h @@ -77,4 +77,4 @@ void IncrementDexNavChain(void); //ewram extern bool8 gDexnavBattle; -#endif //GUARD_DEXNAV_H \ No newline at end of file +#endif //GUARD_DEXNAV_H diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt index b00681467c..20ac1c7889 100755 --- a/src/data/wild_encounters.json.txt +++ b/src/data/wild_encounters.json.txt @@ -87,7 +87,7 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] = .waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %}, .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %}, .fishingMonsInfo = {% if existsIn(encounter, "fishing_mons") %}&{{ encounter.base_label }}_FishingMonsInfo{% else %}NULL{% endif %}, - .hiddenMonsInfo = {% if existsIn(encounter, "hidden_mons") %}&{{ encounter.base_label }}_HiddenMonsInfo{% else %}NULL{% endif %}, + .hiddenMonsInfo = {% if existsIn(encounter, "hidden_mons") %}&{{ encounter.base_label }}_HiddenMonsInfo{% else %}NULL{% endif %}, }, ## endfor { @@ -97,7 +97,7 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] = .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, - .hiddenMonsInfo = NULL, + .hiddenMonsInfo = NULL, }, }; ## endfor