diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
| commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
| tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /include/party_menu.h | |
| parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
| parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'include/party_menu.h')
| -rw-r--r-- | include/party_menu.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index f13c2c2df..3998054da 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -101,12 +101,6 @@ struct UnknownPokemonStruct2 /*0x1D*/ u8 language; }; -extern u8 ewram[]; -#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000)) -#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) -#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) -#define EWRAM_1B000 ewram1B000_alt - void CB2_PartyMenuMain(void); void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed); void SetPartyMenuSettings(u8 menuType, u8 battleTypeFlags, TaskFunc menuHandlerFunc, u8 textId); @@ -222,5 +216,6 @@ void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func); void sub_806D668(u8 monIndex); void TaughtMove(u8 taskId); void StopTryingToTeachMove_806F588(u8 taskId); +bool8 IsHMMove(u16 move); #endif // GUARD_PARTY_MENU_H |