Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-04-27 09:57:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

graphics working as added too src/data/graphics/pokemon.h

Browse Source
This commit is contained in:
nicksnax 2026-03-16 23:36:44 +09:00
parent 60dc923683
commit 26f595114c
14 changed files with 62 additions and 1150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokemon/ecosaur/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 926 B

BIN
graphics/pokemon/ecosaur/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/ecosaur/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

BIN
graphics/pokemon/terarisaur/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/terarisaur/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
graphics/pokemon/terarisaur/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

15
pokeemerald-tools/evo_families.h
View File

@ -2,6 +2,7 @@
#ifdef __INTELLISENSE__ #ifdef __INTELLISENSE__
const struct SpeciesInfo gSpeciesInfoEvo[] = const struct SpeciesInfo gSpeciesInfoEvo[] =
{ {
#endif
[SPECIES_ECOSAUR] = [SPECIES_ECOSAUR] =
{ {
@ -33,9 +34,16 @@ const struct SpeciesInfo gSpeciesInfoEvo[] =
.pokemonOffset = 1, .pokemonOffset = 1,
.trainerScale = 375, .trainerScale = 375,
.trainerOffset = 6, .trainerOffset = 6,
.frontPic = gMonFrontPic_Ecosaur,
.frontPicSize = MON_COORDS_SIZE(8,8),
.frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)), .frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)),
.frontAnimId = ANIM_V_JUMPS_H_JUMPS, .frontAnimId = ANIM_V_JUMPS_H_JUMPS,
.frontAnimDelay = 15, .frontAnimDelay = 15,
.backPic = gMonBackPic_Ecosaur,
.backPicSize = MON_COORDS_SIZE(6,8),
.palette = gMonPalette_Ecosaur,
.shinyPalette = gMonShinyPalette_Ecosaur,
.iconSprite = gMonIcon_Ecosaur,
.iconPalIndex = 2, .iconPalIndex = 2,
.evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_TERARISAUR}), .evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_TERARISAUR}),
}, },
@ -70,9 +78,16 @@ const struct SpeciesInfo gSpeciesInfoEvo[] =
.pokemonOffset = 1, .pokemonOffset = 1,
.trainerScale = 375, .trainerScale = 375,
.trainerOffset = 6, .trainerOffset = 6,
.frontPic = gMonFrontPic_Terarisaur,
.frontPicSize = MON_COORDS_SIZE(8,8),
.frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)), .frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)),
.frontAnimId = ANIM_V_JUMPS_H_JUMPS, .frontAnimId = ANIM_V_JUMPS_H_JUMPS,
.frontAnimDelay = 15, .frontAnimDelay = 15,
.backPic = gMonBackPic_Terarisaur,
.backPicSize = MON_COORDS_SIZE(7,8),
.palette = gMonPalette_Terarisaur,
.shinyPalette = gMonShinyPalette_Terarisaur,
.iconSprite = gMonIcon_Terarisaur,
.iconPalIndex = 2, .iconPalIndex = 2,
.evolutions = EVOLUTION({EVO_LEVEL, 65, SPECIES_SYMBISAUR}), .evolutions = EVOLUTION({EVO_LEVEL, 65, SPECIES_SYMBISAUR}),
}, },

6
pokeemerald-tools/gen-new-graphics.py
View File

