diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-14 22:23:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 22:23:11 -0600 |
| commit | fcf3f97da94515a34eda2dc1b564f4bc01adc383 (patch) | |
| tree | 1597ce7332dcd28b247ad1a7f13f8dc00cf48408 /include | |
| parent | e706d89ff1af46df3fcee60e08d80990f2a8a681 (diff) | |
| parent | 2fb78b5ca8e24e895b66170806871d60164df554 (diff) | |
Merge pull request #210 from KDSKardabox/master
[Ready to Merge] fldeff_strength.s, fldeff_sweetscent.s
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_scripts.h | 3 | ||||
| -rw-r--r-- | include/field_effect.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 1 | ||||
| -rw-r--r-- | include/field_screen.h | 2 | ||||
| -rw-r--r-- | include/fldeff_groundshake.h | 7 | ||||
| -rw-r--r-- | include/rom6.h | 2 |
6 files changed, 17 insertions, 0 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h index a54e0e463..a835782ed 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -380,4 +380,7 @@ extern const u8 SecretBase_RedCave1_Text_274E75[]; extern const u8 SecretBase_RedCave1_Text_2751E1[]; extern const u8 SecretBase_RedCave1_Text_2754F6[]; extern const u8 SecretBase_RedCave1_Text_2758CC[]; + +extern const u8 FieryPath_EventScript_2908FD[]; +extern const u8 EventScript_290CAE[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_effect.h b/include/field_effect.h index f59dfab9b..700256f30 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -80,5 +80,7 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf void sub_80B7FC8(void); void FieldEffectActiveListRemove(u8 id); void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8); +extern void (*gUnknown_0203CEEC)(void); +extern bool8 (*gUnknown_03005DB0)(void); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 5b9a632fa..7517fb3b8 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -5,6 +5,7 @@ void ClearPlayerAvatarInfo(void); void SetPlayerAvatarExtraStateTransition(u8, u8); u8 GetPlayerAvatarGenderByGraphicsId(u8); bool8 TestPlayerAvatarFlags(u8); +u8 GetPlayerAvatarObjectId(void); void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); u8 player_get_direction_upper_nybble(void); diff --git a/include/field_screen.h b/include/field_screen.h index cfc0d081f..02e0a0a91 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -10,5 +10,7 @@ void pal_fill_black(void); bool8 sub_80ABDFC(void); void sub_80AF168(void); void UpdateWeatherPerDay(u16 days); +void sub_80AC3D0(void); +void sub_80AC3E4(void); #endif //GUARD_FIELD_SCREEN_H diff --git a/include/fldeff_groundshake.h b/include/fldeff_groundshake.h new file mode 100644 index 000000000..685a6d27c --- /dev/null +++ b/include/fldeff_groundshake.h @@ -0,0 +1,7 @@ +#ifndef GUARD_FLDEFF_GROUNDSHAKE_H +#define GUARD_FLDEFF_GROUNDSHAKE_H + +void sub_81BE6B8(void); +void sub_81BE72C(void); + +#endif // GUARD_FLDEFF_GROUNDSHAKE_H diff --git a/include/rom6.h b/include/rom6.h index f91b34b4a..058504fe2 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -11,6 +11,8 @@ void UpdateBirchState(u16 days); void UpdateFrontierManiac(u16 days); void UpdateFrontierGambler(u16 days); void SetShoalItemFlag(u16 days); + +bool8 npc_before_player_of_type(u8); u8 oei_task_add(void); #endif //GUARD_ROM6_H |