kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port gamework.c to PAL (#467)

Browse source
This commit is contained in:
dbalatoni13 2024-11-17 00:08:24 +01:00 • committed by GitHub
parent 03e0dedb8e
commit be79577202
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 85 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/GMPE01_00/symbols.txt
View file

@ -4293,7 +4293,6 @@ luckyMessTbl = .data:0x8013ADC4; // type:object size:0x24 scope:local
jumptable_8013ADE8 = .data:0x8013ADE8; // type:object size:0x20 scope:local jumptable_8013ADE8 = .data:0x8013ADE8; // type:object size:0x20 scope:local
cursorYTbl = .data:0x8013AE08; // type:object size:0x10 scope:local cursorYTbl = .data:0x8013AE08; // type:object size:0x10 scope:local
hiliteYTbl = .data:0x8013AE18; // type:object size:0x10 scope:local hiliteYTbl = .data:0x8013AE18; // type:object size:0x10 scope:local
hiliteColTbl = .data:0x8013AE28; // type:object size:0xC scope:local hiliteColTbl = .data:0x8013AE28; // type:object size:0xC scope:local
hostMesTbl = .data:0x8013AE38; // type:object size:0x90 scope:local hostMesTbl = .data:0x8013AE38; // type:object size:0x90 scope:local
houseMdlTbl = .data:0x8013AEC8; // type:object size:0x30 scope:local houseMdlTbl = .data:0x8013AEC8; // type:object size:0x30 scope:local

2
config/GMPP01_00/symbols.txt
View file

@ -4611,7 +4611,7 @@ __fini_cpp_exceptions_reference = .dtors:0x8011DB04; // type:object size:0x4 sco
lbl_8011DB20 = .rodata:0x8011DB20; // type:object size:0x10 data:4byte lbl_8011DB20 = .rodata:0x8011DB20; // type:object size:0x10 data:4byte
lbl_8011DB30 = .rodata:0x8011DB30; // type:object size:0x10 data:4byte lbl_8011DB30 = .rodata:0x8011DB30; // type:object size:0x10 data:4byte
lbl_8011DB40 = .rodata:0x8011DB40; // type:object size:0x10 data:4byte lbl_8011DB40 = .rodata:0x8011DB40; // type:object size:0x10 data:4byte
lbl_8011DB50 = .rodata:0x8011DB50; // type:object size:0x20 data:byte lbl_8011DB50 = .rodata:0x8011DB50; // type:object size:0x20 scope:local data:byte
lbl_8011DB70 = .rodata:0x8011DB70; // type:object size:0x10 data:4byte lbl_8011DB70 = .rodata:0x8011DB70; // type:object size:0x10 data:4byte
lbl_8011DB80 = .rodata:0x8011DB80; // type:object size:0x24 data:4byte lbl_8011DB80 = .rodata:0x8011DB80; // type:object size:0x24 data:4byte
lbl_8011DBA4 = .rodata:0x8011DBA4; // type:object size:0xC data:4byte lbl_8011DBA4 = .rodata:0x8011DBA4; // type:object size:0xC data:4byte

2
configure.py
View file

@ -396,7 +396,7 @@ config.libs = [
Object(Matching, "game/perf.c"), Object(Matching, "game/perf.c"),
Object(Matching, "game/objmain.c"), Object(Matching, "game/objmain.c"),
Object(Matching, "game/fault.c"), Object(Matching, "game/fault.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/gamework.c"), Object(Matching, "game/gamework.c"),
Object(Matching, "game/objsysobj.c"), Object(Matching, "game/objsysobj.c"),
Object(Matching, "game/objdll.c"), Object(Matching, "game/objdll.c"),
Object(Matching, "game/frand.c"), Object(Matching, "game/frand.c"),

8
include/game/gamework_data.h
View file

@ -144,6 +144,9 @@ typedef struct game_stat {
/* 0x110 */ PauseBackupConfig party_pause; /* 0x110 */ PauseBackupConfig party_pause;
} GameStat; } GameStat;
extern s16 GwLanguage;
extern s16 GwLanguageSave;
extern PlayerConfig GWPlayerCfg[4]; extern PlayerConfig GWPlayerCfg[4];
extern PlayerState GWPlayer[4]; extern PlayerState GWPlayer[4];
extern SystemState GWSystem; extern SystemState GWSystem;
@ -169,6 +172,11 @@ static inline s32 GWPartyGet(void)
return GWSystem.party; return GWSystem.party;
} }
static inline void GWLanguageSet(s16 language)
{
GWGameStat.language = language;
}
static inline s32 GWLanguageGet(void) static inline s32 GWLanguageGet(void)
{ {
return GWGameStat.language; return GWGameStat.language;

132
src/game/gamework.c
View file

@ -1,7 +1,12 @@
#include "string.h"
#include "game/gamework.h" #include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/flag.h" #include "game/flag.h"
#include "game/gamework_data.h"
#include "string.h"
#include "version.h"
s16 GwLanguage = 1;
s16 GwLanguageSave = -1;
GameStat GWGameStatDefault; GameStat GWGameStatDefault;
GameStat GWGameStat; GameStat GWGameStat;
@ -20,15 +25,16 @@ static inline void InitPlayerConfig(void)
{ {
PlayerConfig *config; PlayerConfig *config;
s32 i; s32 i;
for(i=0; i<4; i++) { for (i = 0; i < 4; i++) {
config = &GWPlayerCfg[i]; config = &GWPlayerCfg[i];
config->character = i; config->character = i;
config->pad_idx = i; config->pad_idx = i;
config->diff = 0; config->diff = 0;
config->group = i; config->group = i;
if(!HuPadStatGet(i)) { if (!HuPadStatGet(i)) {
config->iscom = 0; config->iscom = 0;
} else { }
else {
config->iscom = 1; config->iscom = 1;
} }
} }
@ -36,11 +42,11 @@ static inline void InitPlayerConfig(void)
static inline void ResetBoardSettings(void) static inline void ResetBoardSettings(void)
{ {
GWRumbleSet(1); GWRumbleSet(1);
GWMGExplainSet(1); GWMGExplainSet(1);
GWMGShowComSet(1); GWMGShowComSet(1);
GWMessSpeedSet(1); GWMessSpeedSet(1);
GWSaveModeSet(0); GWSaveModeSet(0);
} }
void GWInit(void) void GWInit(void)
@ -49,23 +55,29 @@ void GWInit(void)
_InitFlag(); _InitFlag();
GWErase(); GWErase();
InitPlayerConfig(); InitPlayerConfig();
#if VERSION_JAP
GWGameStat.language = 0;
#elif VERSION_NTSC
GWGameStat.language = 1; GWGameStat.language = 1;
#else
GWLanguageSet(GwLanguage);
#endif
ResetBoardSettings(); ResetBoardSettings();
} }
static inline void ResetMGRecord(GameStat *game_stat) static inline void ResetMGRecord(GameStat *game_stat)
{ {
game_stat->mg_record[0] = 18000; game_stat->mg_record[0] = 300 * REFRESH_RATE;
game_stat->mg_record[1] = 80; game_stat->mg_record[1] = 80;
game_stat->mg_record[2] = 3600; game_stat->mg_record[2] = 60 * REFRESH_RATE;
game_stat->mg_record[3] = 7200; game_stat->mg_record[3] = 120 * REFRESH_RATE;
game_stat->mg_record[4] = 0; game_stat->mg_record[4] = 0;
game_stat->mg_record[5] = 3600; game_stat->mg_record[5] = 60 * REFRESH_RATE;
game_stat->mg_record[6] = 18000; game_stat->mg_record[6] = 300 * REFRESH_RATE;
game_stat->mg_record[7] = 18000; game_stat->mg_record[7] = 300 * REFRESH_RATE;
game_stat->mg_record[8] = 18000; game_stat->mg_record[8] = 300 * REFRESH_RATE;
game_stat->mg_record[9] = 0; game_stat->mg_record[9] = 0;
game_stat->mg_record[10] = 300; game_stat->mg_record[10] = 5 * REFRESH_RATE;
game_stat->mg_record[11] = 0; game_stat->mg_record[11] = 0;
game_stat->mg_record[12] = 0; game_stat->mg_record[12] = 0;
game_stat->mg_record[13] = 0; game_stat->mg_record[13] = 0;
@ -76,9 +88,9 @@ static inline void ResetBoardRecord(GameStat *game_stat)
{ {
s32 i; s32 i;
s32 j; s32 j;
for(i=0; i<9; i++) { for (i = 0; i < 9; i++) {
for(j=0; j<8; j++) { for (j = 0; j < 8; j++) {
game_stat->board_win_count[i][j] = 0; game_stat->board_win_count[i][j] = 0;
} }
game_stat->board_play_count[i] = 0; game_stat->board_play_count[i] = 0;
@ -90,10 +102,10 @@ static inline void ResetBoardRecord(GameStat *game_stat)
static inline void ResetPresent(GameStat *game_stat) static inline void ResetPresent(GameStat *game_stat)
{ {
s32 i; s32 i;
for(i=0; i<60; i++) { for (i = 0; i < 60; i++) {
game_stat->present[i] = 0; game_stat->present[i] = 0;
} }
(void)i; //HACK to match GWResetGameStat (void)i; // HACK to match GWResetGameStat
} }
static inline void ResetFlag(GameStat *game_stat) static inline void ResetFlag(GameStat *game_stat)
@ -120,7 +132,13 @@ void GWGameStatReset(void)
GameStat *game_stat = &GWGameStatDefault; GameStat *game_stat = &GWGameStatDefault;
memset(game_stat, 0, sizeof(GameStat)); memset(game_stat, 0, sizeof(GameStat));
game_stat->unk_00 = 0; game_stat->unk_00 = 0;
#if VERSION_JAP
game_stat->language = 0;
#elif VERSION_NTSC
game_stat->language = 1; game_stat->language = 1;
#else
game_stat->language = GwLanguage;
#endif
game_stat->sound_mode = 1; game_stat->sound_mode = 1;
game_stat->rumble = 1; game_stat->rumble = 1;
game_stat->total_stars = 0; game_stat->total_stars = 0;
@ -133,23 +151,30 @@ void GWGameStatReset(void)
ResetBoardRecord(game_stat); ResetBoardRecord(game_stat);
ResetPresent(game_stat); ResetPresent(game_stat);
ResetFlag(game_stat); ResetFlag(game_stat);
ResetPauseConfig(game_stat); ResetPauseConfig(game_stat);
memcpy(&GWGameStat, &GWGameStatDefault, sizeof(GameStat)); memcpy(&GWGameStat, &GWGameStatDefault, sizeof(GameStat));
ResetBoardSettings(); ResetBoardSettings();
} }
s32 GWMessDelayGet(void) s32 GWMessDelayGet(void)
{ {
if(GWSystem.mess_delay > 48) { #if VERSION_NTSC
if (GWSystem.mess_delay > 48) {
GWSystem.mess_speed = 1; GWSystem.mess_speed = 1;
GWSystem.mess_delay = 32; GWSystem.mess_delay = 32;
} }
#else
if (GWSystem.mess_delay > 64) {
GWSystem.mess_speed = 1;
GWSystem.mess_delay = 48;
}
#endif
return GWSystem.mess_delay; return GWSystem.mess_delay;
} }
void GWMGRecordSet(s32 index, u32 value) void GWMGRecordSet(s32 index, u32 value)
{ {
if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) { if (!_CheckFlag(FLAG_ID_MAKE(1, 12))) {
GWGameStat.mg_record[index] = value; GWGameStat.mg_record[index] = value;
} }
} }
@ -161,22 +186,14 @@ u32 GWMGRecordGet(s32 index)
void GWCharColorGet(s32 character, GXColor *color) void GWCharColorGet(s32 character, GXColor *color)
{ {
GXColor char_color[] = { GXColor char_color[] = { { 227, 67, 67, 255 }, { 68, 67, 227, 255 }, { 241, 158, 220, 255 }, { 67, 228, 68, 255 }, { 138, 60, 180, 255 },
{ 227, 67, 67, 255 }, { 146, 85, 55, 255 }, { 227, 228, 68, 255 }, { 40, 40, 40, 255 } };
{ 68, 67, 227, 255 },
{ 241, 158, 220, 255 },
{ 67, 228, 68, 255 },
{ 138, 60, 180, 255 },
{ 146, 85, 55, 255 },
{ 227, 228, 68, 255 },
{ 40, 40, 40, 255 }
};
*color = char_color[character]; *color = char_color[character];
} }
void GWBoardPlayCountSet(s32 board, u8 value) void GWBoardPlayCountSet(s32 board, u8 value)
{ {
if(value > 99) { if (value > 99) {
value = 99; value = 99;
} }
GWGameStat.board_play_count[board] = value; GWGameStat.board_play_count[board] = value;
@ -185,13 +202,12 @@ void GWBoardPlayCountSet(s32 board, u8 value)
void GWBoardPlayCountAdd(s32 board, u8 value) void GWBoardPlayCountAdd(s32 board, u8 value)
{ {
value += GWGameStat.board_play_count[board]; value += GWGameStat.board_play_count[board];
if(value > 99) { if (value > 99) {
value = 99; value = 99;
} }
GWGameStat.board_play_count[board] = value; GWGameStat.board_play_count[board] = value;
} }
u8 GWBoardPlayCountGet(s32 board) u8 GWBoardPlayCountGet(s32 board)
{ {
return GWGameStat.board_play_count[board]; return GWGameStat.board_play_count[board];
@ -219,8 +235,8 @@ u16 GWBoardMaxCoinsGet(s32 board)
s32 GWBoardWinCountInc(s32 character, s32 board) s32 GWBoardWinCountInc(s32 character, s32 board)
{ {
s32 win_count = GWGameStat.board_win_count[board][character]+1; s32 win_count = GWGameStat.board_win_count[board][character] + 1;
if(win_count > 99) { if (win_count > 99) {
win_count = 99; win_count = 99;
} }
GWGameStat.board_win_count[board][character] = win_count; GWGameStat.board_win_count[board][character] = win_count;
@ -244,9 +260,10 @@ s32 GWMGAvailGet(s32 id)
id -= 401; id -= 401;
word = id >> 5; word = id >> 5;
bit = id % 32; bit = id % 32;
if(GWGameStat.mg_avail[word] & (1 << bit)) { if (GWGameStat.mg_avail[word] & (1 << bit)) {
return 1; return 1;
} else { }
else {
return 0; return 0;
} }
} }
@ -268,9 +285,10 @@ s32 GWMGCustomGet(s32 id)
id -= 401; id -= 401;
word = id >> 5; word = id >> 5;
bit = id % 32; bit = id % 32;
if(GWGameStat.mg_custom[word] & (1 << bit)) { if (GWGameStat.mg_custom[word] & (1 << bit)) {
return 1; return 1;
} else { }
else {
return 0; return 0;
} }
} }
@ -302,14 +320,14 @@ s16 GWCoinsGet(s32 player)
void GWCoinsSet(s32 player, s16 value) void GWCoinsSet(s32 player, s16 value)
{ {
if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) { if (!_CheckFlag(FLAG_ID_MAKE(1, 12))) {
if(value < 0) { if (value < 0) {
value = 0; value = 0;
} }
if(value > 999) { if (value > 999) {
value = 999; value = 999;
} }
if(value > GWPlayer[player].coins_max) { if (value > GWPlayer[player].coins_max) {
GWPlayer[player].coins_max = value; GWPlayer[player].coins_max = value;
} }
GWPlayer[player].coins = value; GWPlayer[player].coins = value;
@ -318,18 +336,18 @@ void GWCoinsSet(s32 player, s16 value)
void GWCoinsAdd(s32 player, s16 amount) void GWCoinsAdd(s32 player, s16 amount)
{ {
GWCoinsSet(player, GWPlayer[player].coins+amount); GWCoinsSet(player, GWPlayer[player].coins + amount);
} }
void GWStarsSet(s32 player, s16 value) void GWStarsSet(s32 player, s16 value)
{ {
if(value < 0) { if (value < 0) {
value = 0; value = 0;
} }
if(value > 999) { if (value > 999) {
value = 999; value = 999;
} }
if(value > GWPlayer[player].stars_max) { if (value > GWPlayer[player].stars_max) {
GWPlayer[player].stars_max = value; GWPlayer[player].stars_max = value;
} }
GWPlayer[player].stars = value; GWPlayer[player].stars = value;
@ -337,7 +355,7 @@ void GWStarsSet(s32 player, s16 value)
void GWStarsAdd(s32 player, s16 amount) void GWStarsAdd(s32 player, s16 amount)
{ {
GWStarsSet(player, GWPlayer[player].stars+amount); GWStarsSet(player, GWPlayer[player].stars + amount);
} }
s32 GWStarsGet(s32 player) s32 GWStarsGet(s32 player)
@ -347,10 +365,10 @@ s32 GWStarsGet(s32 player)
void GWTotalStarsSet(s16 value) void GWTotalStarsSet(s16 value)
{ {
if(value < 0) { if (value < 0) {
value = 0; value = 0;
} }
if(value > 10000) { if (value > 10000) {
value = 10000; value = 10000;
} }
GWGameStat.total_stars = value; GWGameStat.total_stars = value;
@ -358,7 +376,7 @@ void GWTotalStarsSet(s16 value)
void GWTotalStarsAdd(s16 amount) void GWTotalStarsAdd(s16 amount)
{ {
GWTotalStarsSet(GWGameStat.total_stars+amount); GWTotalStarsSet(GWGameStat.total_stars + amount);
} }
u16 GWTotalStarsGet(void) u16 GWTotalStarsGet(void)