From 68129b4f940e0c67352ec100b496b283a2473715 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:11:45 -0600 Subject: [PATCH] update core --- mupen64plus-core/data/mupen64plus.ini | 40 +++++++++++++++++++ .../Mupen64Plus-v2.0-Netplay-API.mediawiki | 6 +-- mupen64plus-core/src/main/main.c | 3 +- mupen64plus-core/src/main/netplay.c | 6 +-- mupen64plus-core/src/main/netplay.h | 4 +- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/mupen64plus-core/data/mupen64plus.ini b/mupen64plus-core/data/mupen64plus.ini index 3f74ca3..e8c2dd4 100644 --- a/mupen64plus-core/data/mupen64plus.ini +++ b/mupen64plus-core/data/mupen64plus.ini @@ -1269,6 +1269,11 @@ Players=1 SaveType=Eeprom 4KB Rumble=Yes +[D0410D2C399CBF216BB756F35E5AC4EC] +GoodName=Banjo-Kazooie (E) [T+Spa1.1_PacoChan] +CRC=8B2FCAD3 361B412C +RefMD5=06A43BACF5C0687F596DF9B018CA6D7F + [5FC8116DAFDEC73DE9C5CCC2D8E14B4F] GoodName=Banjo-Kazooie (E) (M3) [f1] CRC=192C1422 5B8CFF48 @@ -1780,6 +1785,11 @@ Players=1 SaveType=Eeprom 4KB Rumble=Yes +[8D21DFCDE6534127CBB444B7361B0D99] +GoodName=Body Harvest (U) [T+Spa0.98_jackic] +CRC=810CED2D D7B3F710 +RefMD5=3B8585ED03E8DDB89D7DE456317545E7 + [77554810629D4EF4D93519745FA6066B] GoodName=Body Harvest (U) [b1] CRC=5326696F FE9A99C3 @@ -4275,6 +4285,11 @@ CRC=769D4D13 DA233FFE Players=4 SaveType=Eeprom 4KB +[36B3D908FB50E5521DEFBEB2C39F47B0] +GoodName=Dr. Mario 64 (U) [T+Jap1.0_Zoinkity] +CRC=B74388D7 7DBD6DFB +RefMD5=1A7936367413E5D6874ABDA6D623AD32 + [0AD0800D351F77EC31092096D58C25F0] GoodName=Dragon King by CrowTRobo (PD) [b1] CRC=19E0E54C CB721FD2 @@ -12999,6 +13014,11 @@ SaveType=None Mempak=Yes Rumble=Yes +[73165CBE4E2421475C5FE9A227DCAFEC] +GoodName=Ready 2 Rumble Boxing (E) [T+Spa2.0_IlDucci] +CRC=56E06922 10F665F6 +RefMD5=ADC95AE01855FA305B13F8B22427E597 + [70F73D01FEAF768758F31B23DE2C2620] GoodName=Ready 2 Rumble Boxing (E) (M3) [t1] (P1 Untouchable) CRC=8638A334 8EBF1508 @@ -14612,6 +14632,11 @@ Players=2 SaveType=Eeprom 16KB Rumble=Yes +[73113AE7AAF0911BA6A1DF1353980D14] +GoodName=Star Wars Episode I - Racer (E) [T+Spa1.0.2_IlDucci] +CRC=E857ED95 6028F9AF +RefMD5=6EF9FED309F28BD59B605F128869AA00 + [8CC7E31925FBFA13A584F529E8912207] GoodName=Star Wars Episode I - Racer (E) (M3) [f1] (Save) CRC=166312CB C30220D2 @@ -15929,6 +15954,16 @@ GoodName=Tsumi to Batsu - Hoshi no Keishousha (J) [T+Eng1.0_Zoinkity] CRC=B73AB6F6 296267DD RefMD5=A0657BC99E169153FD46AECCFDE748F3 +[79BD05A97E50AC63A638E4E90AB9588B] +GoodName=Tsumi to Batsu - Hoshi no Keishousha (J) [T+Spa1.0b_TheFireRed&IlDucci] +CRC=B1C7794B D93DC5F3 +RefMD5=A0657BC99E169153FD46AECCFDE748F3 + +[103E16BF7FCFB4D713D2EBE19DCB5311] +GoodName=Tsumi to Batsu - Hoshi no Keishousha (J) [T+Spa1.0b_TheFireRed&IlDucci] (Fandub) +CRC=B1C7794B D93DC5F3 +RefMD5=A0657BC99E169153FD46AECCFDE748F3 + [13FAA58604597E4EDC608070F8E0AE24] GoodName=Turok - Dinosaur Hunter (E) (V1.0) [!] CRC=2F7009DD FC3BAC53 @@ -15981,6 +16016,11 @@ Players=1 SaveType=None Mempak=Yes +[85F616E54160FFE14E4E817065EA61CE] +GoodName=Turok - Dinosaur Hunter (U) (V1.0) (Analog Movement Controls_1.01 - No Invert) +CRC=2F70F10D 5C4187FF +RefMD5=AE5107EFDD3C210E1EDD4ACD9B3CAC31 + [AE5107EFDD3C210E1EDD4ACD9B3CAC31] GoodName=Turok - Dinosaur Hunter (U) (V1.0) [!] CRC=2F70F10D 5C4187FF diff --git a/mupen64plus-core/doc/emuwiki-api-doc/Mupen64Plus-v2.0-Netplay-API.mediawiki b/mupen64plus-core/doc/emuwiki-api-doc/Mupen64Plus-v2.0-Netplay-API.mediawiki index 9d9292e..85272a9 100644 --- a/mupen64plus-core/doc/emuwiki-api-doc/Mupen64Plus-v2.0-Netplay-API.mediawiki +++ b/mupen64plus-core/doc/emuwiki-api-doc/Mupen64Plus-v2.0-Netplay-API.mediawiki @@ -82,7 +82,7 @@ The server is responsible for maintaining healthy buffers and also for detecting ** byte[file size] = save file data * Send settings (sent by client): -** 29 bytes +** 25 bytes ** byte[0] = 3 ** byte[1-4] = count_per_op ** byte[5-8] = count_per_op_denom_pot @@ -90,7 +90,6 @@ The server is responsible for maintaining healthy buffers and also for detecting ** byte[13-16] = si_dma_duration ** byte[17-20] = emumode ** byte[21-24] = no_compiled_jump -** byte[25-28] = rsp_delay_time * Request settings (sent by client): ** 1 byte @@ -98,14 +97,13 @@ The server is responsible for maintaining healthy buffers and also for detecting * Send settings (sent by server): ** Server responds with this data right after the above request -** 28 bytes +** 24 bytes ** byte[0-3] = count_per_op ** byte[4-7] = count_per_op_denom_pot ** byte[8-11] = disable_extra_mem ** byte[12-15] = si_dma_duration ** byte[16-19] = emumode ** byte[20-23] = no_compiled_jump -** byte[24-27] = rsp_delay_time * Request player registration data (sent by client): ** 1 byte diff --git a/mupen64plus-core/src/main/main.c b/mupen64plus-core/src/main/main.c index 5fb935a..60accc9 100644 --- a/mupen64plus-core/src/main/main.c +++ b/mupen64plus-core/src/main/main.c @@ -1653,10 +1653,9 @@ m64p_error main_run(void) uint32_t count_per_op; //UNUSED uint32_t count_per_op_denom_pot; //UNUSED - uint32_t rsp_delay_time; //UNUSED int32_t si_dma_duration; //UNUSED //During netplay, player 1 is the source of truth for these settings - netplay_sync_settings(&count_per_op, &count_per_op_denom_pot, &disable_extra_mem, &si_dma_duration, &emumode, &no_compiled_jump, &rsp_delay_time); + netplay_sync_settings(&count_per_op, &count_per_op_denom_pot, &disable_extra_mem, &si_dma_duration, &emumode, &no_compiled_jump); rdram_size = (disable_extra_mem == 0) ? 0x800000 : 0x400000; diff --git a/mupen64plus-core/src/main/netplay.c b/mupen64plus-core/src/main/netplay.c index 16e5cae..0c5ae2f 100644 --- a/mupen64plus-core/src/main/netplay.c +++ b/mupen64plus-core/src/main/netplay.c @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#define SETTINGS_SIZE 28 +#define SETTINGS_SIZE 24 #define M64P_CORE_PROTOTYPES 1 #include "api/callbacks.h" @@ -501,7 +501,7 @@ file_status_t netplay_read_storage(const char *filename, void *data, size_t size return ret; } -void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_pot, uint32_t *disable_extra_mem, int32_t *si_dma_duration, uint32_t *emumode, int32_t *no_compiled_jump, uint32_t *rsp_delay_time) +void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_pot, uint32_t *disable_extra_mem, int32_t *si_dma_duration, uint32_t *emumode, int32_t *no_compiled_jump) { if (!netplay_is_init()) return; @@ -518,7 +518,6 @@ void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_ SDLNet_Write32(*si_dma_duration, &output_data[13]); SDLNet_Write32(*emumode, &output_data[17]); SDLNet_Write32(*no_compiled_jump, &output_data[21]); - SDLNet_Write32(*rsp_delay_time, &output_data[25]); SDLNet_TCP_Send(l_tcpSocket, &output_data[0], SETTINGS_SIZE + 1); } else @@ -535,7 +534,6 @@ void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_ *si_dma_duration = SDLNet_Read32(&output_data[12]); *emumode = SDLNet_Read32(&output_data[16]); *no_compiled_jump = SDLNet_Read32(&output_data[20]); - *rsp_delay_time = SDLNet_Read32(&output_data[24]); } } diff --git a/mupen64plus-core/src/main/netplay.h b/mupen64plus-core/src/main/netplay.h index fc068a2..088d4a3 100644 --- a/mupen64plus-core/src/main/netplay.h +++ b/mupen64plus-core/src/main/netplay.h @@ -47,7 +47,7 @@ void netplay_set_controller(uint8_t player); int netplay_is_init(); int netplay_get_controller(uint8_t player); file_status_t netplay_read_storage(const char *filename, void *data, size_t size); -void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_pot, uint32_t *disable_extra_mem, int32_t *si_dma_duration, uint32_t *emumode, int32_t *no_compiled_jump, uint32_t *rsp_delay_time); +void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_pot, uint32_t *disable_extra_mem, int32_t *si_dma_duration, uint32_t *emumode, int32_t *no_compiled_jump); void netplay_check_sync(struct cp0* cp0); int netplay_next_controller(); void netplay_read_registration(struct controller_input_compat* cin_compats); @@ -96,7 +96,7 @@ static osal_inline file_status_t netplay_read_storage(const char *filename, void return 0; } -static osal_inline void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_pot, uint32_t *disable_extra_mem, int32_t *si_dma_duration, uint32_t *emumode, int32_t *no_compiled_jump, uint32_t *rsp_delay_time) +static osal_inline void netplay_sync_settings(uint32_t *count_per_op, uint32_t *count_per_op_denom_pot, uint32_t *disable_extra_mem, int32_t *si_dma_duration, uint32_t *emumode, int32_t *no_compiled_jump) { }