Merge pull request #63 from wildfire248/mon_personal_decomp

pret · Sep 23, 2023 · aac6baa · aac6baa
2 parents 55b9b92 + 29ee0f7
commit aac6baa
Show file tree

Hide file tree

Showing 1,026 changed files with 56,211 additions and 26 deletions.
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
@@ -267,7 +267,7 @@ enum PokemonPersonalDataParam {
     MON_DATA_PERSONAL_ABILITY_2,
     MON_DATA_PERSONAL_GREAT_MARSH_FLEE_RATE,
     MON_DATA_PERSONAL_COLOR,
-    MON_DATA_PERSONAL_INVERSE,
+    MON_DATA_PERSONAL_FLIP_SPRITE,
     MON_DATA_PERSONAL_TM_LEARNSET_MASK_1,
     MON_DATA_PERSONAL_TM_LEARNSET_MASK_2,
     MON_DATA_PERSONAL_TM_LEARNSET_MASK_3,

diff --git a/include/pokemon.h b/include/pokemon.h
@@ -38,7 +38,7 @@ typedef struct PokemonPersonalData {
     u16 evSpeedYield : 2; //!< How many Speed EVs will be gained when defeating this pokemon
     u16 evSpAtkYield : 2; //!< How many Special Attack EVs will be gained when defeating this pokemon
     u16 evSpDefYield : 2; //!< How many Special Defense EVs will be gained when defeating this pokemon
-    u16 padding : 4;
+    // u16 padding : 4;
 
     u16 item1; //!< Common held item when this pokemon is encountered in the wild
     u16 item2; //!< Rare held item when this pokemon is encountered in the wild
@@ -52,7 +52,9 @@ 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 inverse : 1;
+    u8 flipSprite : 1;
+    // u16 padding;
+
     u32 tmLearnsetMask1; //!< Bitflags for whether this pokemon can learn a TM (TM1 -> TM32)
     u32 tmLearnsetMask2; //!< Bitflags for whether this pokemon can learn a TM (TM33 -> TM64)
     u32 tmLearnsetMask3; //!< Bitflags for whether this pokemon can learn a TM (TM65 -> TM92, HM1 -> HM4)

diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf
@@ -195,7 +195,13 @@ RomSpec
 	File poketool/trgra/trbgra.narc
 	File poketool/trgra/trfgra.narc
 	File poketool/personal/personal.narc
-	File poketool/personal/pl_personal.narc
+
+	Root /poketool/personal
+	HostRoot res/pokemon
+	File pl_personal.narc
+
+	Root /
+	HostRoot res/prebuilt
 	File poketool/personal/evo.narc
 	File poketool/personal/growtbl.narc
 	File poketool/personal/pl_growtbl.narc

diff --git a/res/battle/moves/meson.build b/res/battle/moves/meson.build
@@ -484,6 +484,7 @@ pl_waza_tbl_narc = custom_target('pl_waza_tbl.narc',
         movedata_py,
         '--knarc', knarc_exe,
         '--source-dir', '@CURRENT_SOURCE_DIR@',
+        '--private-dir', '@PRIVATE_DIR@',
         '--output-dir', '@OUTDIR@',
     ]
 )

diff --git a/res/meson.build b/res/meson.build
@@ -6,4 +6,5 @@ subdir('prebuilt')
 # Decompiled data directories
 subdir('battle')
 subdir('items')
+subdir('pokemon')
 subdir('text')
diff --git a/res/pokemon/000/data.json b/res/pokemon/000/data.json
@@ -0,0 +1,50 @@
+{
+    "name": "-----",
+    "base_stats": {
+        "hp": 0,
+        "attack": 0,
+        "defense": 0,
+        "speed": 0,
+        "special_attack": 0,
+        "special_defense": 0
+    },
+    "types": [
+        "TYPE_NORMAL",
+        "TYPE_NORMAL"
+    ],
+    "catch_rate": 0,
+    "base_exp_reward": 0,
+    "ev_yields": {
+        "hp": 0,
+        "attack": 0,
+        "defense": 0,
+        "speed": 0,
+        "special_attack": 0,
+        "special_defense": 0
+    },
+    "held_items": {
+        "common": "ITEM_NONE",
+        "rare": "ITEM_NONE"
+    },
+    "gender_ratio": "MALE_ONLY",
+    "hatch_cycles": 0,
+    "base_friendship": 0,
+    "exp_rate": "MEDIUM_FAST",
+    "egg_groups": [
+        "NONE",
+        "NONE"
+    ],
+    "abilities": [
+        "ABILITY_NONE",
+        "ABILITY_NONE"
+    ],
+    "great_marsh_flee_rate": 0,
+    "sprite": {
+        "color": "MON_COLOR_RED",
+        "flip_sprite": false
+    },
+    "learnset": {
+        "tms": [],
+        "level_up": {}
+    }
+}
diff --git a/res/pokemon/000/meson.build b/res/pokemon/000/meson.build
@@ -0,0 +1 @@
+personal_files += files('data.json')
diff --git a/res/pokemon/abomasnow/data.json b/res/pokemon/abomasnow/data.json
@@ -0,0 +1,114 @@
+{
+    "name": "Abomasnow",
+    "base_stats": {
+        "hp": 90,
+        "attack": 92,
+        "defense": 75,
+        "speed": 60,
+        "special_attack": 92,
+        "special_defense": 85
+    },
+    "types": [
+        "TYPE_GRASS",
+        "TYPE_ICE"
+    ],
+    "catch_rate": 60,
+    "base_exp_reward": 214,
+    "ev_yields": {
+        "hp": 0,
+        "attack": 1,
+        "defense": 0,
+        "speed": 0,
+        "special_attack": 1,
+        "special_defense": 0
+    },
+    "held_items": {
+        "common": "ITEM_NONE",
+        "rare": "ITEM_NEVERMELTICE"
+    },
+    "gender_ratio": "FEMALE_50",
+    "hatch_cycles": 20,
+    "base_friendship": 70,
+    "exp_rate": "SLOW",
+    "egg_groups": [
+        "MONSTER",
+        "GRASS"
+    ],
+    "abilities": [
+        "ABILITY_SNOW_WARNING",
+        "ABILITY_NONE"
+    ],
+    "great_marsh_flee_rate": 0,
+    "sprite": {
+        "color": "MON_COLOR_WHITE",
+        "flip_sprite": false
+    },
+    "learnset": {
+        "tms": [
+            "TM01",
+            "TM03",
+            "TM06",
+            "TM07",
+            "TM09",
+            "TM10",
+            "TM13",
+            "TM14",
+            "TM15",
+            "TM16",
+            "TM17",
+            "TM18",
+            "TM19",
+            "TM20",
+            "TM21",
+            "TM22",
+            "TM23",
+            "TM26",
+            "TM27",
+            "TM30",
+            "TM31",
+            "TM32",
+            "TM39",
+            "TM42",
+            "TM43",
+            "TM44",
+            "TM45",
+            "TM52",
+            "TM53",
+            "TM56",
+            "TM58",
+            "TM68",
+            "TM70",
+            "TM72",
+            "TM75",
+            "TM78",
+            "TM80",
+            "TM82",
+            "TM83",
+            "TM86",
+            "TM87",
+            "TM90",
+            "HM04",
+            "HM06",
+            "HM08"
+        ],
+        "level_up": {
+            "1": [
+                "ICE_PUNCH",
+                "POWDER_SNOW",
+                "LEER",
+                "RAZOR_LEAF",
+                "ICY_WIND"
+            ],
+            "5": "RAZOR_LEAF",
+            "9": "ICY_WIND",
+            "13": "GRASS_WHISTLE",
+            "17": "SWAGGER",
+            "21": "MIST",
+            "26": "ICE_SHARD",
+            "31": "INGRAIN",
+            "36": "WOOD_HAMMER",
+            "47": "BLIZZARD",
+            "58": "SHEER_COLD"
+        }
+    }
+}
diff --git a/res/pokemon/abomasnow/meson.build b/res/pokemon/abomasnow/meson.build
@@ -0,0 +1 @@
+personal_files += files('data.json')
diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json
@@ -0,0 +1,104 @@
+{
+    "name": "Abra",
+    "base_stats": {
+        "hp": 25,
+        "attack": 20,
+        "defense": 15,
+        "speed": 90,
+        "special_attack": 105,
+        "special_defense": 55
+    },
+    "types": [
+        "TYPE_PSYCHIC",
+        "TYPE_PSYCHIC"
+    ],
+    "catch_rate": 200,
+    "base_exp_reward": 75,
+    "ev_yields": {
+        "hp": 0,
+        "attack": 0,
+        "defense": 0,
+        "speed": 0,
+        "special_attack": 1,
+        "special_defense": 0
+    },
+    "held_items": {
+        "common": "ITEM_NONE",
+        "rare": "ITEM_TWISTEDSPOON"
+    },
+    "gender_ratio": "FEMALE_25",
+    "hatch_cycles": 20,
+    "base_friendship": 70,
+    "exp_rate": "MEDIUM_SLOW",
+    "egg_groups": [
+        "HUMAN_LIKE",
+        "HUMAN_LIKE"
+    ],
+    "abilities": [
+        "ABILITY_SYNCHRONIZE",
+        "ABILITY_INNER_FOCUS"
+    ],
+    "great_marsh_flee_rate": 0,
+    "sprite": {
+        "color": "MON_COLOR_BROWN",
+        "flip_sprite": false
+    },
+    "learnset": {
+        "tms": [
+            "TM01",
+            "TM04",
+            "TM06",
+            "TM10",
+            "TM11",
+            "TM12",
+            "TM16",
+            "TM17",
+            "TM18",
+            "TM20",
+            "TM21",
+            "TM23",
+            "TM27",
+            "TM29",
+            "TM30",
+            "TM32",
+            "TM33",
+            "TM34",
+            "TM41",
+            "TM42",
+            "TM43",
+            "TM44",
+            "TM45",
+            "TM46",
+            "TM48",
+            "TM49",
+            "TM53",
+            "TM56",
+            "TM57",
+            "TM58",
+            "TM60",
+            "TM63",
+            "TM67",
+            "TM70",
+            "TM73",
+            "TM77",
+            "TM78",
+            "TM82",
+            "TM83",
+            "TM85",
+            "TM86",
+            "TM87",
+            "TM90",
+            "TM92"
+        ],
+        "level_up": {
+            "1": "TELEPORT"
+        }
+    },
+    "evolutions": [
+        [
+            "LEVEL_UP",
+            16,
+            "SPECIES_KADABRA"
+        ]
+    ]
+}
diff --git a/res/pokemon/abra/meson.build b/res/pokemon/abra/meson.build
@@ -0,0 +1 @@
+personal_files += files('data.json')