atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

syntax, alignment fixes

Browse source
This commit is contained in:
ghoulslash 2024-07-08 14:15:41 -04:00
parent 48d2bff553
commit bd014e4fb7
6 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/field_effect_scripts.s
View file

@ -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

38
data/scripts/dexnav.inc
View file

@ -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!$"

2
include/config/dexnav.h
View file

@ -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

2
include/constants/flags.h
View file

@ -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

2
include/dexnav.h
View file

@ -77,4 +77,4 @@ void IncrementDexNavChain(void);
//ewram
extern bool8 gDexnavBattle;
#endif //GUARD_DEXNAV_H
#endif //GUARD_DEXNAV_H

4
src/data/wild_encounters.json.txt
View file

@ -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