Skip to content

Commit

Permalink
some palettes are wonky but should at least compile
Browse files Browse the repository at this point in the history
  • Loading branch information
@khbsd
khbsd committed Jan 23, 2025
1 parent 0140959 commit ef22bed
Show file tree
Hide file tree
Showing 15 changed files with 527 additions and 35 deletions.
50 changes: 50 additions & 0 deletions data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,56 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork::

LittlerootTown_ProfessorBirchsLab_EventScript_PC::
msgbox LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch, MSGBOX_SIGN
givemon SPECIES_VENUSAUR_MEGA, 5
givemon SPECIES_CHARIZARD_MEGA_X, 5
givemon SPECIES_CHARIZARD_MEGA_Y, 5
givemon SPECIES_BLASTOISE_MEGA, 5
givemon SPECIES_PIDGEOT_MEGA, 5
givemon SPECIES_BEEDRILL_MEGA, 5
givemon SPECIES_SLOWBRO_MEGA, 5
givemon SPECIES_KANGASKHAN_MEGA, 5
givemon SPECIES_ALAKAZAM_MEGA, 5
givemon SPECIES_PINSIR_MEGA, 5
givemon SPECIES_AERODACTYL_MEGA, 5
givemon SPECIES_MEWTWO_MEGA_X, 5
givemon SPECIES_MEWTWO_MEGA_Y, 5
givemon SPECIES_GENGAR_MEGA, 5
givemon SPECIES_GYARADOS_MEGA, 5
givemon SPECIES_AMPHAROS_MEGA, 5
givemon SPECIES_STEELIX_MEGA, 5
givemon SPECIES_SCIZOR_MEGA, 5
givemon SPECIES_HERACROSS_MEGA, 5
givemon SPECIES_HOUNDOOM_MEGA, 5
givemon SPECIES_TYRANITAR_MEGA, 5
givemon SPECIES_SWAMPERT_MEGA, 5
givemon SPECIES_SCEPTILE_MEGA, 5
givemon SPECIES_BLAZIKEN_MEGA, 5
givemon SPECIES_AGGRON_MEGA, 5
givemon SPECIES_SALAMENCE_MEGA, 5
givemon SPECIES_BANETTE_MEGA, 5
givemon SPECIES_METAGROSS_MEGA, 5
givemon SPECIES_GARDEVOIR_MEGA, 5
givemon SPECIES_MEDICHAM_MEGA, 5
givemon SPECIES_MAWILE_MEGA, 5
givemon SPECIES_SABLEYE_MEGA, 5
givemon SPECIES_MANECTRIC_MEGA, 5
givemon SPECIES_SHARPEDO_MEGA, 5
givemon SPECIES_ALTARIA_MEGA, 5
givemon SPECIES_CAMERUPT_MEGA, 5
givemon SPECIES_ABSOL_MEGA, 5
givemon SPECIES_GLALIE_MEGA, 5
givemon SPECIES_LATIAS_MEGA, 5
givemon SPECIES_LATIOS_MEGA, 5
givemon SPECIES_GROUDON_PRIMAL, 5
givemon SPECIES_KYOGRE_PRIMAL, 5
givemon SPECIES_RAYQUAZA_MEGA, 5
givemon SPECIES_LOPUNNY_MEGA, 5
givemon SPECIES_LUCARIO_MEGA, 5
givemon SPECIES_GARCHOMP_MEGA, 5
givemon SPECIES_GALLADE_MEGA, 5
givemon SPECIES_ABOMASNOW_MEGA, 5
givemon SPECIES_AUDINO_MEGA, 5
givemon SPECIES_DIANCIE_MEGA, 5
end

LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf::
Expand Down
Binary file modified graphics/pokemon/aerodactyl/mega/overworld_normal.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/aerodactyl/mega/overworld_shiny.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/ampharos/mega/overworld_normal.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokemon/ampharos/mega/overworld_shiny.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions graphics/pokemon/swampert/mega/overworld_normal.pal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ JASC-PAL
16
205 244 181
0 0 0
28 36 40
127 55 55
48 64 72
48 72 112
67 78 90
160 72 16
167 71 71
247 114 64
240 128 16
87 119 156
74 156 210
105 177 241
160 160 192
200 200 224
16 16 16
62 62 62
96 16 16
92 92 92
72 64 96
122 122 122
128 88 128
128 112 176
144 136 200
184 136 192
176 176 224
200 200 208
232 232 248
0 0 0
28 changes: 14 additions & 14 deletions graphics/pokemon/swampert/mega/overworld_shiny.pal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ JASC-PAL
16
205 244 181
0 0 0
28 36 40
127 55 55
48 64 72
67 78 90
160 72 16
167 71 71
247 114 64
240 128 16
127 55 129
103 117 133
198 86 229
234 121 249
160 160 192
200 200 224
16 16 16
62 62 62
96 16 16
92 92 92
72 64 96
122 122 122
79 76 138
112 116 222
169 112 176
186 136 200
208 176 224
200 200 208
232 232 248
0 0 0
2 changes: 1 addition & 1 deletion include/config/pokemon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
// Flag settings
// To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
#define P_FLAG_FORCE_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into being Shiny.
#define P_FLAG_FORCE_SHINY FLAG_UNUSED_0x95F // If this flag is set, all wild and gift Pokémon will forced into being Shiny.
#define P_FLAG_FORCE_NO_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into NOT being Shiny.

// Go here if you want to disable specific families of Pokémon.
Expand Down
7 changes: 5 additions & 2 deletions spritesheet_rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2253,6 +2253,9 @@ $(POKEMONGFXDIR)/metang/overworld.4bpp: %.4bpp: %.png
$(POKEMONGFXDIR)/metagross/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(POKEMONGFXDIR)/metagross/mega/overworld_normal.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(POKEMONGFXDIR)/regirock/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

Expand All @@ -2266,13 +2269,13 @@ $(POKEMONGFXDIR)/latias/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(POKEMONGFXDIR)/latias/mega/overworld_normal.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(GFX) $< $@ -mwidth 8 -mheight 8

$(POKEMONGFXDIR)/latios/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4

$(POKEMONGFXDIR)/latios/mega/overworld_normal.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(GFX) $< $@ -mwidth 8 -mheight 8

