diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-01 01:18:58 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-01 01:18:58 -0500 |
| commit | 459fd93b59795c0c9c888584d38e82577e07c056 (patch) | |
| tree | 63fca6b6a011cc4bb039b5f1a10b3791f4ae465b | |
| parent | b8a60b055b9261210874fef3cac7696d6a97f45f (diff) | |
Fix minor errors
| -rw-r--r-- | data/maps/TradeCenter/map.json | 1 | ||||
| -rw-r--r-- | include/link.h | 2 | ||||
| -rw-r--r-- | src/cable_club.c | 2 | ||||
| -rw-r--r-- | src/link.c | 2 | ||||
| -rw-r--r-- | src/record_mixing.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 3e47ca41b..1c409132d 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -55,7 +55,6 @@ "script": "EventScript_TradeCenter_Chair0" }, { - "comment": "This is trade seat #2.", "type": "trigger", "x": 7, "y": 5, diff --git a/include/link.h b/include/link.h index 182ee68f4..83deab88f 100644 --- a/include/link.h +++ b/include/link.h @@ -299,7 +299,7 @@ extern struct LinkPlayer gLocalLinkPlayer; bool32 Link_AnyPartnersPlayingRubyOrSapphire(void); bool32 sub_800A03C(void); -void SetgLocalLinkPlayerId(u8); +void SetLocalLinkPlayerId(u8); u8 GetSavedPlayerCount(void); void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); diff --git a/src/cable_club.c b/src/cable_club.c index f504ad8a8..d83508504 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -1028,7 +1028,7 @@ static void sub_80B3728(u8 taskId) if (IsFieldMessageBoxHidden()) { sub_8087288(); - SetgLocalLinkPlayerId(gSpecialVar_0x8005); + SetLocalLinkPlayerId(gSpecialVar_0x8005); task->data[0] = 2; } break; diff --git a/src/link.c b/src/link.c index cf06e4958..72ac3e878 100644 --- a/src/link.c +++ b/src/link.c @@ -302,7 +302,7 @@ void LinkTestScreen(void) SetMainCallback2(CB2_LinkTest); } -void SetgLocalLinkPlayerId(u8 playerId) +void SetLocalLinkPlayerId(u8 playerId) { gLocalLinkPlayer.id = playerId; } diff --git a/src/record_mixing.c b/src/record_mixing.c index e58fdcc4e..aafd7284b 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -324,7 +324,7 @@ static void Task_RecordMixing_Main(u8 taskId) case 0: // init sSentRecord = malloc(sizeof(union PlayerRecords)); sReceivedRecords = malloc(sizeof(union PlayerRecords) * 4); - SetgLocalLinkPlayerId(gSpecialVar_0x8005); + SetLocalLinkPlayerId(gSpecialVar_0x8005); VarSet(VAR_TEMP_0, 1); gUnknown_03001130 = FALSE; PrepareExchangePacket(); |