diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_controllers.h | 4 | ||||
| -rw-r--r-- | include/battle_setup.h | 4 | ||||
| -rw-r--r-- | include/field_map_obj.h | 2 | ||||
| -rw-r--r-- | include/map_obj_80688E4.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 6da4ca240..03755c9b3 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -260,10 +260,10 @@ void SetControllerToPlayerPartner(void); void SetControllerToSafari(void); // pokedude controller -void SetControllerToPokedude(void); +void SetControllerToPokeDude(void); // oak controller -void SetControllerToOakOrOldman(void); +void SetControllerToOakOrOldMan(void); bool8 sub_80EB2E0(u8); void sub_80EB2F4(u8); void sub_80E8570(void); diff --git a/include/battle_setup.h b/include/battle_setup.h index dc989d381..fefaf9e1b 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -16,9 +16,9 @@ void ClearTrainerFlag(u16); void BattleSetup_StartTrainerBattle(void); u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetTrainerPostBattleScript(void); -void sub_80803FC(void); +void SetBattledTrainerFlag(void); u8 sub_8080060(void); -u8 sub_80803CC(void); +u8 GetTrainerBattleMode(void); u16 sub_80803D8(void); #endif // GUARD_BATTLE_SETUP_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index baed87ac6..f14140189 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -85,7 +85,7 @@ void sub_8063E28(struct MapObject *, struct Sprite *); void FieldObjectSetHeldMovement(struct MapObject *, u8); void npc_coords_shift_still(struct MapObject *); void sub_805FE7C(struct MapObject *, u8); -void npc_set_running_behaviour_etc(struct MapObject *, u8); +void SetTrainerMovementType(struct MapObject *, u8); u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1); diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h index bfac00378..bfd5dd3c7 100644 --- a/include/map_obj_80688E4.h +++ b/include/map_obj_80688E4.h @@ -3,7 +3,7 @@ #include "global.h" -void player_bitmagic(void); +void FreezeEventObjects(void); void FreezeMapObject(struct MapObject *); void FreezeMapObjectsExceptOne(u8 mapObjectId); |