@ -5,6 +5,7 @@ from openpyxl.workbook import Workbook
from openpyxl import load_workbook from openpyxl import load_workbook
Debug = 0 Debug = 0
OnlyNewSpecies = 1
WriteOrAdd = 'w' WriteOrAdd = 'w'
Anim = False Anim = False
Footprint = False Footprint = False
@ -36,7 +37,7 @@ with open("pokemon.h", WriteOrAdd) as file:
#for row in PkmnDataFile.iter_rows(min_row=2, max_row=13, min_col=1, max_col=PkmnDataFile.max_column): #for row in PkmnDataFile.iter_rows(min_row=2, max_row=13, min_col=1, max_col=PkmnDataFile.max_column):
if Debug == 1: if OnlyNewSpecies == 0:
for row in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=PkmnDataFile.max_column): for row in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=PkmnDataFile.max_column):
fixCase = row[PkmnDataFile.min_column - 1].value fixCase = row[PkmnDataFile.min_column - 1].value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()
@ -65,7 +66,8 @@ with open("pokemon.h", WriteOrAdd) as file:
file.write(f"#endif //P_FAMILY_{CurrentSpecies}\n\n") file.write(f"#endif //P_FAMILY_{CurrentSpecies}\n\n")
else: else:
for row in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=PkmnDataFile.max_column): #for row in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=PkmnDataFile.max_column):
for row in PkmnDataFile.iter_rows(min_row=2, max_row=6, min_col=1, max_col=PkmnDataFile.max_column):
fixCase = row[PkmnDataFile.min_column - 1].value fixCase = row[PkmnDataFile.min_column - 1].value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()

19
pokeemerald-tools/gen-new-pokemon.py
View File

