diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-27 10:11:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 10:11:44 -0400 |
| commit | 65fd5f89e17ae08bde8e0b70ac41484f5330c282 (patch) | |
| tree | 8a3b5ff05d71bf1c0b7943c345dc42fd72e59597 /include | |
| parent | 1cada74444df875649b239ed488c6ee4deb8a7f1 (diff) | |
| parent | 2f8d67642649374667f902736d8920cb38a03daa (diff) | |
Merge pull request #5 from pret/master
source repo sync
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/rom_8077ABC.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/ewram.h b/include/ewram.h index baa64f42f..01c4c3492 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -233,6 +233,7 @@ extern u8 gSharedMem[]; #define shared192D0 (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0)) #define eContestAI ((struct ContestAIInfo *)(gSharedMem + 0x192E4)) #define EWRAM_19348 ((u16 *)(gSharedMem + 0x19348)) +#define eWRAM_19348Struct ((struct EWRAM_19348_Struct *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) #define ewram1A000 (&gSharedMem[0x1A000]) diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 3942397eb..26b2a9475 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -115,5 +115,9 @@ u8 sub_807A4A0(int bank, u8 sprite, int species); void sub_80794A8(struct Sprite *sprite); void sub_807A9BC(struct Sprite *sprite); void sub_8078954(struct Struct_sub_8078914*, u8); +u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, u32 a8); +void sub_8079098(struct Sprite *sprite); +void sub_807A0F4(struct Sprite *sprite); +void sub_8078634(u8 task); #endif // GUARD_ROM_8077ABC_H |