From 9bee601b163ff9fcfebba6021ea162880b6fed92 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 10 May 2018 19:28:52 -0400 Subject: through sub_80DB174 --- include/data2.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index d71958201..2cc13d88e 100644 --- a/include/data2.h +++ b/include/data2.h @@ -1,6 +1,8 @@ #ifndef GUARD_DATA2_H #define GUARD_DATA2_H +#include "constants/species.h" + struct MonCoords { // This would use a bitfield, but some function @@ -17,6 +19,6 @@ extern const u8 gMoveNames[][13]; extern struct CompressedSpriteSheet gUnknown_0831C620; extern struct CompressedSpritePalette gUnknown_0831C628; extern const struct SpriteTemplate gUnknown_0831C688; - +extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES]; #endif // GUARD_DATA2_H -- cgit v1.2.3 From df5009cb3e723d2bceca45a63acccf54dfafb095 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 12 Aug 2018 00:03:19 +0200 Subject: Move move descriptions to C --- include/data2.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index d71958201..5c75d2593 100644 --- a/include/data2.h +++ b/include/data2.h @@ -1,6 +1,8 @@ #ifndef GUARD_DATA2_H #define GUARD_DATA2_H +#define MOVE_NAME_LENGTH 12 + struct MonCoords { // This would use a bitfield, but some function @@ -13,10 +15,9 @@ extern struct MonCoords gTrainerBackPicCoords[]; extern struct MonCoords gTrainerFrontPicCoords[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; -extern const u8 gMoveNames[][13]; +extern const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1]; extern struct CompressedSpriteSheet gUnknown_0831C620; extern struct CompressedSpritePalette gUnknown_0831C628; extern const struct SpriteTemplate gUnknown_0831C688; - #endif // GUARD_DATA2_H -- cgit v1.2.3 From 9bb7a2c7a53e2d4e7ae1dc7c4c3aaf3731638864 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 12 Aug 2018 00:09:53 +0200 Subject: make move desc compile --- include/data2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index 5c75d2593..af830a4c4 100644 --- a/include/data2.h +++ b/include/data2.h @@ -15,7 +15,7 @@ extern struct MonCoords gTrainerBackPicCoords[]; extern struct MonCoords gTrainerFrontPicCoords[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; -extern const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1]; +extern const u8 gMoveNames[][MOVE_NAME_LENGTH + 1]; extern struct CompressedSpriteSheet gUnknown_0831C620; extern struct CompressedSpritePalette gUnknown_0831C628; extern const struct SpriteTemplate gUnknown_0831C688; -- cgit v1.2.3 From e30c2251ce72df8ed66f119370714531c50951ae Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 27 Aug 2018 00:26:54 +0100 Subject: Convert more of data2b --- include/data2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index 176365146..268dc9ac8 100644 --- a/include/data2.h +++ b/include/data2.h @@ -11,8 +11,8 @@ struct MonCoords u8 y_offset; }; -extern struct MonCoords gTrainerBackPicCoords[]; -extern struct MonCoords gTrainerFrontPicCoords[]; +extern const struct MonCoords gTrainerBackPicCoords[]; +extern const struct MonCoords gTrainerFrontPicCoords[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gMoveNames[][MOVE_NAME_LENGTH + 1]; -- cgit v1.2.3