Merge pull request #116 from lhearachel/evo

Build evo.narc from data files in res/pokemon
pret · Nov 19, 2023 · 293fcf8 · 293fcf8
2 parents 9581d2d + 08454c8
commit 293fcf8
Show file tree

Hide file tree

Showing 237 changed files with 436 additions and 255 deletions.
diff --git a/.gitignore b/.gitignore
@@ -68,6 +68,7 @@ cmake-build-*
 
 diff.txt
 
+.vs/
 .vscode/
 
 temp_asm/

diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf
@@ -205,10 +205,10 @@ RomSpec
 	Root /poketool/personal
 	HostRoot res/pokemon
 	File pl_personal.narc
+	File evo.narc
 
 	Root /
 	HostRoot res/prebuilt
-	File poketool/personal/evo.narc
 	File poketool/personal/growtbl.narc
 	File poketool/personal/pl_growtbl.narc
 	File poketool/personal/pms.narc

diff --git a/res/pokemon/abra/data.json b/res/pokemon/abra/data.json
@@ -96,7 +96,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             16,
             "SPECIES_KADABRA"
         ]

diff --git a/res/pokemon/aipom/data.json b/res/pokemon/aipom/data.json
@@ -109,8 +109,8 @@
     },
     "evolutions": [
         [
-            "KNOW_MOVE",
-            "DOUBLE_HIT",
+            "EVO_KNOW_MOVE",
+            "MOVE_DOUBLE_HIT",
             "SPECIES_AMBIPOM"
         ]
     ]

diff --git a/res/pokemon/anorith/data.json b/res/pokemon/anorith/data.json
@@ -96,7 +96,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             40,
             "SPECIES_ARMALDO"
         ]

diff --git a/res/pokemon/aron/data.json b/res/pokemon/aron/data.json
@@ -99,7 +99,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             32,
             "SPECIES_LAIRON"
         ]

diff --git a/res/pokemon/azurill/data.json b/res/pokemon/azurill/data.json
@@ -81,7 +81,7 @@
     },
     "evolutions": [
         [
-            "HAPPINESS",
+            "EVO_HAPPINESS",
             "SPECIES_MARILL"
         ]
     ]

diff --git a/res/pokemon/bagon/data.json b/res/pokemon/bagon/data.json
@@ -94,7 +94,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             30,
             "SPECIES_SHELGON"
         ]

diff --git a/res/pokemon/baltoy/data.json b/res/pokemon/baltoy/data.json
@@ -106,7 +106,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             36,
             "SPECIES_CLAYDOL"
         ]

diff --git a/res/pokemon/barboach/data.json b/res/pokemon/barboach/data.json
@@ -95,7 +95,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             30,
             "SPECIES_WHISCASH"
         ]

diff --git a/res/pokemon/bayleef/data.json b/res/pokemon/bayleef/data.json
@@ -100,7 +100,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             32,
             "SPECIES_MEGANIUM"
         ]

diff --git a/res/pokemon/beldum/data.json b/res/pokemon/beldum/data.json
@@ -51,7 +51,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             20,
             "SPECIES_METANG"
         ]

diff --git a/res/pokemon/bellsprout/data.json b/res/pokemon/bellsprout/data.json
@@ -91,7 +91,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             21,
             "SPECIES_WEEPINBELL"
         ]

diff --git a/res/pokemon/bidoof/data.json b/res/pokemon/bidoof/data.json
@@ -98,7 +98,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             15,
             "SPECIES_BIBAREL"
         ]

diff --git a/res/pokemon/bonsly/data.json b/res/pokemon/bonsly/data.json
@@ -94,8 +94,8 @@
     },
     "evolutions": [
         [
-            "KNOW_MOVE",
-            "MIMIC",
+            "EVO_KNOW_MOVE",
+            "MOVE_MIMIC",
             "SPECIES_SUDOWOODO"
         ]
     ]

diff --git a/res/pokemon/bronzor/data.json b/res/pokemon/bronzor/data.json
@@ -106,7 +106,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             33,
             "SPECIES_BRONZONG"
         ]

diff --git a/res/pokemon/budew/data.json b/res/pokemon/budew/data.json
@@ -86,7 +86,7 @@
     },
     "evolutions": [
         [
-            "HAPPINESS_DAY",
+            "EVO_HAPPINESS_DAY",
             "SPECIES_ROSELIA"
         ]
     ]

diff --git a/res/pokemon/buizel/data.json b/res/pokemon/buizel/data.json
@@ -96,7 +96,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             26,
             "SPECIES_FLOATZEL"
         ]

diff --git a/res/pokemon/bulbasaur/data.json b/res/pokemon/bulbasaur/data.json
@@ -95,7 +95,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             16,
             "SPECIES_IVYSAUR"
         ]

diff --git a/res/pokemon/buneary/data.json b/res/pokemon/buneary/data.json
@@ -101,7 +101,7 @@
     },
     "evolutions": [
         [
-            "HAPPINESS",
+            "EVO_HAPPINESS",
             "SPECIES_LOPUNNY"
         ]
     ]

