dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
PikalaxALT
2020-02-29 21:00:31 -05:00
parent cbd380f2bf
commit c36ef94a0d
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/union_room.h
+1 -1
View File
@@ -163,6 +163,6 @@ extern u16 gUnionRoomOfferedSpecies;
extern u8 gUnionRoomRequestedMonType; extern u8 gUnionRoomRequestedMonType;
void StartUnionRoomBattle(u16 battleFlags); void StartUnionRoomBattle(u16 battleFlags);
u8 UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade(void); u8 UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade(void);
#endif //GUARD_UNION_ROOM_H #endif //GUARD_UNION_ROOM_H
src/cable_club.c
+3 -3
View File
@@ -26,7 +26,7 @@
#include "constants/cable_club.h" #include "constants/cable_club.h"
#include "constants/field_weather.h" #include "constants/field_weather.h"
u32 UnusedVarNeededToMatch; u32 UnusedVarNeededToMatch[8];
static void Task_Linkup0(u8 taskId); static void Task_Linkup0(u8 taskId);
static void Task_Linkup1(u8 taskId); static void Task_Linkup1(u8 taskId);
@@ -403,7 +403,7 @@ static void Task_Linkup_6a(u8 taskId)
{ {
// Dumb trick required to match // Dumb trick required to match
if (gLinkType == LINKTYPE_0x4411) if (gLinkType == LINKTYPE_0x4411)
UnusedVarNeededToMatch += 0; *UnusedVarNeededToMatch += 0;
DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]); DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]);
EnableBothScriptContexts(); EnableBothScriptContexts();
DestroyTask(taskId); DestroyTask(taskId);
@@ -876,7 +876,7 @@ static void Task_StartWirelessCableClubTrade(u8 taskId)
case 3: case 3:
if (IsLinkTaskFinished()) if (IsLinkTaskFinished())
{ {
UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade(); UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade();
DestroyTask(taskId); DestroyTask(taskId);
} }
break; break;
src/union_room.c
+1 -1
View File
@@ -1735,7 +1735,7 @@ static void Task_CallCB2ReturnFromLinkTrade(u8 taskId)
DestroyTask(taskId); DestroyTask(taskId);
} }
u8 UnionRoom_CreateTask_CallBC2ReturnFromLinkTrade(void) u8 UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade(void)
{ {
u8 taskId = CreateTask(Task_CallCB2ReturnFromLinkTrade, 0); u8 taskId = CreateTask(Task_CallCB2ReturnFromLinkTrade, 0);
sym_common.txt
-1
View File
@@ -75,7 +75,6 @@ gUnknown_3005078: @ 3005078
.include "task.o" .include "task.o"
.align 2 .align 2
.include "cable_club.o" .include "cable_club.o"
.space 0x1C
.align 2 .align 2
.include "image_processing_effects.o" .include "image_processing_effects.o"
.align 2 .align 2