diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-06 13:42:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-06 13:42:42 -0400 |
| commit | 7980c4aa071685983f84861cc7dc69d6daf30a90 (patch) | |
| tree | 053e5e30a3454732f2be06d2119bc815f3993d50 /include | |
| parent | 74d771ef90a3189bd2da1b35f6b42a1fa8f51e67 (diff) | |
| parent | 95537e5c231f5714b9a2a045fca5582779df372c (diff) | |
Merge pull request #78 from pret/intro
Intro
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 2 | ||||
| -rw-r--r-- | include/constants/global.h | 4 | ||||
| -rw-r--r-- | include/libgcnmultiboot.h | 17 | ||||
| -rw-r--r-- | include/link.h | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/include/config.h b/include/config.h index f094c95bd..491eadf13 100644 --- a/include/config.h +++ b/include/config.h @@ -15,8 +15,6 @@ // since not all baseroms and pointers have been dumped yet and will result in // a broken ROM. -#define ENGLISH - #ifdef ENGLISH #define UNITS_IMPERIAL #else diff --git a/include/constants/global.h b/include/constants/global.h index b1c8fed3e..3cac8d473 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -23,10 +23,12 @@ enum LanguageId { LANGUAGE_ITALIAN = 4, LANGUAGE_GERMAN = 5, // 6 goes unused but the theory is it was meant to be Korean - LANGUAGE_SPANISH = 7, + LANGUAGE_SPANISH = 7, }; +#ifdef ENGLISH #define GAME_LANGUAGE (LANGUAGE_ENGLISH) +#endif #define PC_ITEMS_COUNT 30 #define BAG_ITEMS_COUNT 42 diff --git a/include/libgcnmultiboot.h b/include/libgcnmultiboot.h new file mode 100644 index 000000000..7d347df05 --- /dev/null +++ b/include/libgcnmultiboot.h @@ -0,0 +1,17 @@ +#ifndef GUARD_LIBGCMMULTIBOOT_H +#define GUARD_LIBGCNMULTIBOOT_H + +struct GcmbStruct +{ + u16 gcmb_field_0; + vu8 gcmb_field_2; + u8 filler3[0x2C - 0x3]; +}; + +void GameCubeMultiBoot_Main(struct GcmbStruct *pStruct); +void GameCubeMultiBoot_ExecuteProgram(struct GcmbStruct *pStruct); +void GameCubeMultiBoot_Init(struct GcmbStruct *pStruct); +void GameCubeMultiBoot_HandleSerialInterrupt(struct GcmbStruct *pStruct); +void GameCubeMultiBoot_Quit(void); + +#endif // GUARD_LIBGCNMULTIBOOT_H diff --git a/include/link.h b/include/link.h index 0ec32d8a0..e1a4e106b 100644 --- a/include/link.h +++ b/include/link.h @@ -207,5 +207,7 @@ void sub_80098D8(void); void CloseLink(void); bool8 sub_800A4BC(void); bool32 sub_800B270(void); +void sub_800B388(void); +void sub_8054A28(void); #endif // GUARD_LINK_H |