From 9d33d5600a88f05d7906dee166df3dd03601c1a0 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 14 Oct 2019 18:37:06 -0700 Subject: Move data to C. --- src/data.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 262 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 16bee8db7..17bdaa22b 100644 --- a/src/data.c +++ b/src/data.c @@ -9,4 +9,266 @@ #include "constants/trainers.h" #include "constants/battle_ai.h" +const struct SpriteFrameImage gUnknown_8234698[] = +{ + gHeap + 0x8000, 0x800, + gHeap + 0x8800, 0x800, + gHeap + 0x9000, 0x800, + gHeap + 0x9800, 0x800, +}; + +const struct SpriteFrameImage gUnknown_82346B8[] = +{ + gHeap + 0xA000, 0x800, + gHeap + 0xA800, 0x800, + gHeap + 0xB000, 0x800, + gHeap + 0xB800, 0x800, +}; + +const struct SpriteFrameImage gUnknown_82346D8[] = +{ + gHeap + 0xC000, 0x800, + gHeap + 0xC800, 0x800, + gHeap + 0xD000, 0x800, + gHeap + 0xD800, 0x800, +}; + +const struct SpriteFrameImage gUnknown_82346F8[] = +{ + gHeap + 0xE000, 0x800, + gHeap + 0xE800, 0x800, + gHeap + 0xF000, 0x800, + gHeap + 0xF800, 0x800, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_Red[] = +{ + gTrainerBackPic_Red, 0x0800, + gTrainerBackPic_Red + 0x0800, 0x0800, + gTrainerBackPic_Red + 0x1000, 0x0800, + gTrainerBackPic_Red + 0x1800, 0x0800, + gTrainerBackPic_Red + 0x2000, 0x0800, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] = +{ + gTrainerBackPic_Leaf, 0x0800, + gTrainerBackPic_Leaf + 0x0800, 0x0800, + gTrainerBackPic_Leaf + 0x1000, 0x0800, + gTrainerBackPic_Leaf + 0x1800, 0x0800, + gTrainerBackPic_Leaf + 0x2000, 0x0800, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[] = +{ + gTrainerBackPic_PokeDude, 0x0800, + gTrainerBackPic_PokeDude + 0x0800, 0x0800, + gTrainerBackPic_PokeDude + 0x1000, 0x0800, + gTrainerBackPic_PokeDude + 0x1800, 0x0800, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_OldMan[] = +{ + gTrainerBackPic_OldMan, 0x0800, + gTrainerBackPic_OldMan + 0x0800, 0x0800, + gTrainerBackPic_OldMan + 0x1000, 0x0800, + gTrainerBackPic_OldMan + 0x1800, 0x0800, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] = +{ + gTrainerBackPic_RubySapphireBrendan, 0x0800, + gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800, + gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800, + gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800, +}; + +const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] = +{ + gTrainerBackPic_RubySapphireMay, 0x0800, + gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800, + gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800, + gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800, +}; + +static const union AnimCmd sAnim_GeneralFrame0[] = +{ + ANIMCMD_FRAME(0, 0), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_GeneralFrame3[] = +{ + ANIMCMD_FRAME(3, 0), + ANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_82347F8[] = +{ + AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0x00), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234808[] = +{ + AFFINEANIMCMD_FRAME(0xff00, 0x0100, 0x00, 0x00), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234818[] = +{ + AFFINEANIMCMD_FRAME(0x0028, 0x0028, 0x00, 0x00), + AFFINEANIMCMD_FRAME(0x0012, 0x0012, 0x00, 0x0c), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234830[] = +{ + AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x12), + AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x0f), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234848[] = +{ + AFFINEANIMCMD_FRAME(0x00a0, 0x0100, 0x00, 0x00), + AFFINEANIMCMD_FRAME(0x0004, 0x0000, 0x00, 0x08), + AFFINEANIMCMD_FRAME(0xfffc, 0x0000, 0x00, 0x08), + AFFINEANIMCMD_JUMP(1), +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234868[] = +{ + AFFINEANIMCMD_FRAME(0x0002, 0x0002, 0x00, 0x14), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234878[] = +{ + AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x14), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234888[] = +{ + AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0000), + AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x09), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_82348A0[] = +{ + AFFINEANIMCMD_FRAME(0x0004, 0x0004, 0x00, 0x3f), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_82348B0[] = +{ + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05), + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[] = +{ + gSpriteAffineAnim_82347F8, + gSpriteAffineAnim_8234818, + gSpriteAffineAnim_8234830, + gSpriteAffineAnim_8234848, + gSpriteAffineAnim_8234868, + gSpriteAffineAnim_8234878, + gSpriteAffineAnim_82348A0, + gSpriteAffineAnim_82348B0, + gSpriteAffineAnim_8234888, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_82348EC[] = +{ + AFFINEANIMCMD_FRAME(0xfffc, 0xfffc, 0x04, 0x3f), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_82348FC[] = +{ + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05), + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234914[] = +{ + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfb, 0x14), + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x00, 0x14), + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x05, 0x14), + AFFINEANIMCMD_END, +}; + +static const union AffineAnimCmd gSpriteAffineAnim_8234934[] = +{ + AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x09, 0x6e), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[] = +{ + gSpriteAffineAnim_82347F8, + gSpriteAffineAnim_8234818, + gSpriteAffineAnim_8234830, + gSpriteAffineAnim_8234848, + gSpriteAffineAnim_8234868, + gSpriteAffineAnim_8234878, + gSpriteAffineAnim_82348EC, + gSpriteAffineAnim_82348FC, + gSpriteAffineAnim_8234914, + gSpriteAffineAnim_8234888, + gSpriteAffineAnim_8234934, +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_82349470[] = +{ + gSpriteAffineAnim_8234808, + gSpriteAffineAnim_8234818, + gSpriteAffineAnim_8234830, + gSpriteAffineAnim_8234848, + gSpriteAffineAnim_8234868, + gSpriteAffineAnim_8234878, + gSpriteAffineAnim_82348EC, + gSpriteAffineAnim_82348FC, + gSpriteAffineAnim_8234914, + gSpriteAffineAnim_8234888, + gSpriteAffineAnim_8234934, +}; + +static const union AnimCmd gSpriteAnim_823499C[] = +{ + ANIMCMD_FRAME(0, 0), + ANIMCMD_END, +}; + +static const union AnimCmd gSpriteAnim_82349A4[] = +{ + ANIMCMD_FRAME(1, 0), + ANIMCMD_END, +}; + +static const union AnimCmd gSpriteAnim_82349AC[] = +{ + ANIMCMD_FRAME(2, 0), + ANIMCMD_END, +}; + +static const union AnimCmd gSpriteAnim_82349B4[] = +{ + ANIMCMD_FRAME(3, 0), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_82349BC[] = +{ + gSpriteAnim_823499C, + gSpriteAnim_82349A4, + gSpriteAnim_82349AC, + gSpriteAnim_82349B4, +}; + #include "data/pokemon_graphics/front_pic_coordinates.h" -- cgit v1.2.3 From e3e61c6210be3eb96256cef276aa1bc6f02939d9 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 14 Oct 2019 21:36:42 -0700 Subject: Port/dump front_pic_table. --- src/data.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 17bdaa22b..c4c079f87 100644 --- a/src/data.c +++ b/src/data.c @@ -271,4 +271,7 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = gSpriteAnim_82349B4, }; +#define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, 0x800, SPECIES_##species} + #include "data/pokemon_graphics/front_pic_coordinates.h" +#include "data/pokemon_graphics/front_pic_table.h" -- cgit v1.2.3 From 5e1f71231a256877a67f4c04ae3e69d339ac847b Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 14 Oct 2019 22:04:57 -0700 Subject: Port/dump back_pic_coordinates. --- src/data.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index c4c079f87..63ae7333d 100644 --- a/src/data.c +++ b/src/data.c @@ -275,3 +275,4 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #include "data/pokemon_graphics/front_pic_coordinates.h" #include "data/pokemon_graphics/front_pic_table.h" +#include "data/pokemon_graphics/back_pic_coordinates.h" -- cgit v1.2.3 From a91de64dcfed6f201ab3e66d95b54e932bc14946 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 14 Oct 2019 22:11:03 -0700 Subject: Port/dump back_pic_table. --- src/data.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 63ae7333d..ebb6cf5ea 100644 --- a/src/data.c +++ b/src/data.c @@ -276,3 +276,4 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #include "data/pokemon_graphics/front_pic_coordinates.h" #include "data/pokemon_graphics/front_pic_table.h" #include "data/pokemon_graphics/back_pic_coordinates.h" +#include "data/pokemon_graphics/back_pic_table.h" -- cgit v1.2.3 From 1937cc7b0d10b49cce27b60ff9af4b46d34ffede Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Mon, 14 Oct 2019 22:47:01 -0700 Subject: Port/dump palette tables. --- src/data.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index ebb6cf5ea..0f3c7ea67 100644 --- a/src/data.c +++ b/src/data.c @@ -272,8 +272,12 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = }; #define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, 0x800, 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/front_pic_table.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" -- cgit v1.2.3 From c93c8aedbc118f8258d05d10e0aead55191e93b4 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 15 Oct 2019 20:37:48 -0700 Subject: Dump trainer front_pic_anims --- src/data.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 0f3c7ea67..d75f05b68 100644 --- a/src/data.c +++ b/src/data.c @@ -281,3 +281,5 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #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" -- cgit v1.2.3 From cb192791eb4def67ab50480a7ace9a89737ad324 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 15 Oct 2019 22:49:41 -0700 Subject: Dump gTrainerFrontPicCoords --- src/data.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index d75f05b68..861bd57ec 100644 --- a/src/data.c +++ b/src/data.c @@ -283,3 +283,4 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #include "data/pokemon_graphics/shiny_palette_table.h" #include "data/trainer_graphics/front_pic_anims.h" +#include "data/trainer_graphics/front_pic_tables.h" -- cgit v1.2.3 From 5f6672ee078d878fd089ed0d5925d46ee21511db Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 16 Oct 2019 22:52:41 -0700 Subject: Rename trainer front pics and palettes. --- src/data.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 861bd57ec..cc715bd15 100644 --- a/src/data.c +++ b/src/data.c @@ -75,20 +75,20 @@ const struct SpriteFrameImage gTrainerBackPicTable_OldMan[] = gTrainerBackPic_OldMan + 0x1800, 0x0800, }; -const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] = +const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[] = { - gTrainerBackPic_RubySapphireBrendan, 0x0800, - gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800, - gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800, - gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800, + gTrainerBackPic_RSBrendan, 0x0800, + gTrainerBackPic_RSBrendan + 0x0800, 0x0800, + gTrainerBackPic_RSBrendan + 0x1000, 0x0800, + gTrainerBackPic_RSBrendan + 0x1800, 0x0800, }; -const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] = +const struct SpriteFrameImage gTrainerBackPicTable_RSMay[] = { - gTrainerBackPic_RubySapphireMay, 0x0800, - gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800, - gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800, - gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800, + gTrainerBackPic_RSMay, 0x0800, + gTrainerBackPic_RSMay + 0x0800, 0x0800, + gTrainerBackPic_RSMay + 0x1000, 0x0800, + gTrainerBackPic_RSMay + 0x1800, 0x0800, }; static const union AnimCmd sAnim_GeneralFrame0[] = -- cgit v1.2.3 From 790966aec02d9e8540a1adcf39b7b6c0be55c0d5 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Thu, 17 Oct 2019 00:23:41 -0700 Subject: Dump gTrainerFrontPicTable and gTrainerFrontPicPaletteTable. --- src/data.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index cc715bd15..42c9cfaab 100644 --- a/src/data.c +++ b/src/data.c @@ -275,6 +275,9 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species} #define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG} +#define TRAINER_SPRITE(trainerPic, sprite, size) [TRAINER_PIC_##trainerPic] = {sprite, size, TRAINER_PIC_##trainerPic} +#define TRAINER_PAL(trainerPic, pal) [TRAINER_PIC_##trainerPic] = {pal, TRAINER_PIC_##trainerPic} + #include "data/pokemon_graphics/front_pic_coordinates.h" #include "data/pokemon_graphics/front_pic_table.h" #include "data/pokemon_graphics/back_pic_coordinates.h" -- cgit v1.2.3 From 8249a58a2cedc0b3ec9f5033a4745c13e49a86ae Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 21:24:16 -0400 Subject: Split trainers and port species and move names --- src/data.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 42c9cfaab..dddeeac51 100644 --- a/src/data.c +++ b/src/data.c @@ -8,6 +8,7 @@ #include "constants/species.h" #include "constants/trainers.h" #include "constants/battle_ai.h" +#include "constants/trainer_classes.h" const struct SpriteFrameImage gUnknown_8234698[] = { @@ -287,3 +288,13 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #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/trainer_parties.h" +#include "data/text/trainer_class_names.h" +#include "data/trainers.h" +#include "data/text/species_names.h" +#include "data/text/move_names.h" -- cgit v1.2.3