@ -22,6 +22,7 @@ Header ="""//gen file for """ + GenName + """
#ifdef __INTELLISENSE__ #ifdef __INTELLISENSE__
const struct SpeciesInfo gSpeciesInfo""" + GenName + """[] = const struct SpeciesInfo gSpeciesInfo""" + GenName + """[] =
{ {
#endif
""" """
#Definiton of species information in array format for adding to .h file when iterating through data values #Definiton of species information in array format for adding to .h file when iterating through data values
@ -219,25 +220,25 @@ if OnlyNewSpecies:
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".frontPic": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".frontPic":
fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()
# file.write("\t\t.frontPic = gMonFrontPic_" + fixCase + ",\n") file.write("\t\t.frontPic = gMonFrontPic_" + fixCase + ",\n")
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".frontPicSize": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".frontPicSize":
# file.write("\t\t.frontPicSize = MON_COORDS_SIZE(" + data.value + "),\n") file.write("\t\t.frontPicSize = MON_COORDS_SIZE(" + data.value + "),\n")
continue # continue
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".backPic": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".backPic":
fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()
# file.write("\t\t.backPic = gMonBackPic_" + fixCase + ",\n") file.write("\t\t.backPic = gMonBackPic_" + fixCase + ",\n")
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".backPicSize": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".backPicSize":
# file.write("\t\t.backPicSize = MON_COORDS_SIZE(" + data.value + "),\n") file.write("\t\t.backPicSize = MON_COORDS_SIZE(" + data.value + "),\n")
continue # continue
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".palette": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".palette":
fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()
# file.write("\t\t.palette = gMonPalette_" + fixCase + ",\n") file.write("\t\t.palette = gMonPalette_" + fixCase + ",\n")
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".shinyPalette": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".shinyPalette":
fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()
# file.write("\t\t.shinyPalette = gMonShinyPalette_" + fixCase + ",\n") file.write("\t\t.shinyPalette = gMonShinyPalette_" + fixCase + ",\n")
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == "FOOTPRINT": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == "FOOTPRINT":
fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()
@ -245,7 +246,7 @@ if OnlyNewSpecies:
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".iconSprite": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".iconSprite":
fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()
# file.write("\t\t.iconSprite = gMonIcon_" + fixCase + ",\n") file.write("\t\t.iconSprite = gMonIcon_" + fixCase + ",\n")
elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".levelUpLearnset": elif PkmnDataFile.cell(row = PkmnDataFile.min_row, column = data.column).value == ".levelUpLearnset":
fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value fixCase = PkmnDataFile.cell(row = data.row, column = PkmnDataFile.min_column).value
fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower() fixCase = fixCase[0] + fixCase[1:len(fixCase)].lower()

1128
pokeemerald-tools/pokemon.h
View File

File diff suppressed because it is too large Load Diff

3
pokeemerald-tools/sprite-prepper.py
View File

@ -41,7 +41,8 @@ os.makedirs(OutputFolderPath, exist_ok = True)
#Step through source file and see if sprite files have a matching sprite #Step through source file and see if sprite files have a matching sprite
#for species in PkmnDataFile.iter_rows(min_row=2, max_row=2, min_col=1, max_col=1): #for species in PkmnDataFile.iter_rows(min_row=2, max_row=2, min_col=1, max_col=1):
if Debug == 0: if Debug == 0:
for row in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1): #for row in PkmnDataFile.iter_rows(min_row=2, max_row=PkmnDataFile.max_row, min_col=1, max_col=1):
for row in PkmnDataFile.iter_rows(min_row=2, max_row=6, min_col=1, max_col=1):
for file in os.listdir(f"{InputFolderPath + FrontSpritePath}"): for file in os.listdir(f"{InputFolderPath + FrontSpritePath}"):
fileSplit = re.split(r"[_.]",file) fileSplit = re.split(r"[_.]",file)
for word in fileSplit: for word in fileSplit:

13
src/data/graphics/pokemon.h
View File

@ -27513,4 +27513,15 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u32 gMonBackPic_Chariathan[] = INCBIN_U32("graphics/pokemon/chariathan/back.4bpp.smol"); const u32 gMonBackPic_Chariathan[] = INCBIN_U32("graphics/pokemon/chariathan/back.4bpp.smol");
const u16 gMonShinyPalette_Chariathan[] = INCBIN_U16("graphics/pokemon/chariathan/back.gbapal"); const u16 gMonShinyPalette_Chariathan[] = INCBIN_U16("graphics/pokemon/chariathan/back.gbapal");
const u8 gMonIcon_Chariathan[] = INCBIN_U8("graphics/pokemon/chariathan/icon.4bpp"); const u8 gMonIcon_Chariathan[] = INCBIN_U8("graphics/pokemon/chariathan/icon.4bpp");
//const u8 gMonFootprint_Chariathan[] = INCBIN_U8("graphics/pokemon/chariathan/footprint.1bpp");
const u32 gMonFrontPic_Ecosaur[] = INCBIN_U32("graphics/pokemon/ecosaur/front.4bpp.smol");
const u32 gMonBackPic_Ecosaur[] = INCBIN_U32("graphics/pokemon/ecosaur/back.4bpp.smol");
const u16 gMonPalette_Ecosaur[] = INCBIN_U16("graphics/pokemon/ecosaur/front.gbapal");
const u16 gMonShinyPalette_Ecosaur[] = INCBIN_U16("graphics/pokemon/ecosaur/back.gbapal");
const u8 gMonIcon_Ecosaur[] = INCBIN_U8("graphics/pokemon/ecosaur/icon.4bpp");
const u32 gMonFrontPic_Terarisaur[] = INCBIN_U32("graphics/pokemon/terarisaur/front.4bpp.smol");
const u32 gMonBackPic_Terarisaur[] = INCBIN_U32("graphics/pokemon/terarisaur/back.4bpp.smol");
const u16 gMonPalette_Terarisaur[] = INCBIN_U16("graphics/pokemon/terarisaur/front.gbapal");
const u16 gMonShinyPalette_Terarisaur[] = INCBIN_U16("graphics/pokemon/terarisaur/back.gbapal");
const u8 gMonIcon_Terarisaur[] = INCBIN_U8("graphics/pokemon/terarisaur/icon.4bpp");

2
src/data/pokemon/species_info.h
View File

@ -150,8 +150,8 @@ const struct SpeciesInfo gSpeciesInfo[] =
.eggMoveLearnset = sNoneEggMoveLearnset, .eggMoveLearnset = sNoneEggMoveLearnset,
}, },
#include "species_info/gen_1_families.h"
#include "species_info/evo_families.h" #include "species_info/evo_families.h"
#include "species_info/gen_1_families.h"
//#include "species_info/gen_2_families.h" //#include "species_info/gen_2_families.h"
//#include "species_info/gen_3_families.h" //#include "species_info/gen_3_families.h"
//#include "species_info/gen_4_families.h" //#include "species_info/gen_4_families.h"

26
src/data/pokemon/species_info/evo_families.h
View File

@ -2,7 +2,7 @@
#ifdef __INTELLISENSE__ #ifdef __INTELLISENSE__
const struct SpeciesInfo gSpeciesInfoEvo[] = const struct SpeciesInfo gSpeciesInfoEvo[] =
{ {
#endif #endif
[SPECIES_ECOSAUR] = [SPECIES_ECOSAUR] =
{ {
@ -30,17 +30,22 @@ const struct SpeciesInfo gSpeciesInfoEvo[] =
.categoryName = _("Overgrown"), .categoryName = _("Overgrown"),
.height = 20, .height = 20,
.weight = 2700, .weight = 2700,
//.description = COMPOUD_STRING(
// "Its back serves as a good environment\nfor small POKéMON to live on and seek\nshelter from predators."),
.pokemonScale = 256, .pokemonScale = 256,
.pokemonOffset = 1, .pokemonOffset = 1,
.trainerScale = 375, .trainerScale = 375,
.trainerOffset = 6, .trainerOffset = 6,
.frontPic = gMonFrontPic_Ecosaur,
.frontPicSize = MON_COORDS_SIZE(8,8),
//.frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)), //.frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)),
.frontAnimId = ANIM_V_JUMPS_H_JUMPS, .frontAnimId = ANIM_V_JUMPS_H_JUMPS,
.frontAnimDelay = 15, .frontAnimDelay = 15,
.backPic = gMonBackPic_Ecosaur,
.backPicSize = MON_COORDS_SIZE(6,8),
.palette = gMonPalette_Ecosaur,
.shinyPalette = gMonShinyPalette_Ecosaur,
.iconSprite = gMonIcon_Ecosaur,
.iconPalIndex = 2, .iconPalIndex = 2,
.evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_TERARISAUR}), //.evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_TERARISAUR}),
}, },
[SPECIES_TERARISAUR] = [SPECIES_TERARISAUR] =
@ -69,20 +74,25 @@ const struct SpeciesInfo gSpeciesInfoEvo[] =
.categoryName = _("Jungle"), .categoryName = _("Jungle"),
.height = 20, .height = 20,
.weight = 3500, .weight = 3500,
//.description = COMPOUD_STRING(
// "The plant life on its back has mostly\ntaken over. It can barely walk from\nthe weight."),
.pokemonScale = 256, .pokemonScale = 256,
.pokemonOffset = 1, .pokemonOffset = 1,
.trainerScale = 375, .trainerScale = 375,
.trainerOffset = 6, .trainerOffset = 6,
.frontPic = gMonFrontPic_Terarisaur,
.frontPicSize = MON_COORDS_SIZE(8,8),
//.frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)), //.frontAnimFrames = ANIM_FRAMES(ANIMCMD_FRAME(0, 1)),
.frontAnimId = ANIM_V_JUMPS_H_JUMPS, .frontAnimId = ANIM_V_JUMPS_H_JUMPS,
.frontAnimDelay = 15, .frontAnimDelay = 15,
.backPic = gMonBackPic_Terarisaur,
.backPicSize = MON_COORDS_SIZE(7,8),
.palette = gMonPalette_Terarisaur,
.shinyPalette = gMonShinyPalette_Terarisaur,
.iconSprite = gMonIcon_Terarisaur,
.iconPalIndex = 2, .iconPalIndex = 2,
.evolutions = EVOLUTION({EVO_LEVEL, 65, SPECIES_SYMBISAUR}), //.evolutions = EVOLUTION({EVO_LEVEL, 65, SPECIES_SYMBISAUR}),
}, },
#ifdef __INTELLISENSE__ #ifdef __INTELLISENSE__
}; };
#endif #endif
//end of program //end of program