diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-01 19:21:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-01 19:21:30 -0600 |
| commit | e3585d7d6641b9f8338a8ac34e0b898e6fb5a982 (patch) | |
| tree | 7f14e40af854aa9efbbc83490690de2f2599592d /include | |
| parent | 4f726232b8b3f295f9df6a747c0206e0e4983365 (diff) | |
Review fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_effect.h | 2 | ||||
| -rw-r--r-- | include/fldeff_teleport.h | 7 | ||||
| -rw-r--r-- | include/overworld.h | 3 | ||||
| -rw-r--r-- | include/party_menu.h | 2 | ||||
| -rw-r--r-- | include/rom6.h | 1 |
5 files changed, 15 insertions, 0 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index 772b20d37..fb0f20f6f 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -75,5 +75,7 @@ u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); void sub_80B69DC(void); void FieldEffectStop(struct Sprite *sprite, u8 id); +void sub_80B7FC8(void); +void FieldEffectActiveListRemove(u8 id); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/fldeff_teleport.h b/include/fldeff_teleport.h new file mode 100644 index 000000000..71fb64ad2 --- /dev/null +++ b/include/fldeff_teleport.h @@ -0,0 +1,7 @@ +#ifndef GUARD_FLDEFF_TELEPORT_H +#define GUARD_FLDEFF_TELEPORT_H + +void hm_teleport_run_dp02scr(void); +void sub_817C94C(void); + +#endif // GUARD_FLDEFF_TELEPORT_H diff --git a/include/overworld.h b/include/overworld.h index a5fba0c10..d6f90b666 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -42,6 +42,9 @@ void sub_8084EBC(s16, s16); void player_avatar_init_params_reset(void); +bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); +void Overworld_ResetStateAfterTeleport(void); + void Overworld_SetFlashLevel(s32 a1); //u8 Overworld_GetFlashLevel(void); void sub_8085524(u16); diff --git a/include/party_menu.h b/include/party_menu.h index 3756ef569..1d1661cee 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -16,5 +16,7 @@ void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); u8 *GetMonNickname(struct Pokemon *mon, u8 *dst); +u8 GetCursorSelectionMonId(void); +bool8 FieldCallback_Teleport(void); #endif // GUARD_PARTY_MENU_H diff --git a/include/rom6.h b/include/rom6.h index fc33b7d1f..f91b34b4a 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -11,5 +11,6 @@ void UpdateBirchState(u16 days); void UpdateFrontierManiac(u16 days); void UpdateFrontierGambler(u16 days); void SetShoalItemFlag(u16 days); +u8 oei_task_add(void); #endif //GUARD_ROM6_H |