Misc. cleanup

pret · Sep 20, 2023 · 29ee0f7 · 29ee0f7
1 parent 5b23f9b
commit 29ee0f7
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/include/pokemon.h b/include/pokemon.h
@@ -52,7 +52,7 @@ typedef struct PokemonPersonalData {
     u8 ability2; //!< The pokemons second possible ability
     u8 greatMarshFleeRate; //!< The pokemons base flee rate in the Great Marsh safari zone
     u8 color : 7; //!< The pokemons color category
-    u8 flip_sprite : 1;
+    u8 flipSprite : 1;
     // u16 padding;
 
     u32 tmLearnsetMask1; //!< Bitflags for whether this pokemon can learn a TM (TM1 -> TM32)

diff --git a/res/pokemon/495/data.json → res/pokemon/bad_egg/data.json b/res/pokemon/495/data.json → res/pokemon/bad_egg/data.json
@@ -1,5 +1,5 @@
 {
-    "name": "495",
+    "name": "Bad Egg",
     "base_stats": {
         "hp": 10,
         "attack": 10,

diff --git a/res/pokemon/494/meson.build → res/pokemon/bad_egg/meson.build b/res/pokemon/494/meson.build → res/pokemon/bad_egg/meson.build
diff --git a/res/pokemon/494/data.json → res/pokemon/egg/data.json b/res/pokemon/494/data.json → res/pokemon/egg/data.json
@@ -1,5 +1,5 @@
 {
-    "name": "494",
+    "name": "Egg",
     "base_stats": {
         "hp": 10,
         "attack": 10,

diff --git a/res/pokemon/495/meson.build → res/pokemon/egg/meson.build b/res/pokemon/495/meson.build → res/pokemon/egg/meson.build
diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build
@@ -497,8 +497,8 @@ subdir('manaphy')
 subdir('darkrai')
 subdir('shaymin')
 subdir('arceus')
-subdir('494')  # Pokemon Egg
-subdir('495')  # Bad Egg TODO verify this
+subdir('egg')
+subdir('bad_egg')
 
 
 # Order of extra files for mon forms

diff --git a/src/pokemon.c b/src/pokemon.c
@@ -1947,7 +1947,7 @@ u32 PokemonPersonalData_GetValue(PokemonPersonalData *monPersonalData, enum Poke
         result = monPersonalData->color;
         break;
     case MON_DATA_PERSONAL_FLIP_SPRITE:
-        result = monPersonalData->flip_sprite;
+        result = monPersonalData->flipSprite;
         break;
     case MON_DATA_PERSONAL_TM_LEARNSET_MASK_1:
         result = monPersonalData->tmLearnsetMask1;

diff --git a/tools/json2bin/pokemon_personal_data.py b/tools/json2bin/pokemon_personal_data.py
@@ -62,7 +62,7 @@ def parse_color(sprite: dict, size: int, _: None) -> bytes:
     .register('learnset.tms', 16, j2b.pack_flags, tms.PokemonLearnsetTMs)
 
 
-FORM_INDEXES = {
+FORM_INDICES = {
     'DEOXYS' : {
         'ATTACK': 496,
         'DEFENSE': 497,
@@ -94,7 +94,7 @@ def indexer(file_path: pathlib.Path) -> int:
     if file_path.parent.parent.stem == 'forms':
         species_idx = file_path.parent.parent.parent.stem.upper()
         form = file_path.parent.stem.upper()
-        return FORM_INDEXES[species_idx][form]
+        return FORM_INDICES[species_idx][form]
     return species.PokemonSpecies[f'SPECIES_{name}'].value