$(POKEMONGFXDIR)/kyogre/overworld.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8
Expand Down
101 changes: 97 additions & 4 deletions src/data/pokemon/species_info/gen_1_families.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,16 +279,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
SHADOW(2, 6, SHADOW_SIZE_XL_BATTLE_ONLY)
FOOTPRINT(Venusaur)
OVERWORLD(
gObjectEventPic_Venusaur,
gObjectEventPic_VenusaurMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following,
gOverworldPalette_Venusaur,
gShinyOverworldPalette_Venusaur
gOverworldPalette_VenusaurMega,
gShinyOverworldPalette_VenusaurMega
)
OVERWORLD_FEMALE(
gObjectEventPic_VenusaurF,
gObjectEventPic_VenusaurMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
Expand Down Expand Up @@ -12059,6 +12059,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 0,
SHADOW(1, 13, SHADOW_SIZE_XL_BATTLE_ONLY)
FOOTPRINT(Steelix)
OVERWORLD(
gObjectEventPic_SteelixMega,
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_SLITHER,
sAnimTable_Following,
gOverworldPalette_SteelixMega,
gShinyOverworldPalette_SteelixMega
)
OVERWORLD_FEMALE(
gObjectEventPic_SteelixMega,
SIZE_64x64,
SHADOW_SIZE_M,
TRACKS_SLITHER,
sAnimTable_Following
)
.isMegaEvolution = TRUE,
.levelUpLearnset = sSteelixLevelUpLearnset,
.teachableLearnset = sSteelixTeachableLearnset,
Expand Down Expand Up @@ -14623,6 +14639,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 2,
SHADOW(0, 11, SHADOW_SIZE_XL_BATTLE_ONLY)
FOOTPRINT(Kangaskhan)
OVERWORLD(
gObjectEventPic_KangaskhanMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following,
gOverworldPalette_KangaskhanMega,
gShinyOverworldPalette_KangaskhanMega
)
.isMegaEvolution = TRUE,
.levelUpLearnset = sKangaskhanLevelUpLearnset,
.teachableLearnset = sKangaskhanTeachableLearnset,
Expand Down Expand Up @@ -15699,6 +15724,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 0,
SHADOW(5, 15, SHADOW_SIZE_XL_BATTLE_ONLY)
FOOTPRINT(Scizor)
OVERWORLD(
gObjectEventPic_ScizorMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following,
gOverworldPalette_ScizorMega,
gShinyOverworldPalette_ScizorMega
)
OVERWORLD_FEMALE(
gObjectEventPic_ScizorMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following
)
.isMegaEvolution = TRUE,
.levelUpLearnset = sScizorLevelUpLearnset,
.teachableLearnset = sScizorTeachableLearnset,
Expand Down Expand Up @@ -16487,6 +16528,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 2,
SHADOW(3, 12, SHADOW_SIZE_L)
FOOTPRINT(Pinsir)
OVERWORLD(
gObjectEventPic_PinsirMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following,
gOverworldPalette_PinsirMega,
gShinyOverworldPalette_PinsirMega
)
.isMegaEvolution = TRUE,
.levelUpLearnset = sPinsirLevelUpLearnset,
.teachableLearnset = sPinsirTeachableLearnset,
Expand Down Expand Up @@ -16990,6 +17040,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 0,
SHADOW(3, 17, SHADOW_SIZE_XL_BATTLE_ONLY)
FOOTPRINT(Gyarados)
OVERWORLD(
gObjectEventPic_GyaradosMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_SLITHER,
sAnimTable_Following,
gOverworldPalette_GyaradosMega,
gShinyOverworldPalette_GyaradosMega
)
OVERWORLD_FEMALE(
gObjectEventPic_GyaradosMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_SLITHER,
sAnimTable_Following
)
.isMegaEvolution = TRUE,
.levelUpLearnset = sGyaradosLevelUpLearnset,
.teachableLearnset = sGyaradosTeachableLearnset,
Expand Down Expand Up @@ -18614,6 +18680,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 2,
SHADOW(-2, 16, SHADOW_SIZE_M)
FOOTPRINT(Aerodactyl)
OVERWORLD(
gObjectEventPic_AerodactylMega,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_NONE,
sAnimTable_Following,
gOverworldPalette_AerodactylMega,
gShinyOverworldPalette_AerodactylMega
)
.isMegaEvolution = TRUE,
.levelUpLearnset = sAerodactylLevelUpLearnset,
.teachableLearnset = sAerodactylTeachableLearnset,
Expand Down Expand Up @@ -19645,6 +19720,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 2,
SHADOW(1, 12, SHADOW_SIZE_M)
FOOTPRINT(Mewtwo)
OVERWORLD(
gObjectEventPic_MewtwoMegaX,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following,
gOverworldPalette_MewtwoMegaX,
gShinyOverworldPalette_MewtwoMegaX
)
.isLegendary = TRUE,
.isMegaEvolution = TRUE,
.isFrontierBanned = TRUE,
Expand Down Expand Up @@ -19705,6 +19789,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.iconPalIndex = 2,
SHADOW(0, 14, SHADOW_SIZE_S)
FOOTPRINT(Mewtwo)
OVERWORLD(
gObjectEventPic_MewtwoMegaY,
SIZE_32x32,
SHADOW_SIZE_M,
TRACKS_FOOT,
sAnimTable_Following,
gOverworldPalette_MewtwoMegaY,
gShinyOverworldPalette_MewtwoMegaY
)
.isLegendary = TRUE,
.isMegaEvolution = TRUE,
.isFrontierBanned = TRUE,
Expand Down
Loading

0 comments on commit ef22bed

Please sign in to comment.