diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/overworld.h | 2 | ||||
| -rw-r--r-- | include/record_mixing.h | 2 | 
3 files changed, 3 insertions, 3 deletions
| diff --git a/include/global.h b/include/global.h index 6843b4216..1b0b0afa3 100644 --- a/include/global.h +++ b/include/global.h @@ -910,7 +910,7 @@ struct MapPosition  struct TradeRoomPlayer  {      u8 playerId; -    u8 isSelf; +    u8 isLocalPlayer;      u8 c;      u8 facing;      struct MapPosition pos; diff --git a/include/overworld.h b/include/overworld.h index 9434d5c28..ea361e25b 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -48,7 +48,7 @@ extern u16 *gBGTilemapBuffers3;  extern u16 gHeldKeyCodeToSend;  extern void (*gFieldCallback)(void);  extern bool8 (*gFieldCallback2)(void); -extern u8 gLinkSelfPlayerId; +extern u8 LocalLinkPlayerId;  extern u8 gFieldLinkPlayerCount;  // Exported ROM declarations diff --git a/include/record_mixing.h b/include/record_mixing.h index d02b77f9c..4cd231e8a 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -7,7 +7,7 @@ struct PlayerHallRecords      struct RankingHall2P twoPlayers[2];  }; -void EventScript_RecordMixingPlayerSpotTriggered(void); +void RecordMixingPlayerSpotTriggered(void);  void GetPlayerHallRecords(struct PlayerHallRecords *dst);  #endif //GUARD_RECORD_MIXING_H | 
