diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-06 17:58:40 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-06 17:58:40 -0400 |
| commit | 416ef99e4217e1f309b7560974fb5dabfa1329a8 (patch) | |
| tree | 45bc305f62badd589603bda51395cab374732ca0 /include | |
| parent | dc79b94bb32c758253aba698115b60cb5a683266 (diff) | |
Pick up decompiling field_effect.s
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_effect.h | 10 | ||||
| -rw-r--r-- | include/field_weather.h | 2 | ||||
| -rw-r--r-- | include/gba/types.h | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index a46c048cb..d4ec0c8b4 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -3,6 +3,15 @@ #include "sprite.h" +extern const struct SpritePalette gTrainerFrontPicPaletteTable[2]; +extern const struct SpritePalette gUnknown_0839F114; +extern const struct SpriteSheet gTrainerFrontPicTable[2]; +extern const struct SpriteTemplate gSpriteTemplate_839F128; +extern const struct OamData gOamData_839F0F4; +extern struct SpriteTemplate gUnknown_02024E8C; + +extern const struct SpritePalette *sub_80409C8(u16, u32, u32); + u32 FieldEffectStart(u8 id); bool8 FieldEffectCmd_loadtiles(u8 **script, u32 *val); bool8 FieldEffectCmd_loadfadedpal(u8 **script, u32 *val); @@ -25,5 +34,6 @@ void FieldEffectActiveListClear(void); void FieldEffectActiveListAdd(u8 id); void FieldEffectActiveListRemove(u8 id); bool8 FieldEffectActiveListContains(u8 id); +void sub_807DE38(u8 index); #endif // GUARD_FIELD_EFFECT_H diff --git a/include/field_weather.h b/include/field_weather.h index af07c970d..df216aea7 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -31,6 +31,8 @@ void sub_807D874(u8); // ... void sub_807DB64(u8, u8); // ... +void sub_807DE68(void); +// ... void PlayRainSoundEffect(void); // ... void SetSav1Weather(u32); diff --git a/include/gba/types.h b/include/gba/types.h index fd8a20a4c..96e057ab7 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -34,7 +34,7 @@ struct PlttData u16 g:5; // green u16 b:5; // blue u16 unused_15:1; -}; +} /*__attribute__((packed))*/; struct OamData { |