diff --git a/res/pokemon/burmy/data.json b/res/pokemon/burmy/data.json
@@ -54,12 +54,12 @@
     },
     "evolutions": [
         [
-            "LEVEL_FEMALE",
+            "EVO_LEVEL_FEMALE",
             20,
             "SPECIES_WORMADAM"
         ],
         [
-            "LEVEL_MALE",
+            "EVO_LEVEL_MALE",
             20,
             "SPECIES_MOTHIM"
         ]

diff --git a/res/pokemon/cacnea/data.json b/res/pokemon/cacnea/data.json
@@ -102,7 +102,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             32,
             "SPECIES_CACTURNE"
         ]

diff --git a/res/pokemon/carvanha/data.json b/res/pokemon/carvanha/data.json
@@ -95,7 +95,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             30,
             "SPECIES_SHARPEDO"
         ]

diff --git a/res/pokemon/cascoon/data.json b/res/pokemon/cascoon/data.json
@@ -52,7 +52,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             10,
             "SPECIES_DUSTOX"
         ]

diff --git a/res/pokemon/caterpie/data.json b/res/pokemon/caterpie/data.json
@@ -55,7 +55,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             7,
             "SPECIES_METAPOD"
         ]

diff --git a/res/pokemon/chansey/data.json b/res/pokemon/chansey/data.json
@@ -124,7 +124,7 @@
     },
     "evolutions": [
         [
-            "HAPPINESS",
+            "EVO_HAPPINESS",
             "SPECIES_BLISSEY"
         ]
     ]

diff --git a/res/pokemon/charmander/data.json b/res/pokemon/charmander/data.json
@@ -98,7 +98,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             16,
             "SPECIES_CHARMELEON"
         ]

diff --git a/res/pokemon/charmeleon/data.json b/res/pokemon/charmeleon/data.json
@@ -99,7 +99,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             36,
             "SPECIES_CHARIZARD"
         ]

diff --git a/res/pokemon/cherubi/data.json b/res/pokemon/cherubi/data.json
@@ -86,7 +86,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             25,
             "SPECIES_CHERRIM"
         ]

diff --git a/res/pokemon/chikorita/data.json b/res/pokemon/chikorita/data.json
@@ -96,7 +96,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             16,
             "SPECIES_BAYLEEF"
         ]

diff --git a/res/pokemon/chimchar/data.json b/res/pokemon/chimchar/data.json
@@ -104,7 +104,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             14,
             "SPECIES_MONFERNO"
         ]

diff --git a/res/pokemon/chinchou/data.json b/res/pokemon/chinchou/data.json
@@ -97,7 +97,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             27,
             "SPECIES_LANTURN"
         ]

diff --git a/res/pokemon/chingling/data.json b/res/pokemon/chingling/data.json
@@ -94,7 +94,7 @@
     },
     "evolutions": [
         [
-            "HAPPINESS_NIGHT",
+            "EVO_HAPPINESS_NIGHT",
             "SPECIES_CHIMECHO"
         ]
     ]

diff --git a/res/pokemon/clamperl/data.json b/res/pokemon/clamperl/data.json
@@ -81,12 +81,12 @@
     },
     "evolutions": [
         [
-            "TRADE_WITH_ITEM",
+            "EVO_TRADE_WITH_ITEM",
             "ITEM_DEEPSEATOOTH",
             "SPECIES_HUNTAIL"
         ],
         [
-            "TRADE_WITH_ITEM",
+            "EVO_TRADE_WITH_ITEM",
             "ITEM_DEEPSEASCALE",
             "SPECIES_GOREBYSS"
         ]

diff --git a/res/pokemon/clefairy/data.json b/res/pokemon/clefairy/data.json
@@ -120,7 +120,7 @@
     },
     "evolutions": [
         [
-            "USE_ITEM",
+            "EVO_USE_ITEM",
             "ITEM_MOON_STONE",
             "SPECIES_CLEFABLE"
         ]

diff --git a/res/pokemon/cleffa/data.json b/res/pokemon/cleffa/data.json
@@ -97,7 +97,7 @@
     },
     "evolutions": [
         [
-            "HAPPINESS",
+            "EVO_HAPPINESS",
             "SPECIES_CLEFAIRY"
         ]
     ]

diff --git a/res/pokemon/combee/data.json b/res/pokemon/combee/data.json
@@ -55,7 +55,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_FEMALE",
+            "EVO_LEVEL_FEMALE",
             21,
             "SPECIES_VESPIQUEN"
         ]

diff --git a/res/pokemon/combusken/data.json b/res/pokemon/combusken/data.json
@@ -104,7 +104,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             36,
             "SPECIES_BLAZIKEN"
         ]

diff --git a/res/pokemon/corphish/data.json b/res/pokemon/corphish/data.json
@@ -102,7 +102,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             30,
             "SPECIES_CRAWDAUNT"
         ]

diff --git a/res/pokemon/cranidos/data.json b/res/pokemon/cranidos/data.json
@@ -107,7 +107,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             30,
             "SPECIES_RAMPARDOS"
         ]

diff --git a/res/pokemon/croagunk/data.json b/res/pokemon/croagunk/data.json
@@ -106,7 +106,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             37,
             "SPECIES_TOXICROAK"
         ]

diff --git a/res/pokemon/croconaw/data.json b/res/pokemon/croconaw/data.json
@@ -106,7 +106,7 @@
     },
     "evolutions": [
         [
-            "LEVEL_UP",
+            "EVO_LEVEL_UP",
             30,
             "SPECIES_FERALIGATR"
         ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,7 @@ cmake-build-* @@
     diff.txt
+    .vs/
     .vscode/
     temp_asm/
@@ Expand Down @@