diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-08-12 17:26:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 17:26:01 -0700 |
| commit | d9883945954a30e4b753ecbd5d807f4b6cd2a38a (patch) | |
| tree | 093c45ab4de91a75d546f58a6672dfc72136677c /include | |
| parent | e005410884803f1ec8f5942bd0c8d2da5c2e29c8 (diff) | |
More data dumping and some code cleaning (#46)
* more data dumping and some code cleaning
* split out cutscene scripts
* initial start at script conversion
* more script work
* use correct type
* clearer up struct field names
* split known scripts into seperate files
* no need to preproc pure ascii strings in debug
* more cutscene work
* split out personality test scripts
* solidify text macros and doc some dungeon fields
* more scripting work
Diffstat (limited to 'include')
| -rw-r--r-- | include/code_8041D5C.h | 17 | ||||
| -rw-r--r-- | include/constants/colors.h | 12 | ||||
| -rw-r--r-- | include/constants/global.h | 7 | ||||
| -rw-r--r-- | include/global.h | 1 | ||||
| -rw-r--r-- | include/rescue_team_info.h | 2 | ||||
| -rw-r--r-- | include/wonder_mail.h | 4 |
6 files changed, 31 insertions, 12 deletions
diff --git a/include/code_8041D5C.h b/include/code_8041D5C.h index 79a2772..6cf46bf 100644 --- a/include/code_8041D5C.h +++ b/include/code_8041D5C.h @@ -33,14 +33,15 @@ struct subStruct_8048524 struct unkDungeon_8041D5C { u8 fill0[4]; - s16 unk4; - s16 unk6; - u32 unk8; - s32 unkC; - s32 unk10; - u8 fill14[0x20 - 0x14]; - u8 unk20; - u8 unk21[0x70 - 0x21]; + /* 0x4 */ s16 posWorldX; + /* 0x6 */ s16 posWorldY; + /* 0x8 */ s16 prevPosWorldX; + /* 0xA */ s16 prevPosWorldY; + /* 0xC */ s32 unkC; + /* 0x10 */ s32 unk10; + /* 0x14 */ u8 fill14[0x20 - 0x14]; + /* 0x20 */ u8 unk20; + /* 0x21 */ u8 unk21[0x70 - 0x21]; struct subStruct_8048524 *unk70; }; diff --git a/include/constants/colors.h b/include/constants/colors.h new file mode 100644 index 0000000..26d3ca6 --- /dev/null +++ b/include/constants/colors.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CONSTANTS_COLORS_H +#define GUARD_CONSTANTS_COLORS_H + +#define COLOR_WHITE 0 +#define COLOR_BLUE 1 +#define COLOR_RED 2 +#define COLOR_BLACK 3 +#define COLOR_GREEN 4 +#define COLOR_CYAN 5 +#define COLOR_YELLOW 6 + +#endif //GUARD_CONSTANTS_COLORS_H diff --git a/include/constants/global.h b/include/constants/global.h new file mode 100644 index 0000000..f4e5961 --- /dev/null +++ b/include/constants/global.h @@ -0,0 +1,7 @@ +#ifndef GUARD_CONSTANTS_GLOBAL_H +#define GUARD_CONSTANTS_GLOBAL_H + +#define POKEMON_NAME_LENGTH 10 +#define TEAM_NAME_LENGTH 10 + +#endif // GUARD_CONSTANTS_GLOBAL_H diff --git a/include/global.h b/include/global.h index cc56a5e..81388a8 100644 --- a/include/global.h +++ b/include/global.h @@ -5,6 +5,7 @@ #include "config.h" // We need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" +#include "constants/global.h" #include "constants/species.h" // IDE support diff --git a/include/rescue_team_info.h b/include/rescue_team_info.h index ad1b858..563b781 100644 --- a/include/rescue_team_info.h +++ b/include/rescue_team_info.h @@ -1,8 +1,6 @@ #ifndef GUARD_RESCUE_TEAM_INFO_H #define GUARD_RESCUE_TEAM_INFO_H -#define TEAM_NAME_LENGTH 10 - enum TeamRanks { NORMAL_RANK, diff --git a/include/wonder_mail.h b/include/wonder_mail.h index df622d3..7c36833 100644 --- a/include/wonder_mail.h +++ b/include/wonder_mail.h @@ -16,8 +16,8 @@ struct WonderMail /* 0x4 */ u8 dungeon; // dungeon /* 0x5 */ u8 floor; // floor /* 0x8 */ u32 unk8; - /* 0xC */ s16 clientPoke; // client pokemon - /* 0xE */ s16 targetPoke; // target + /* 0xC */ s16 clientSpecies; // client pokemon + /* 0xE */ s16 targetSpecies; // target /* 0x10 */ u8 targetItem; // item to find/deliver /* 0x11 */ u8 rewardType; // reward type /* 0x12 */ u8 itemReward; // item reward |