Temp push

rh-hideout · Nov 23, 2023 · 0b98485 · 0b98485
1 parent 167b308
commit 0b98485
Show file tree

Hide file tree

Showing 11 changed files with 45,433 additions and 1,093 deletions.
diff --git a/Makefile b/Makefile
@@ -123,7 +123,7 @@ LIBPATH := -L ../../tools/agbcc/lib
 LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
 else
 CC1              = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
-override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias -Woverride-init
+override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias #-Woverride-init
 ifeq ($(ANALYZE),1)
 override CFLAGS += -fanalyzer
 endif
@@ -349,7 +349,7 @@ $(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
 else
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
-$(C_BUILDDIR)/pokedex_plus_hgss.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias -Woverride-init
+$(C_BUILDDIR)/pokedex_plus_hgss.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias #-Woverride-init
 endif
 
 ifeq ($(DINFO),1)

diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
@@ -302,6 +302,7 @@
 #define EVO_LEVEL_FAMILY_OF_FOUR          46     // Pokémon reaches the specified level with a personality value with a modulus of 1-99
 
 #define EVOS_PER_MON 11
+#define EVOLUTIONS_END 0xFFFF
 
 // Evolution 'modes,' for GetEvolutionTargetSpecies
 #define EVO_MODE_NORMAL            0

diff --git a/include/data.h b/include/data.h
@@ -90,6 +90,7 @@ extern const union AffineAnimCmd *const gAffineAnims_BattleSpritePlayerSide[];
 extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[];
 extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[];
 
+extern const union AnimCmd sAnim_GeneralFrame0[];
 extern const union AnimCmd *const gAnims_MonPic[];
 extern const struct MonCoords gMonFrontPicCoords[];
 extern const struct MonCoords gMonBackPicCoords[];

diff --git a/include/graphics.h b/include/graphics.h
@@ -1098,7 +1098,7 @@ extern const u32 gMonPalette_UrsalunaBloodmoon[];
 extern const u32 gMonBackPic_UrsalunaBloodmoon[];
 extern const u32 gMonShinyPalette_UrsalunaBloodmoon[];
 extern const u8 gMonIcon_UrsalunaBloodmoon[];
-extern const u8 gMonFootprint_UrsalunaBloodmoon[];
+//extern const u8 gMonFootprint_UrsalunaBloodmoon[];
 extern const u32 gMonFrontPic_BasculegionMale[];
 extern const u32 gMonFrontPic_Sneasler[];
 extern const u32 gMonFrontPic_Overqwil[];

diff --git a/include/pokemon.h b/include/pokemon.h
@@ -303,6 +303,13 @@ struct BattlePokemon
     /*0x59*/ u8 metLevel;
 };
 
+struct Evolution
+{
+    u16 method;
+    u16 param;
+    u16 targetSpecies;
+};
+
 struct SpeciesInfo /*0x8C*/
 {
  /* 0x00 */ u8 baseHP;
@@ -333,6 +340,7 @@ struct SpeciesInfo /*0x8C*/
  /* 0x1E */ u8 safariZoneFleeRate;
             // Pokédex data
  /* 0x1F */ u8 categoryName[13];
+ /* 0x1F */ u8 speciesName[POKEMON_NAME_LENGTH + 1];
  /* 0x2C */ u16 cryId;
  /* 0x2E */ u16 natDexNum;
  /* 0x30 */ u16 height; //in decimeters
@@ -390,7 +398,7 @@ struct SpeciesInfo /*0x8C*/
  /* 0x84 */ const u16 *const teachableLearnset;
  /* 0x88 */ const struct Evolution *const evolutions;
  /* 0x84 */ const u16 *const formSpeciesIdTable;
- /* 0x84 */ const u16 *const formChangeTable;
+ /* 0x84 */ const struct FormChange *const formChangeTable;
 };
 
 struct BattleMove
@@ -467,13 +475,6 @@ struct LevelUpMove
     u16 level;
 };
 
-struct Evolution
-{
-    u16 method;
-    u16 param;
-    u16 targetSpecies;
-};
-
 struct FormChange
 {
     u16 method;

diff --git a/src/data.c b/src/data.c
@@ -113,7 +113,7 @@ const struct SpriteFrameImage gTrainerBackPicTable_Steven[] =
     {gTrainerBackPic_Steven + TRAINER_PIC_SIZE * 3, TRAINER_PIC_SIZE},
 };
 
-static const union AnimCmd sAnim_GeneralFrame0[] =
+const union AnimCmd sAnim_GeneralFrame0[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END,
@@ -285,26 +285,11 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] =
     sAnim_MonPic_1,
 };
 
-#define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, MON_PIC_SIZE, SPECIES_##species}
-#define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
-#define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
-
-#include "data/pokemon_graphics/front_pic_coordinates.h"
-#include "data/pokemon_graphics/back_pic_coordinates.h"
-
-#include "data/pokemon_graphics/back_pic_table.h"
-#include "data/pokemon_graphics/palette_table.h"
-#include "data/pokemon_graphics/shiny_palette_table.h"
-
 #include "data/trainer_graphics/front_pic_anims.h"
 #include "data/trainer_graphics/front_pic_tables.h"
 #include "data/trainer_graphics/back_pic_anims.h"
 #include "data/trainer_graphics/back_pic_tables.h"
 
-#include "data/pokemon_graphics/enemy_mon_elevation.h"
-#include "data/pokemon_graphics/front_pic_anims.h"
-#include "data/pokemon_graphics/front_pic_table.h"
-
 #include "data/trainer_parties.h"
 #include "data/text/trainer_class_names.h"
 #include "data/trainers.h"