Merge branch 'master' of https://github.com/pret/pokefirered into sync-rfu2

2022-11-07 10:41:03 -05:00
parent 8a793e73a5 6a613b67b9
commit 87ce3fd349
1459 changed files with 41323 additions and 34992 deletions
@@ -303,6 +303,6 @@ void sub_80FB030(u32 a0);
 void ClearRecvCommands(void);

 #include "mevent_server.h"
-extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
+extern const struct mevent_server_cmd gServerScript_ClientCanceledCard[];

 #endif //GUARD_LINK_RFU_H