diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-19 13:39:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 13:39:38 -0500 |
| commit | 969efabaf539508405bc1260354e10be86724a42 (patch) | |
| tree | 75ca641b9c95109b538cc03e3b864c7631f167e6 /include | |
| parent | af6ff9956de7c0689e4c61cec8bf0dc10fd5fdc5 (diff) | |
| parent | 84d9a1e7234fab97835f09c35100eaf6536984d5 (diff) | |
Merge pull request #184 from jiangzhengwenjz/nonmatching
fake match sub_804C728 & sub_804CF14; fix build with NONMATCHING defined
Diffstat (limited to 'include')
| -rw-r--r-- | include/cereader_tool.h | 15 | ||||
| -rw-r--r-- | include/constants/object_events.h | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/cereader_tool.h b/include/cereader_tool.h index 5ae797ac0..6275eaabf 100644 --- a/include/cereader_tool.h +++ b/include/cereader_tool.h @@ -25,11 +25,12 @@ struct TrainerTowerFloor /* 0x3DC */ u32 checksum; }; -struct Unk_203F458_Header +struct EReaderTrainerHillSetSubstruct { - u8 unk0; - u8 unk1; - u32 unk4; + u8 count; + u8 id; + u16 dummy; + u32 checksum; }; struct EReaderTrainerHillSet @@ -41,7 +42,9 @@ struct EReaderTrainerHillSet struct TrainerTowerFloor floors[8]; }; -bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * a0); -bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * a0); +bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata); +bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata); +bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata); +u8 sub_815D654(void); #endif //GUARD_CEREADER_TOOL_H diff --git a/include/constants/object_events.h b/include/constants/object_events.h index c1793827e..60783a793 100644 --- a/include/constants/object_events.h +++ b/include/constants/object_events.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H -#define GUARD_CONSTANTS_MAP_OBJECTS_H +#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H +#define GUARD_CONSTANTS_OBJECT_EVENTS_H #define OBJECT_EVENT_GFX_RED_NORMAL 0 #define OBJECT_EVENT_GFX_RED_BIKE 1 @@ -183,4 +183,4 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 -#endif // GUARD_CONSTANTS_MAP_OBJECTS_H +#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H |