diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-03 08:51:52 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-03 08:51:52 -0400 |
| commit | 7d446a9ef7737874f772f7537de97a8b8be2d7d4 (patch) | |
| tree | 8e4f018d58358606e4b6691f591c856c961dc771 /include | |
| parent | f9230e80aa1fd32d0428af9b684dcf4395148fc3 (diff) | |
through sub_80D8490
Diffstat (limited to 'include')
| -rw-r--r-- | include/contest_effect.h | 14 | ||||
| -rw-r--r-- | include/event_scripts.h | 4 | ||||
| -rw-r--r-- | include/strings.h | 2 |
3 files changed, 20 insertions, 0 deletions
diff --git a/include/contest_effect.h b/include/contest_effect.h new file mode 100644 index 000000000..4d680be9e --- /dev/null +++ b/include/contest_effect.h @@ -0,0 +1,14 @@ +#ifndef GUARD_CONTEST_EFFECT_H +#define GUARD_CONTEST_EFFECT_H + +struct ContestMove +{ + u8 effect; + u8 contestCategory:3; + u8 comboStarterId; + u8 comboMoves[4]; +}; + +extern const struct ContestMove gContestMoves[]; + +#endif //GUARD_CONTEST_EFFECT_H diff --git a/include/event_scripts.h b/include/event_scripts.h index eb523a487..b26d1c164 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -394,4 +394,8 @@ extern const u8 Route111_EventScript_2907F0[]; extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_1F863F[]; extern const u8 LittlerootTown_MaysHouse_2F_EventScript_1F958F[]; +//contest_strings +extern const u8 gText_0827D507[]; +extern const u8 gText_0827D531[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/strings.h b/include/strings.h index 7c81dbcfb..7a96dc036 100644 --- a/include/strings.h +++ b/include/strings.h @@ -429,5 +429,7 @@ extern const u8 gText_TooImportantToToss[]; extern const u8 gText_ConfirmTossItems[]; extern const u8 gText_MoveVar1Where[]; +extern const u8 gText_ColorLightShadowDarkGrey[]; +extern const u8 gText_ColorBlue[]; #endif //GUARD_STRINGS_H |