diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-21 02:18:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 02:18:03 -0600 |
| commit | e1ada979db4e6aa2d61a5664e2eeaa0e3c89809b (patch) | |
| tree | 0e428080cc34043bbbd0aa56f3ea030d60c5e6df /include | |
| parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) | |
| parent | 314b71847170f7853b2d6d863bfdecafa7a0558d (diff) | |
Merge pull request #465 from golemgalvanize/decompile_ice
Decompile ice
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 4 | ||||
| -rw-r--r-- | include/field_weather.h | 4 | ||||
| -rw-r--r-- | include/graphics.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 1c2093da9..a8138b4ff 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -172,6 +172,10 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite); u8 GetBattlerSpriteDefault_Y(u8 battlerId); u8 GetSubstituteSpriteDefault_Y(u8 battlerId); +// battle_anim_80A64EC.c +void sub_80A64EC(struct Sprite *sprite); +void sub_80A718C(struct Sprite *sprite); + // battle_anim_80A9C70.s #define STAT_ANIM_PLUS1 15 #define STAT_ANIM_PLUS2 39 diff --git a/include/field_weather.h b/include/field_weather.h index c032183e1..91dcef1dc 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -134,6 +134,10 @@ struct Weather // field_weather.c extern struct Weather gWeather; extern struct Weather *const gWeatherPtr; +extern const u16 gUnknown_083970E8[]; + +// field_weather_effect.c +extern const u8 gWeatherFog1Tiles[]; void StartWeather(void); void ChangeWeather(u8 weather); diff --git a/include/graphics.h b/include/graphics.h index d7bdf096e..cab639f0e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4748,6 +4748,8 @@ extern const u32 gBattleAnimBackgroundImage_Surf[]; extern const u32 gBattleAnimBackgroundPalette_Surf[]; extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[]; +extern const u32 gBattleAnimFogTilemap[]; + // Berry blender extern const u32 gBerryBlenderArrowTiles[]; extern const u32 gBerryBlenderStartTiles[]; |