ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor errors

Browse Source
This commit is contained in:
Phlosioneer 2019-03-01 01:18:58 -05:00
parent b8a60b055b
commit 459fd93b59
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/maps/TradeCenter/map.json
View File

@ -55,7 +55,6 @@
"script": "EventScript_TradeCenter_Chair0" "script": "EventScript_TradeCenter_Chair0"
}, },
{ {
"comment": "This is trade seat #2.",
"type": "trigger", "type": "trigger",
"x": 7, "x": 7,
"y": 5, "y": 5,

2
include/link.h
View File

@ -299,7 +299,7 @@ extern struct LinkPlayer gLocalLinkPlayer;
bool32 Link_AnyPartnersPlayingRubyOrSapphire(void); bool32 Link_AnyPartnersPlayingRubyOrSapphire(void);
bool32 sub_800A03C(void); bool32 sub_800A03C(void);
void SetgLocalLinkPlayerId(u8); void SetLocalLinkPlayerId(u8);
u8 GetSavedPlayerCount(void); u8 GetSavedPlayerCount(void);
void sub_8009FAC(void); void sub_8009FAC(void);
bool8 sub_800A4D8(u8 a0); bool8 sub_800A4D8(u8 a0);

2
src/cable_club.c
View File

@ -1028,7 +1028,7 @@ static void sub_80B3728(u8 taskId)
if (IsFieldMessageBoxHidden()) if (IsFieldMessageBoxHidden())
{ {
sub_8087288(); sub_8087288();
SetgLocalLinkPlayerId(gSpecialVar_0x8005); SetLocalLinkPlayerId(gSpecialVar_0x8005);
task->data[0] = 2; task->data[0] = 2;
} }
break; break;

2
src/link.c
View File

@ -302,7 +302,7 @@ void LinkTestScreen(void)
SetMainCallback2(CB2_LinkTest); SetMainCallback2(CB2_LinkTest);
} }
void SetgLocalLinkPlayerId(u8 playerId) void SetLocalLinkPlayerId(u8 playerId)
{ {
gLocalLinkPlayer.id = playerId; gLocalLinkPlayer.id = playerId;
} }

2
src/record_mixing.c
View File

@ -324,7 +324,7 @@ static void Task_RecordMixing_Main(u8 taskId)
case 0: // init case 0: // init
sSentRecord = malloc(sizeof(union PlayerRecords)); sSentRecord = malloc(sizeof(union PlayerRecords));
sReceivedRecords = malloc(sizeof(union PlayerRecords) * 4); sReceivedRecords = malloc(sizeof(union PlayerRecords) * 4);
SetgLocalLinkPlayerId(gSpecialVar_0x8005); SetLocalLinkPlayerId(gSpecialVar_0x8005);
VarSet(VAR_TEMP_0, 1); VarSet(VAR_TEMP_0, 1);
gUnknown_03001130 = FALSE; gUnknown_03001130 = FALSE;
PrepareExchangePacket(); PrepareExchangePacket();