Game-Decompilation/mp1
1
0
Fork 0
mirror of https://github.com/Rainchus/mp1.git synced 2024-11-23 04:59:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change unk_00 to group in gwplayer, 2 hvq decompression

Browse Source
This commit is contained in:
Rainchus 2024-11-02 19:29:32 -05:00
parent 3e59787b39
commit 3b8a52065d
63 changed files with 645 additions and 648 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/common_structs.h
View File

@ -300,27 +300,27 @@ typedef struct Object {
/* 0x8C */ struct Object* unk_8C;
} Object; // //sizeof 0xAC? (this and mpSource_object are the same struct)
typedef struct playerMain {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 cpuDifficulty;
/* 0x02 */ u8 cpuDifficultyCopy;
typedef struct GW_PLAYER {
/* 0x00 */ u8 group;
/* 0x01 */ u8 cpu_difficulty;
/* 0x02 */ u8 cpu_difficulty_copy;
/* 0x03 */ u8 port; //controller port
/* 0x04 */ u8 characterID;
/* 0x05 */ char unk_05;
/* 0x04 */ u8 character;
/* 0x05 */ char unk_05; //likely padding
/* 0x06 */ u16 flags; // (flags) including CPU flag
/* 0x08 */ s16 coins; //player's current coins
/* 0x0A */ s16 coins_mg; //coins to give to player after minigame
/* 0x0C */ s16 starAmount;
/* 0x0E */ s16 curChainIndex;
/* 0x10 */ u16 curSpaceIndex;
/* 0x12 */ u16 nextChainIndex;
/* 0x14 */ u16 nextSpaceIndex;
/* 0x16 */ u8 poisonedFlag;
/* 0x0C */ s16 stars;
/* 0x0E */ s16 cur_chain;
/* 0x10 */ u16 cur_space;
/* 0x12 */ u16 next_chain;
/* 0x14 */ u16 next_space;
/* 0x16 */ u8 poisoned_flag;
/* 0x17 */ u8 turn_status; //space type player landed on
/* 0x18 */ u8 player_index; //0, 1, 2, or 3
/* 0x19 */ char unk_19[3]; //likely padding
/* 0x1C */ Process* process; //some heap instance
/* 0x20 */ Object* playerObj; //ptr to playerObj on heap
/* 0x20 */ Object* player_obj; //ptr to player_obj on heap
/* 0x24 */ s16 coins_total; //how many coins a player has won/lost in minigames
/* 0x26 */ s16 coins_max; //highest amount of coins player has held
/* 0x28 */ u8 happening_count;
@ -331,7 +331,7 @@ typedef struct playerMain {
/* 0x2D */ u8 mushroom_count;
/* 0x2E */ u8 bowser_count;
/* 0x2F */ char unk_2F;
} playerMain; //sizeof 0x30
} GW_PLAYER __attribute__((aligned(4))); //sizeof 0x30
//P1 800F32B0, P2 800F32E0, P3 800F3310, P4 800F3340
//sprite related

6
include/functions.us.h
View File

@ -281,8 +281,8 @@ void InitCameras(s32);
void func_8005AD18(void);
void func_80062450(void);
s32 func_8005CE48(s32);
playerMain* GetPlayerStruct(s32 playerIndex);
//void func_8008C040(playerMain*, playerMain*, s32);
GW_PLAYER* GetPlayerStruct(s32 playerIndex);
//void func_8008C040(GW_PLAYER*, GW_PLAYER*, s32);
void WaitForTextConfirmation(s16);
void func_8006DA5C(s16, void*, s8);
void func_80009028(omObjData*, s32, f32, f32, f32, f32);
@ -520,7 +520,7 @@ u32 osVirtualToPhysical(void*);
void func_80031D78(unk2C0C0StructC0* arg0, s16 arg1);
void func_800622BC(u16, u16, s32);
s16 GetCurrentPlayerIndex(void);
playerMain* GetPlayerStruct(s32);
GW_PLAYER* GetPlayerStruct(s32);
s16 GetTurnsElapsed(void);
s32 IsFlagSet(s32);
s32 PlayerHasCoins(s32 index, s32 count);

2
include/variables.us.h
View File

@ -16,7 +16,7 @@ extern s16 D_800ED5DC;
extern Addr D_FE2310;
extern u16 D_800F5144;
extern s16 D_800C597A;
extern playerMain gPlayers[4];
extern GW_PLAYER GwPlayer[4];
//extern u8 D_800ED5C3;
extern s16 D_800FE150;
extern u8 D_800FD86E;

2
src/3F5B0.c
View File

@ -106,7 +106,7 @@ s16 RunDecisionTree(DecisionTreeNonLeafNode* currentNode) {
if ((s32)phi_s1->node_data2.data < 0) {
phi_s1 = (DecisionTreeNonLeafNode*)phi_s1->node_data2.data - 1;
} else {
if (GetPlayerStruct(-1)->cpuDifficultyCopy == 0) {
if (GetPlayerStruct(-1)->cpu_difficulty_copy == 0) {
phi_a0 = phi_s1->node_data2.data & 0xFF;
} else {
phi_a0 = (phi_s1->node_data2.data >> 8);

6
src/43760.c
View File

@ -132,8 +132,8 @@ loop_1:
break;
case 1:
if (func_80054FA8() == 0) {
if (temp[gPlayers[temp_s0->unk_04].port] & 0x8000) {
if (!(gPlayers[temp_s0->unk_04].flags & 1)) {
if (temp[GwPlayer[temp_s0->unk_04].port] & 0x8000) {
if (!(GwPlayer[temp_s0->unk_04].flags & 1)) {
func_80043D68();
func_80054868(5);
temp_s0->unk_00++;
@ -141,7 +141,7 @@ loop_1:
}
}
if (gPlayers[temp_s0->unk_04].flags & 1) {
if (GwPlayer[temp_s0->unk_04].flags & 1) {
func_80043D68();
func_80054868(5);
temp_s0->unk_00++;

12
src/46100.c
View File

@ -8,9 +8,9 @@ void func_80045500(omObjData* arg0) {
Vec3f sp10;
Vec2f sp20;
sp10.x = (gPlayers[arg0->work[3]].playerObj)->coords.x;
sp10.y = (gPlayers[arg0->work[3]].playerObj)->coords.y + 250.0f;
sp10.z = (gPlayers[arg0->work[3]].playerObj)->coords.z;
sp10.x = (GwPlayer[arg0->work[3]].player_obj)->coords.x;
sp10.y = (GwPlayer[arg0->work[3]].player_obj)->coords.y + 250.0f;
sp10.z = (GwPlayer[arg0->work[3]].player_obj)->coords.z;
func_8004B730(&sp10, &sp20);
if (arg0->work[0] < 30) {
if (arg0->rot.x > 0.0f) {
@ -67,9 +67,9 @@ void ShowPlayerCoinChange(s32 arg0, s32 arg1) {
s32 var_s4 = 0;
if (D_800D6470 == -1) {
sp18.x = (gPlayers[arg0].playerObj)->coords.x;
sp18.y = (gPlayers[arg0].playerObj)->coords.y + 250.0f;
sp18.z = (gPlayers[arg0].playerObj)->coords.z;
sp18.x = (GwPlayer[arg0].player_obj)->coords.x;
sp18.y = (GwPlayer[arg0].player_obj)->coords.y + 250.0f;
sp18.z = (GwPlayer[arg0].player_obj)->coords.z;
func_8004B730(&sp18, &sp28);
D_800D6478 = omAddObj(-0x8000, 0, 0, -1, &func_80045500);
D_800D6478->work[0] = 0;

6
src/47320.c
View File

@ -167,7 +167,7 @@ void func_8004746C(s32 arg0) {
} else if (arg0 == 5) {
arg0 = 8;
} else {
arg0 = gPlayers[arg0].characterID + 1;
arg0 = GwPlayer[arg0].character + 1;
}
D_800D6502 = func_80064EF4(2, 5);
@ -203,7 +203,7 @@ void func_80047694(s32 arg0) {
if (arg0 >= 4) {
temp_v0->rot.x = D_800C4EF6;
} else {
temp_v0->rot.x = D_800C4EF0[gPlayers[arg0].characterID];
temp_v0->rot.x = D_800C4EF0[GwPlayer[arg0].character];
}
temp_v0->mdlcnt = 0;
@ -231,7 +231,7 @@ void func_800479B8(s32 arg0) {
if (arg0 == 6) {
file = ReadMainFS(copyTempTest[6] | 0xA0000);
} else {
file = ReadMainFS(copyTempTest[gPlayers[arg0].characterID] | 0xA0000);
file = ReadMainFS(copyTempTest[GwPlayer[arg0].character] | 0xA0000);
}
D_800D6504.x = func_800678A4(file);
FreeMainFS(file);

80
src/4D770.c
View File

@ -39,7 +39,7 @@ void func_8004CC14(s16 arg0, s16 arg1, Vec3f* arg2) {
}
void func_8004CC8C(s16 arg0, s16 arg1) {
func_8004CB70(arg0, arg1, &gPlayers[arg0].playerObj->coords);
func_8004CB70(arg0, arg1, &GwPlayer[arg0].player_obj->coords);
}
void func_8004CCD0(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2) {
@ -50,7 +50,7 @@ void func_8004CCD0(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2) {
void func_8004CD08(s16 arg0, Vec3f* arg1) {
Object* playerObject;
playerObject = GetPlayerStruct(arg0)->playerObj;
playerObject = GetPlayerStruct(arg0)->player_obj;
func_8004CCD0(&playerObject->coords, arg1, &playerObject->unk_18);
}
@ -65,7 +65,7 @@ void func_8004CD84(Vec3f* arg0) {
}
void func_8004CDA0(s16 arg0) {
func_8004CD84(&GetPlayerStruct(arg0)->playerObj->unk_18);
func_8004CD84(&GetPlayerStruct(arg0)->player_obj->unk_18);
}
void func_8004CDCC(Object* unk) {
@ -83,28 +83,28 @@ void func_8004CDCC(Object* unk) {
}
void SwapPlayerLocationData(s16 arg0, s16 arg1) {
playerMain* player1;
playerMain* player2;
GW_PLAYER* player1;
GW_PLAYER* player2;
u16 temp;
player1 = GetPlayerStruct(arg0);
player2 = GetPlayerStruct(arg1);
temp = player1->curChainIndex;
player1->curChainIndex = player2->curChainIndex;
player2->curChainIndex = temp;
temp = player1->curSpaceIndex;
player1->curSpaceIndex = player2->curSpaceIndex;
player2->curSpaceIndex = temp;
temp = player1->nextChainIndex;
player1->nextChainIndex = player2->nextChainIndex;
player2->nextChainIndex = temp;
temp = player1->nextSpaceIndex;
player1->nextSpaceIndex = player2->nextSpaceIndex;
player2->nextSpaceIndex = temp;
temp = player1->cur_chain;
player1->cur_chain = player2->cur_chain;
player2->cur_chain = temp;
temp = player1->cur_space;
player1->cur_space = player2->cur_space;
player2->cur_space = temp;
temp = player1->next_chain;
player1->next_chain = player2->next_chain;
player2->next_chain = temp;
temp = player1->next_space;
player1->next_space = player2->next_space;
player2->next_space = temp;
}
void SetPlayerLandedSpaceType(s16 playerIndex, s16 spaceType) {
playerMain* player = GetPlayerStruct(playerIndex);
GW_PLAYER* player = GetPlayerStruct(playerIndex);
s32 spaceTemp;
switch(--spaceType) {
@ -136,7 +136,7 @@ s16 GetSumOfPlayerStars(void) {
s32 i;
for (i = 0; i < MAX_PLAYERS; i++) {
starTotal += GetPlayerStruct(i)->starAmount;
starTotal += GetPlayerStruct(i)->stars;
}
return starTotal;
@ -218,12 +218,12 @@ Process* func_8004D1EC(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) {
void func_8004D2A4(s16 arg0, s32 arg1, s16 arg2) {
Vec3f sp10;
Vec3f* temp_a2;
playerMain* temp_s1;
GW_PLAYER* temp_s1;
temp_s1 = GetPlayerStruct(arg0);
func_800A0E80(&sp10, &GetSpaceData(arg2)->coords, &temp_s1->playerObj->coords);
func_800A0E80(&sp10, &GetSpaceData(arg2)->coords, &temp_s1->player_obj->coords);
func_8003D408(&sp10);
temp_a2 = &temp_s1->playerObj->unk_18;
temp_a2 = &temp_s1->player_obj->unk_18;
func_8004D1EC(temp_a2, &sp10, temp_a2, arg1);
}
@ -259,14 +259,14 @@ Process* func_8004D3F4(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) {
void func_8004D4A8(s16 arg0, s32 arg1) {
Vec3f sp10;
Vec3f sp20;
playerMain* temp_v0;
GW_PLAYER* temp_v0;
Process* process;
temp_v0 = GetPlayerStruct(arg0);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->curChainIndex, temp_v0->curSpaceIndex), &sp10);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->nextChainIndex, temp_v0->nextSpaceIndex), &sp20);
func_8004CCD0(&sp10, &sp20, &temp_v0->playerObj->unk_18);
process = func_8004D3F4(&sp10, &sp20, &temp_v0->playerObj->coords, arg1);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->cur_chain, temp_v0->cur_space), &sp10);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->next_chain, temp_v0->next_space), &sp20);
func_8004CCD0(&sp10, &sp20, &temp_v0->player_obj->unk_18);
process = func_8004D3F4(&sp10, &sp20, &temp_v0->player_obj->coords, arg1);
HuPrcChildLink(HuPrcCurrentGet(), process);
HuPrcChildWatch();
}
@ -308,39 +308,39 @@ Process* func_8004D648(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, f32 arg3) {
void func_8004D6FC(s16 arg0, f32 arg1) {
Vec3f sp10;
Vec3f sp20;
playerMain* temp_v0;
GW_PLAYER* temp_v0;
Process* process;
temp_v0 = GetPlayerStruct(arg0);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->curChainIndex, temp_v0->curSpaceIndex), &sp10);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->nextChainIndex, temp_v0->nextSpaceIndex), &sp20);
func_8004CCD0(&sp10, &sp20, &temp_v0->playerObj->unk_18);
process = func_8004D648(&sp10, &sp20, &temp_v0->playerObj->coords, arg1);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->cur_chain, temp_v0->cur_space), &sp10);
func_8004CB70(arg0, GetAbsSpaceIndexFromChainSpaceIndex(temp_v0->next_chain, temp_v0->next_space), &sp20);
func_8004CCD0(&sp10, &sp20, &temp_v0->player_obj->unk_18);
process = func_8004D648(&sp10, &sp20, &temp_v0->player_obj->coords, arg1);
HuPrcChildLink(HuPrcCurrentGet(), process);
HuPrcChildWatch();
}
void SetPlayerOntoChain(s16 player, s16 chain_index, s16 space_index) {
playerMain* temp_v1 = GetPlayerStruct(player);
GW_PLAYER* temp_v1 = GetPlayerStruct(player);
if (chain_index >= 0) {
temp_v1->curChainIndex = chain_index;
temp_v1->nextChainIndex = chain_index;
temp_v1->cur_chain = chain_index;
temp_v1->next_chain = chain_index;
}
if (space_index >= 0) {
temp_v1->curSpaceIndex = space_index;
temp_v1->nextSpaceIndex = space_index + 1;
temp_v1->cur_space = space_index;
temp_v1->next_space = space_index + 1;
}
}
void SetNextChainAndSpace(s16 arg0, s16 arg1, s16 arg2) {
playerMain* temp_v0 = GetPlayerStruct(arg0);
GW_PLAYER* temp_v0 = GetPlayerStruct(arg0);
if (arg1 >= 0) {
temp_v0->nextChainIndex = arg1;
temp_v0->next_chain = arg1;
}
if (arg2 >= 0) {
temp_v0->nextSpaceIndex = arg2;
temp_v0->next_space = arg2;
}
}

36
src/4E530.c
View File

@ -98,17 +98,17 @@ void func_8004E248(omObjData* arg0) {
if (temp_v1 == NULL) {
if (arg0->work[1] == 0) {
gPlayers[arg0->work[0]].playerObj->coords.x = arg0->trans.x;
gPlayers[arg0->work[0]].playerObj->coords.y = arg0->trans.y;
gPlayers[arg0->work[0]].playerObj->coords.z = arg0->trans.z;
GwPlayer[arg0->work[0]].player_obj->coords.x = arg0->trans.x;
GwPlayer[arg0->work[0]].player_obj->coords.y = arg0->trans.y;
GwPlayer[arg0->work[0]].player_obj->coords.z = arg0->trans.z;
omDelObj(arg0);
return;
}
temp_v0 = gPlayers[arg0->work[0]].playerObj;
temp_v0 = GwPlayer[arg0->work[0]].player_obj;
temp_v0->coords.x = temp_v0->coords.x + arg0->scale.x;
temp_v0 = gPlayers[arg0->work[0]].playerObj;
temp_v0 = GwPlayer[arg0->work[0]].player_obj;
temp_v0->coords.y = temp_v0->coords.y + arg0->scale.y;
temp_v0 = gPlayers[arg0->work[0]].playerObj;
temp_v0 = GwPlayer[arg0->work[0]].player_obj;
temp_v0->coords.z = temp_v0->coords.z + arg0->scale.z;
return;
}
@ -139,9 +139,9 @@ omObjData* func_8004E3E0(s32 arg0, Vec3f* arg1, s32 arg2, void* arg3) { //fix ar
obj->trans.y = arg1->y;
obj->trans.z = arg1->z;
if (arg3 == NULL) {
obj->scale.x = (arg1->x - gPlayers[arg0].playerObj->coords.x) / arg2;
obj->scale.y = (arg1->y - gPlayers[arg0].playerObj->coords.y) / arg2;
obj->scale.z = (arg1->z - gPlayers[arg0].playerObj->coords.z) / arg2;
obj->scale.x = (arg1->x - GwPlayer[arg0].player_obj->coords.x) / arg2;
obj->scale.y = (arg1->y - GwPlayer[arg0].player_obj->coords.y) / arg2;
obj->scale.z = (arg1->z - GwPlayer[arg0].player_obj->coords.z) / arg2;
} else {
obj->scale.x = (arg1->x - ((unkGlobalStruct_00*)arg3)->unk_0C) / arg2;
obj->scale.y = (arg1->y - ((unkGlobalStruct_00*)arg3)->unk_10) / arg2;
@ -201,24 +201,24 @@ void func_8004E564(omObjData* arg0) { //matches, needs rodata support
if (var_s0 == NULL) {
if (arg0->work[1] == 0) {
gPlayers[arg0->work[0]].playerObj->coords.x = arg0->trans.x;
gPlayers[arg0->work[0]].playerObj->coords.y = arg0->trans.y;
gPlayers[arg0->work[0]].playerObj->coords.z = arg0->trans.z;
GwPlayer[arg0->work[0]].player_obj->coords.x = arg0->trans.x;
GwPlayer[arg0->work[0]].player_obj->coords.y = arg0->trans.y;
GwPlayer[arg0->work[0]].player_obj->coords.z = arg0->trans.z;
omDelObj(arg0);
return;
}
gPlayers[arg0->work[0]].playerObj->coords.x = gPlayers[arg0->work[0]].playerObj->coords.x + arg0->scale.x;
gPlayers[arg0->work[0]].playerObj->coords.y = gPlayers[arg0->work[0]].playerObj->coords.y + arg0->scale.y;
gPlayers[arg0->work[0]].playerObj->coords.z = gPlayers[arg0->work[0]].playerObj->coords.z + arg0->scale.z;
new_var = gPlayers[arg0->work[0]].playerObj;
GwPlayer[arg0->work[0]].player_obj->coords.x = GwPlayer[arg0->work[0]].player_obj->coords.x + arg0->scale.x;
GwPlayer[arg0->work[0]].player_obj->coords.y = GwPlayer[arg0->work[0]].player_obj->coords.y + arg0->scale.y;
GwPlayer[arg0->work[0]].player_obj->coords.z = GwPlayer[arg0->work[0]].player_obj->coords.z + arg0->scale.z;
new_var = GwPlayer[arg0->work[0]].player_obj;
temp_v0 = new_var;
temp_f20 = fsin(arg0->work[1] * 180.0f / arg0->work[2] * (M_PI/180)) * arg0->rot.x;
temp_v0->coords.x += temp_f20 - (fsin((arg0->work[1] + 1) * 180.0f / arg0->work[2] * (M_PI/180)) * arg0->rot.x);
temp_v0 = gPlayers[arg0->work[0]].playerObj;
temp_v0 = GwPlayer[arg0->work[0]].player_obj;
temp_f20_2 = fsin(arg0->work[1] * 180.0f / arg0->work[2] * (M_PI/180)) * arg0->rot.y;
temp_v0->coords.y += temp_f20_2 - (fsin((arg0->work[1] + 1) * 180.0f / arg0->work[2] * (M_PI/180)) * arg0->rot.y);
var_s0 = gPlayers[arg0->work[0]].playerObj;
var_s0 = GwPlayer[arg0->work[0]].player_obj;
temp_f20_5 = fsin(arg0->work[1] * 180.0f / arg0->work[2] * (M_PI/180))* arg0->rot.z;
temp_f20_5 = temp_f20_5 - (fsin(( (((arg0->work[1] + 1) * 180.0f) / arg0->work[2]) * (M_PI/180))) * arg0->rot.z);
temp_f20_5 += var_s0->coords.z;

66
src/53680.c
View File

@ -15,11 +15,11 @@ s16 GetCurrentPlayerIndex(void) {
return D_800ED5DC;
}
playerMain* GetPlayerStruct(s32 index) {
GW_PLAYER* GetPlayerStruct(s32 index) {
if (index < 0) {
index = GetCurrentPlayerIndex();
}
return &gPlayers[index];
return &GwPlayer[index];
}
// Returns true if the given index matches the current player index.
@ -28,7 +28,7 @@ s16 PlayerIsCurrent(s16 index) {
}
// Returns true if the given player is the same as the current player.
u32 PlayerStructIsCurrent(playerMain* player) {
u32 PlayerStructIsCurrent(GW_PLAYER* player) {
s16 cur_index = GetCurrentPlayerIndex();
return player->player_index == cur_index;
}
@ -41,7 +41,7 @@ u32 PlayerIsCPU(s16 index) {
* Adjust's a player's coin total by a given count.
*/
void AdjustPlayerCoins(s32 index, s32 count) {
playerMain* player = GetPlayerStruct(index);
GW_PLAYER* player = GetPlayerStruct(index);
player->coins += count;
if (player->coins >= 1000) {
player->coins = 999;
@ -59,7 +59,7 @@ void AdjustPlayerCoins(s32 index, s32 count) {
* Returns true if a player has at least the given coin count.
*/
s32 PlayerHasCoins(s32 index, s32 count) {
playerMain* player = GetPlayerStruct(index);
GW_PLAYER* player = GetPlayerStruct(index);
return player->coins >= count;
}
@ -67,33 +67,33 @@ s32 PlayerHasCoins(s32 index, s32 count) {
* Updates the given player's current animation.
*/
void SetPlayerAnimation(s32 index, s16 animation, s32 unk) {
playerMain* player = GetPlayerStruct(index);
GW_PLAYER* player = GetPlayerStruct(index);
if (player == GetPlayerStruct(-1)) {
func_8003E81C(player->playerObj, animation, unk);
func_8003E81C(player->player_obj, animation, unk);
}
}
void func_80052C44(s32 index, s16 a, s16 b, s16 c, u16 d) {
playerMain* player = GetPlayerStruct(index);
GW_PLAYER* player = GetPlayerStruct(index);
if (player == GetPlayerStruct(-1)) {
func_8003E8B8(player->playerObj, a, b, c, d);
func_8003E8B8(player->player_obj, a, b, c, d);
}
}
void func_80052CCC(s32 index, u8 b) {
playerMain* player = GetPlayerStruct(index);
player->cpuDifficultyCopy = b;
GW_PLAYER* player = GetPlayerStruct(index);
player->cpu_difficulty_copy = b;
if (!IsFlagSet(44)) {
player->cpuDifficulty = D_800C53E0[b];
player->cpu_difficulty = D_800C53E0[b];
}
else {
player->cpuDifficulty = D_800C53E4[b];
player->cpu_difficulty = D_800C53E4[b];
}
}
void func_80052D34(void) {
Process* process = HuPrcCurrentGet();
playerMain* player = (playerMain*)process->user_data;
GW_PLAYER* player = (GW_PLAYER*)process->user_data;
u16 flags;
f32 val;
@ -109,7 +109,7 @@ void func_80052D34(void) {
val = 0.7f;
}
func_800A0D00(&player->playerObj->xScale, val, val, val);
func_800A0D00(&player->player_obj->xScale, val, val, val);
}
}
@ -118,23 +118,23 @@ void func_80052DC8(s16 index, void *param_2) {
u8 character;
Process* process;
playerMain* player = GetPlayerStruct(index);
GW_PLAYER* player = GetPlayerStruct(index);
player->player_index = index;
// This was hard to match, seems awkward still.
if (D_800D8380 != 0) {
if (PlayerIsCurrent(index) != 0) {
character = player->characterID;
character = player->character;
}
else {
character = func_80052F6C(index);
}
}
else {
character = player->characterID;
character = player->character;
}
player->playerObj = CreateObject(character, param_2);
player->player_obj = CreateObject(character, param_2);
process = omAddPrcObj(func_80052D34, 0x5000, 0, 0);
player->process = process;
@ -142,18 +142,18 @@ void func_80052DC8(s16 index, void *param_2) {
}
void func_80052E84(s16 index) {
playerMain* player = GetPlayerStruct(index);
func_80052DC8(index, D_800C5490[player->characterID]);
GW_PLAYER* player = GetPlayerStruct(index);
func_80052DC8(index, D_800C5490[player->character]);
}
void func_80052ECC(s16 index, u8 param_2) {
playerMain* player = GetPlayerStruct(index);
func_8003E1BC(player->playerObj, param_2);
GW_PLAYER* player = GetPlayerStruct(index);
func_8003E1BC(player->player_obj, param_2);
}
u8 func_80052F04(s16 index) {
playerMain* player = GetPlayerStruct(index);
return D_800C54A8[player->characterID];
GW_PLAYER* player = GetPlayerStruct(index);
return D_800C54A8[player->character];
}
void func_80052F34(s16 index) {
@ -162,8 +162,8 @@ void func_80052F34(s16 index) {
}
u8 func_80052F6C(s16 index) {
playerMain* player = GetPlayerStruct(index);
return D_800C54B0[player->characterID];
GW_PLAYER* player = GetPlayerStruct(index);
return D_800C54B0[player->character];
}
void func_80052F9C(s16 index) {
@ -172,21 +172,21 @@ void func_80052F9C(s16 index) {
}
void func_80052FD4(s16 index) {
playerMain* player = GetPlayerStruct(index);
if (player->playerObj != NULL) {
GW_PLAYER* player = GetPlayerStruct(index);
if (player->player_obj != NULL) {
EndProcess(player->process);
DestroyObject(player->playerObj);
player->playerObj = NULL;
DestroyObject(player->player_obj);
player->player_obj = NULL;
}
}
void func_80053020(void) {
s32 i;
playerMain* player;
GW_PLAYER* player;
for (i = 0; i < MAX_PLAYERS; i++) {
player = GetPlayerStruct(i);
player->playerObj = NULL;
player->player_obj = NULL;
}
D_800D8380 = 0;
}

6
src/54120.c
View File

@ -189,13 +189,13 @@ void func_800555D0(omObjData* arg0) {
var_s1 = 1;
arg0->scale.z -= 3.0f;
}
if (arg0->trans.x == 0.0f || gPlayers[arg0->work[0]].coins == 0) {
if (arg0->trans.x == 0.0f || GwPlayer[arg0->work[0]].coins == 0) {
PlaySound(0x58);
}
}
}
if (arg0->trans.x == 0.0f || gPlayers[arg0->work[0]].coins == 0) {
if (arg0->trans.x == 0.0f || GwPlayer[arg0->work[0]].coins == 0) {
D_800D84D0[arg0->work[0]] = 0;
omDelObj(arg0);
return;
@ -258,7 +258,7 @@ void func_80055A40(s32 arg1) {
for (i = 0; i < MAX_PLAYERS; i++) {
func_800543D8(i);
func_80054758(i, D_800C54D8[i + 4][0], D_800C54D8[i + 4][1]);
func_800546B4(i, gPlayers[i].turn_status);
func_800546B4(i, GwPlayer[i].turn_status);
}
D_800D83A0 = omAddPrcObj(func_80053A1C, 0U, 0x2000, 0);

12
src/57330.c
View File

@ -170,7 +170,7 @@ void func_80056AF4(void) {
}
void func_80056B78(void) {
playerMain* temp_v0;
GW_PLAYER* temp_v0;
GameStatus* gameStatus = &D_800ED5C0;
s32 i;
@ -225,8 +225,8 @@ void func_80056B78(void) {
for (i = 0; i < MAX_PLAYERS; i++) {
temp_v0 = GetPlayerStruct(i);
temp_v0->starAmount = 0;
temp_v0->poisonedFlag = 0;
temp_v0->stars = 0;
temp_v0->poisoned_flag = 0;
temp_v0->coins_total = 0;
temp_v0->coins_max = 0;
temp_v0->happening_count = 0;
@ -291,7 +291,7 @@ void func_80056E6C(void) {
while (1) {
switch (D_800D86FA) {
case 1:
func_8004B5DC(&gPlayers[D_800ED5DC].playerObj->coords);
func_8004B5DC(&GwPlayer[D_800ED5DC].player_obj->coords);
break;
case 2:
func_8004B5DC(&D_800D86FC);
@ -352,7 +352,7 @@ void func_800582E4(void) {
HuPrcVSleep();
func_8004A520();
func_8004B5C4(3.0f);
func_800591E0(gPlayers[D_800ED5DC].port); //TODO: what arg type should this take?
func_800591E0(GwPlayer[D_800ED5DC].port); //TODO: what arg type should this take?
func_80056AF4();
omOvlReturnEx(1);
omOvlKill();
@ -406,7 +406,7 @@ void func_8005884C(Vec3f *coords) {
func_8004A510();
if (coords == NULL) {
coords = &GetPlayerStruct(-1)->playerObj->coords;
coords = &GetPlayerStruct(-1)->player_obj->coords;
}
func_8004B5DC(coords);

28
src/72D90.c
View File

@ -1306,7 +1306,7 @@ s32 func_80076174(void) {
}
for (i = 0; i < MAX_PLAYERS; i++) {
if (D_800EDEB4[gPlayers[i].port] & 0xC000) {
if (D_800EDEB4[GwPlayer[i].port] & 0xC000) {
return 0;
}
}
@ -2466,8 +2466,8 @@ void func_8007B52C(void) {
if (D_800C6268[temp_fp].unk_00 == 2) {
for (i = 0, var_a0 = 0; i < MAX_PLAYERS; i++) {
if (var_a0 < gPlayers[i].unk_00) {
var_a0 = gPlayers[i].unk_00;
if (var_a0 < GwPlayer[i].group) {
var_a0 = GwPlayer[i].group;
}
}
@ -2475,18 +2475,18 @@ void func_8007B52C(void) {
var_s3 = 0;
var_s2 = 2;
for (i = 0; i < MAX_PLAYERS; i++) {
if (gPlayers[i].unk_00 == 0) {
func_8006DA5C(temp_v0, (void*) (s32) gPlayers[i].characterID + 44, var_s3);
func_8006DA5C(var_s6, (void*) (s32) gPlayers[i].characterID + 44, var_s3++);
if (GwPlayer[i].group == 0) {
func_8006DA5C(temp_v0, (void*) (s32) GwPlayer[i].character + 44, var_s3);
func_8006DA5C(var_s6, (void*) (s32) GwPlayer[i].character + 44, var_s3++);
} else {
func_8006DA5C(temp_v0, (void*) (s32) gPlayers[i].characterID + 44, var_s2);
func_8006DA5C(var_s6, (void*) (s32) gPlayers[i].characterID + 44, var_s2++);
func_8006DA5C(temp_v0, (void*) (s32) GwPlayer[i].character + 44, var_s2);
func_8006DA5C(var_s6, (void*) (s32) GwPlayer[i].character + 44, var_s2++);
}
}
} else {
for (i = 0; i < MAX_PLAYERS; i++) {
func_8006DA5C(temp_v0, (void*) (s32) gPlayers[i].characterID + 44, gPlayers[i].unk_00);
func_8006DA5C(var_s6, (void*) (s32) gPlayers[i].characterID + 44, gPlayers[i].unk_00);
func_8006DA5C(temp_v0, (void*) (s32) GwPlayer[i].character + 44, GwPlayer[i].group);
func_8006DA5C(var_s6, (void*) (s32) GwPlayer[i].character + 44, GwPlayer[i].group);
}
}
} else {
@ -2494,15 +2494,15 @@ void func_8007B52C(void) {
var_s3 = 0;
var_s2 = 1;
for (i = 0; i < MAX_PLAYERS; i++) {
if (gPlayers[i].unk_00 == 0) {
func_8006DA5C(temp_v0, (void*) (s32) gPlayers[i].characterID + 44, var_s3++);
if (GwPlayer[i].group == 0) {
func_8006DA5C(temp_v0, (void*) (s32) GwPlayer[i].character + 44, var_s3++);
} else {
func_8006DA5C(var_s6, (void*) (s32) gPlayers[i].characterID + 44, var_s2++);
func_8006DA5C(var_s6, (void*) (s32) GwPlayer[i].character + 44, var_s2++);
}
}
} else {
for (i = 0; i < MAX_PLAYERS; i++) {
func_8006DA5C(temp_v0, (void*) (s32) gPlayers[i].characterID + 44, i);
func_8006DA5C(temp_v0, (void*) (s32) GwPlayer[i].character + 44, i);
}
}
}

215
src/7CD60.c
View File

@ -66,7 +66,7 @@ extern Tree D_800E4E80;
extern Tree D_800E5690;
extern Tree D_800E5EA0;
extern Tree D_800E66B0;
extern u16 D_800E6EB2;
extern s16 D_800E6EB2;
extern s16 D_800E6EB4;
extern s16 D_800E6EB6;
extern u16* D_800E6EB8;
@ -93,7 +93,38 @@ extern unkStruct_D_800E6EC8 D_800E6F10;
/* Globals */
INCLUDE_ASM("asm/nonmatchings/7CD60", func_8007C160);
static inline u8 getBit(BitStream *buf)
{
u32 ret;
if (buf->bit == 0)
{
buf->value = *buf->pos++;
buf->bit = 0x80000000;
}
ret = (buf->value & buf->bit) != 0;
buf->bit >>= 1;
return ret;
}
static inline s16 getByte(BitStream *buf)
{
return (getBit(buf) << 7) | (getBit(buf) << 6) | (getBit(buf) << 5) | (getBit(buf) << 4) | (getBit(buf) << 3) | (getBit(buf) << 2) | (getBit(buf) << 1) | getBit(buf);
}
u32 func_8007C160(BitStream* arg0, Tree* arg1)
{
if (getBit(arg0)) {
s32 pos = D_800E6EB2++;
// read the 0 side of the tree
arg1->array[0][pos] = func_8007C160(arg0, arg1);
// read the 1 side of the tree
arg1->array[1][pos] = func_8007C160(arg0, arg1);
return pos;
}
return getByte(arg0);
}
INCLUDE_ASM("asm/nonmatchings/7CD60", func_8007C434);
@ -175,11 +206,19 @@ INCLUDE_ASM("asm/nonmatchings/7CD60", func_8007D470);
INCLUDE_ASM("asm/nonmatchings/7CD60", func_8007DA48);
/* color conversion */
extern u8 D_800E7730[];
#define tempMacro(y, pixY1, outbuf) \
do { \
y = *pixY1++ << 6; \
outbuf += D_800E7A30; \
} while (0)
#define UV_BASE ((s32)(16384*(513.0/512.0))) // 0x4020
#define CONVERT(U,V,UPTR,VPTR,R,G,B)\
V = *VPTR - 128;\
V = *(VPTR) - 128;\
R = 90 * v + UV_BASE;\
U = *UPTR - 128;\
U = *(UPTR) - 128;\
G = -22 * U + -46 * V + UV_BASE;\
B = 113 * U + UV_BASE;
@ -190,9 +229,6 @@ static inline u16 getRGB(s16 y, s16 ruv, s16 guv, s16 buv) {
(D_800E7730[(y + buv) >> 6] >> 2);
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/nonmatchings/7CD60", func_8007DC58);
#else
void func_8007DC58(u16* outbuf, u16* pixY, u16* pixU, u16* pixV) {
s32 i;
u16* pixY0, *pixY1, *pixY2;
@ -201,127 +237,88 @@ void func_8007DC58(u16* outbuf, u16* pixY, u16* pixU, u16* pixV) {
ruv2, guv2, buv2,
ruv3, guv3, buv3,
ruv4, guv4, buv4;
u16* curoutbuf = outbuf;
pixY1 = pixY;
pixY2 = pixY = pixY + 16;
i = 4;
while (i > 0) {
CONVERT(u, v, pixU, pixV, ruv1, guv1, buv1); pixV++; pixU++;
y = *pixY1++ << 6;
outbuf[0] = getRGB(y, ruv1, guv1, buv1);
y = *pixY1++ << 6;
outbuf[1] = getRGB(y, ruv1, guv1, buv1);
curoutbuf = outbuf;
CONVERT(u, v, pixU++, pixV++, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
CONVERT(u, v, pixU, pixV, ruv2, guv2, buv2); pixV++; pixU++;
y = *pixY1++ << 6;
outbuf[2] = getRGB(y, ruv2, guv2, buv2);
y = *pixY1++ << 6;
outbuf[3] = getRGB(y, ruv2, guv2, buv2);
CONVERT(u, v, pixU++, pixV++, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
CONVERT(u, v, pixU, pixV, ruv3, guv3, buv3); pixV++; pixU++;
y = *pixY2++ << 6;
outbuf[4] = getRGB(y, ruv3, guv3, buv3);
y = *pixY2++ << 6;
outbuf[5] = getRGB(y, ruv3, guv3, buv3);
CONVERT(u, v, pixU++, pixV++, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
CONVERT(u, v, pixU, pixV, ruv4, guv4, buv4); pixV++; pixU++;
y = *pixY2++ << 6;
outbuf[6] = getRGB(y, ruv4, guv4, buv4);
y = *pixY2++ << 6;
outbuf[7] = getRGB(y, ruv4, guv4, buv4);
do {
y = *pixY1++ << 6;
outbuf += D_800E7A30;
} while (0);
CONVERT(u, v, pixU++, pixV++, ruv4, guv4, buv4);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
outbuf += D_800E7A30;
curoutbuf = outbuf;
outbuf[0] = getRGB(y, ruv1, guv1, buv1);
y = *pixY1++ << 6;
outbuf[1] = getRGB(y, ruv1, guv1, buv1);
y = *pixY1++ << 6;
outbuf[2] = getRGB(y, ruv2, guv2, buv2);
y = *pixY1++ << 6;
outbuf[3] = getRGB(y, ruv2, guv2, buv2);
y = *pixY2++ << 6;
outbuf[4] = getRGB(y, ruv3, guv3, buv3);
y = *pixY2++ << 6;
outbuf[5] = getRGB(y, ruv3, guv3, buv3);
y = *pixY2++ << 6;
outbuf[6] = getRGB(y, ruv4, guv4, buv4);
y = *pixY2++ << 6;
outbuf[7] = getRGB(y, ruv4, guv4, buv4);
i-= 2;
do {
outbuf += D_800E7A30;
} while (0);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
i-=2;
outbuf += D_800E7A30;
}
pixY1 = pixY + 16;
pixY2 = pixY1 + 32;
pixY = pixY + 16;
pixY1 = pixY;
pixY2 = pixY + 16;
i = 4;
while (i > 0) {
y = *pixY1++ << 6;
curoutbuf = outbuf;
CONVERT(u, v, pixU++, pixV++, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
CONVERT(u, v, pixU++, pixV++, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
CONVERT(u, v, pixU++, pixV++, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
CONVERT(u, v, pixU++, pixV++, ruv4, guv4, buv4);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
CONVERT(u, v, pixU, pixV, ruv1, guv1, buv1); pixV++; pixU++;
outbuf += D_800E7A30;
curoutbuf = outbuf;
outbuf[0] = getRGB(y, ruv1, guv1, buv1);
y = *pixY1++ << 6;
outbuf[1] = getRGB(y, ruv1, guv1, buv1);
y = *pixY1++ << 6;
CONVERT(u, v, pixU, pixV, ruv2, guv2, buv2); pixV++; pixU++;
outbuf[2] = getRGB(y, ruv2, guv2, buv2);
y = *pixY1++ << 6;
outbuf[3] = getRGB(y, ruv2, guv2, buv2);
y = *pixY2++ << 6;
CONVERT(u, v, pixU, pixV, ruv3, guv3, buv3); pixV++; pixU++;
outbuf[4] = getRGB(y, ruv3, guv3, buv3);
y = *pixY2++ << 6;
outbuf[5] = getRGB(y, ruv3, guv3, buv3);
y = *pixY2++ << 6;
CONVERT(u, v, pixU, pixV, ruv4, guv4, buv4); pixV++; pixU++;
outbuf[6] = getRGB(y, ruv4, guv4, buv4);
y = *pixY2++ << 6;
outbuf[7] = getRGB(y, ruv4, guv4, buv4);
y = *pixY1++ << 6;
{outbuf += D_800E7A30;}
outbuf[0] = getRGB(y, ruv1, guv1, buv1);
y = *pixY1++ << 6;
outbuf[1] = getRGB(y, ruv1, guv1, buv1);
y = *pixY1++ << 6;
outbuf[2] = getRGB(y, ruv2, guv2, buv2);
y = *pixY1++ << 6;
outbuf[3] = getRGB(y, ruv2, guv2, buv2);
y = *pixY2++ << 6;
outbuf[4] = getRGB(y, ruv3, guv3, buv3);
y = *pixY2++ << 6;
outbuf[5] = getRGB(y, ruv3, guv3, buv3);
y = *pixY2++ << 6;
outbuf[6] = getRGB(y, ruv4, guv4, buv4);
y = *pixY2++ << 6;
outbuf[7] = getRGB(y, ruv4, guv4, buv4);
i-= 2;
do {
outbuf += D_800E7A30;
} while (0);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv1, guv1, buv1);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY1++ << 6, ruv2, guv2, buv2);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv3, guv3, buv3);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
*curoutbuf++ = getRGB(*pixY2++ << 6, ruv4, guv4, buv4);
i-=2;
outbuf += D_800E7A30;
}
}
#endif
extern void func_8007EE54(u16*);
INCLUDE_ASM("asm/nonmatchings/7CD60", func_8007EE54);
@ -377,7 +374,7 @@ void func_8007F2FC(u16* arg0) {
}
/* DECODE */
extern u16 func_8007C160(BitStream*, Tree*);
extern u32 func_8007C160(BitStream*, Tree*);
extern void func_8007C434();
extern void func_8007CA90();

14
src/engine/gameman.c
View File

@ -145,18 +145,18 @@ void func_8001A498(void) {
for (i = 0; i < MAX_PLAYERS; i++) {
if (i < D_800F3778) {
D_800ED558[i] = 0;
gPlayers[i].flags = gPlayers[i].flags & ~1;
GwPlayer[i].flags = GwPlayer[i].flags & ~1;
} else {
D_800ED558[i] = 1;
gPlayers[i].flags = gPlayers[i].flags | 1;
GwPlayer[i].flags = GwPlayer[i].flags | 1;
}
gPlayers[i].port = i;
gPlayers[i].coins = 10;
gPlayers[i].coins_mg = 0;
gPlayers[i].unk_00 = i;
GwPlayer[i].port = i;
GwPlayer[i].coins = 10;
GwPlayer[i].coins_mg = 0;
GwPlayer[i].group = i;
func_80052CCC(i, 1);
gPlayers[i].starAmount = 0;
GwPlayer[i].stars = 0;
}
func_800594E4(0, 0x4650);

2
src/overlays/ovl_00_MemoryMatch/CDA50.c
View File

@ -155,7 +155,7 @@ void func_800F7874_MemoryMatch(omObjData* arg0) {
case 0:
func_80075CCC(2);
if (D_800FE30E_MemoryMatch < 2) {
gPlayers[D_800FE30C_MemoryMatch].coins_mg += 2;
GwPlayer[D_800FE30C_MemoryMatch].coins_mg += 2;
}
D_800FD878_MemoryMatch++;
break;

16
src/overlays/ovl_01_ChanceTime/D51E0.c
View File

@ -19,7 +19,7 @@ void func_800F7818_ChanceTime(s32 arg0) {
s32 temp_a1;
s32 temp_a2;
temp_v0 = gPlayers[D_80101AAE_ChanceTime].characterID;
temp_v0 = GwPlayer[D_80101AAE_ChanceTime].character;
temp_a1 = D_800C59AC[temp_v0].unk_00;
temp_a2 = D_800C59AC[temp_v0].unk_04;
@ -41,7 +41,7 @@ void func_800F80D8_ChanceTime(s32 arg0) {
s32 temp2;
s32 temp3;
temp_v1 = gPlayers[D_80101AAF_ChanceTime].characterID;
temp_v1 = GwPlayer[D_80101AAF_ChanceTime].character;
temp2 = D_800C59AC[temp_v1].unk_00;
temp3 = D_800C59AC[temp_v1].unk_04;
func_800F7E08_ChanceTime(arg0, temp2, temp3, D_80101AAF_ChanceTime, -800.0f, 10.0f, 800.0f);
@ -52,7 +52,7 @@ void func_800F8168_ChanceTime(s32 arg0) {
s32 temp2;
s32 temp3;
temp_v1 = gPlayers[D_80101AB0_ChanceTime].characterID;
temp_v1 = GwPlayer[D_80101AB0_ChanceTime].character;
temp2 = D_800C59AC[temp_v1].unk_00;
temp3 = D_800C59AC[temp_v1].unk_04;
func_800F7E08_ChanceTime(arg0, temp2, temp3, D_80101AB0_ChanceTime, -700.0f, 10.0f, 800.0f);
@ -63,7 +63,7 @@ void func_800F81F8_ChanceTime(s32 arg0) {
s32 temp2;
s32 temp3;
temp_v1 = gPlayers[D_80101AB1_ChanceTime].characterID;
temp_v1 = GwPlayer[D_80101AB1_ChanceTime].character;
temp2 = D_800C59AC[temp_v1].unk_00;
temp3 = D_800C59AC[temp_v1].unk_04;
func_800F7E08_ChanceTime(arg0, temp2, temp3, D_80101AB1_ChanceTime, -600.0f, 10.0f, 800.0f);
@ -143,11 +143,11 @@ void func_800F9B50_ChanceTime(void) {
ShowTextWindow(var_s0);
if (D_8010175C_ChanceTime == 0) {
func_8006DA5C(var_s0, D_80101330_ChanceTime[gPlayers[D_801012E0_ChanceTime].characterID], 0);
func_8006DA5C(var_s0, D_80101330_ChanceTime[gPlayers[D_801012E1_ChanceTime].characterID], 1);
func_8006DA5C(var_s0, D_80101330_ChanceTime[GwPlayer[D_801012E0_ChanceTime].character], 0);
func_8006DA5C(var_s0, D_80101330_ChanceTime[GwPlayer[D_801012E1_ChanceTime].character], 1);
} else {
func_8006DA5C(var_s0, D_80101330_ChanceTime[gPlayers[D_801012E1_ChanceTime].characterID], 0);
func_8006DA5C(var_s0, D_80101330_ChanceTime[gPlayers[D_801012E0_ChanceTime].characterID], 1);
func_8006DA5C(var_s0, D_80101330_ChanceTime[GwPlayer[D_801012E1_ChanceTime].character], 0);
func_8006DA5C(var_s0, D_80101330_ChanceTime[GwPlayer[D_801012E0_ChanceTime].character], 1);
}
if (D_801011F6_ChanceTime == 0) {

14
src/overlays/ovl_03_BuriedTreasure/E8F60.c
View File

@ -134,7 +134,7 @@ void func_800F6958_BuriedTreasure(void) {
if (D_800FC022_BuriedTreasure == 0) {
D_800FC020_BuriedTreasure++;
if (D_800FC034_BuriedTreasure >= 0) {
func_80075CCC(4, gPlayers[D_800FC034_BuriedTreasure].characterID);
func_80075CCC(4, GwPlayer[D_800FC034_BuriedTreasure].character);
D_800FC022_BuriedTreasure = 84;
} else {
func_80075CCC(0x11);
@ -210,7 +210,7 @@ void func_800F6EC4_BuriedTreasure(omObjData* arg0) {
s32 temp_s2;
s16 temp_v1;
temp_v1 = gPlayers[D_800FBA74_BuriedTreasure[D_800FC02C_BuriedTreasure]].characterID;
temp_v1 = GwPlayer[D_800FBA74_BuriedTreasure[D_800FC02C_BuriedTreasure]].character;
temp_s2 = D_800C59AC[temp_v1].unk_00;
arg0->model[0] = LoadFormFile(temp_s2 | D_800C59AC[temp_v1].unk_04, 0x69D);
@ -239,7 +239,7 @@ void func_800F6EC4_BuriedTreasure(omObjData* arg0) {
temp_s1->unk_50 = 0;
temp_s1->unk_52 = 0;
temp_s1->unk_56 = gPlayers[D_800FC02C_BuriedTreasure].port;
temp_s1->unk_56 = GwPlayer[D_800FC02C_BuriedTreasure].port;
temp_s1->unk_C0 = 65535;
func_8001874C(arg0, 0, temp_s2 | 0x40, 1, 0);
@ -315,7 +315,7 @@ void func_800F7164_BuriedTreasure(omObjData* arg0) {
temp_v0->unk_1C = temp_v0->unk_10;
if (D_800FC024_BuriedTreasure == 0) {
if (!(gPlayers[temp_v0->unk_40].unk_06 & 1)) {
if (!(GwPlayer[temp_v0->unk_40].unk_06 & 1)) {
temp_v0_4 = func_80009C90(arg0, D_800ECE14[temp_s0], D_800F3843[temp_s0]);
var_s4 = temp_v0_4 >> 16;
var_s5 = temp_v0_4;
@ -364,7 +364,7 @@ void func_800F7164_BuriedTreasure(omObjData* arg0) {
}
if (temp_s1->unk_40 != 0.0) {
if (!(gPlayers[temp_v0->unk_40].unk_06 & 1) && temp_v0->unk_08 != 0) {
if (!(GwPlayer[temp_v0->unk_40].unk_06 & 1) && temp_v0->unk_08 != 0) {
var_f22 = func_800B0CD8(var_s4, -var_s5) + D_800FBEA8_BuriedTreasure;
} else {
var_f22 = temp_v0->unk_3E;
@ -574,7 +574,7 @@ s16 func_800F8334_BuriedTreasure(unkStructSize0x5C* arg0) {
for (i = 0; i < ARRAY_COUNT(D_800FC5C0_BuriedTreasure); i++) {
temp_s1 = &D_800FC5C0_BuriedTreasure[i];
temp_s0 = temp_s1->unk_12;
if ((func_800F8940_BuriedTreasure() & 0xFF) < temp_s0 * 28 + gPlayers[arg0->unk_40].cpuDifficulty * 8) {
if ((func_800F8940_BuriedTreasure() & 0xFF) < temp_s0 * 28 + GwPlayer[arg0->unk_40].cpu_difficulty * 8) {
arg0->unk_02 |= 4;
arg0->unk_44 = temp_s1->unk_0C - 160;
arg0->unk_46 = temp_s1->unk_0E - 120;
@ -637,7 +637,7 @@ s32 func_800F85B4_BuriedTreasure(omObjData* arg0) {
temp_v0->unk_3E += 360;
}
if ((func_800F8940_BuriedTreasure() & 0xFF) < gPlayers[temp_v0->unk_40].cpuDifficulty * 8 + 56) {
if ((func_800F8940_BuriedTreasure() & 0xFF) < GwPlayer[temp_v0->unk_40].cpu_difficulty * 8 + 56) {
var_s1 |= 0x8000;
}

2
src/overlays/ovl_03_BuriedTreasure/EB0E0.c
View File

@ -510,7 +510,7 @@ void func_800FA0B4_BuriedTreasure(void) {
func_800FA90C_BuriedTreasure();
if (D_800FC5EC_BuriedTreasure < 0 && func_800FB780_BuriedTreasure() == 2) {
gPlayers[D_800FC5EC_BuriedTreasure].coins_mg += 10;
GwPlayer[D_800FC5EC_BuriedTreasure].coins_mg += 10;
func_80060F04(D_800FC5EC_BuriedTreasure, 20, 0, 20);
}
}

2
src/overlays/ovl_0D_CrazyCutter/1250D0.c
View File

@ -262,7 +262,7 @@ void func_800FAA18_CrazyCutter(Object* arg0) {
if (func_80072718() == 0) {
for (i = 0; i < 4; i++) {
if (func_800FAAB0_CrazyCutter(i, 0x4000) == 0) {
gPlayers[i].coins_mg += 10;
GwPlayer[i].coins_mg += 10;
}
}
func_800601D4(0x28);

4
src/overlays/ovl_18_PlatformPeril/16C6A0.c
View File

@ -76,7 +76,7 @@ void func_800F922C_PlatformPeril(omObjData* arg0, s32 arg1, s32 arg2, u16 arg3,
s32 temp = 0x699;
func_8000979C(arg0, arg1, arg2, arg3, temp, temp);
D_800FE2A0_PlatformPeril[arg3] = gPlayers[arg3].cpuDifficulty;
D_800FE2A0_PlatformPeril[arg3] = GwPlayer[arg3].cpu_difficulty;
func_800187D0(arg0, 0, arg1, 1, 0);
func_800187D0(arg0, 1, arg1 | 1, 1, 0);
func_800187D0(arg0, 2, arg1 | 3, 1, 0);
@ -107,7 +107,7 @@ void func_800F922C_PlatformPeril(omObjData* arg0, s32 arg1, s32 arg2, u16 arg3,
arg0->func_ptr = &func_800F979C_PlatformPeril;
arg0->work[0] = arg3;
if (gPlayers[arg3].flags & 1) { //checking if CPU?
if (GwPlayer[arg3].flags & 1) { //checking if CPU?
arg0->work[1] = 1;
} else {
arg0->work[1] = 0;

2
src/overlays/ovl_1E_BumperBalls/191700.c
View File

@ -10,7 +10,7 @@ void func_800F65E0_BumperBalls(void) {
D_800FCD1E_BumperBalls = 4;
for (i = 0; i < 4; i++) {
if (gPlayers[i].flags & 1) {
if (GwPlayer[i].flags & 1) {
D_800FCD1E_BumperBalls--;
}
}

2
src/overlays/ovl_28_ShyGuySays/1D9690.c
View File

@ -104,7 +104,7 @@ void func_800F6E50_ShyGuySays(omObjData* arg0) {
func_80075CCC(2);
temp_v1_2 = &D_800FD9C0_ShyGuySays[D_800FDC1E_ShyGuySays];
if ((temp_v1_2->unk_00 != 0) && (temp_v1_2->unk_04 != 0x200)) {
gPlayers[D_800FDC1E_ShyGuySays].coins_mg += 10;
GwPlayer[D_800FDC1E_ShyGuySays].coins_mg += 10;
}
D_800FD5CE_ShyGuySays++;
return;

2
src/overlays/ovl_2C_KeyPaWay/1F62C0.c
View File

@ -15,7 +15,7 @@ void func_800F65E0_KeyPaWay(void) {
D_800FF538_KeyPaWay = 0;
for (i = 0; i < 4; i++) {
if (!(gPlayers[i].flags & 1)) {
if (!(GwPlayer[i].flags & 1)) {
D_800FF538_KeyPaWay += 1;
}
}

2
src/overlays/ovl_2D_RunningOfTheBulb/1FF1E0.c
View File

@ -650,7 +650,7 @@ s32 func_800FDDC0_RunningOfTheBulb(omObjData* arg0) {
temp_v0 = D_800FE460_RunningOfTheBulb[i];
temp_s0->unk_3C = func_800B0CD8(0.0f - temp_v0->trans.x, -2235.0f - temp_v0->trans.z);
func_80009E20(D_800FE460_RunningOfTheBulb[i]);
gPlayers[i].coins_mg += 10;
GwPlayer[i].coins_mg += 10;
}
if (temp_s3->unk0 & 0x40) {
func_800186E4(D_800FE460_RunningOfTheBulb[i], 1, 0x23);

4
src/overlays/ovl_36_DKsJungleAdventure/2418D0.c
View File

@ -352,7 +352,7 @@ INCLUDE_ASM("asm/nonmatchings/overlays/ovl_36_DKsJungleAdventure/2418D0", func_8
// void func_800F7024_DKsJungleAdventure(void) { //ov054_SetupRoutine
// s32 player_index;
// playerMain* player;
// GW_PLAYER* player;
// omInitObjMan(80, 40); // InitObjectSystem
// func_80060088();
@ -371,7 +371,7 @@ INCLUDE_ASM("asm/nonmatchings/overlays/ovl_36_DKsJungleAdventure/2418D0", func_8
// for (player_index = 0; player_index < 4; player_index++) {
// player = GetPlayerStruct(player_index);
// func_8003E174(player->obj);
// player->playerObj->unk_0A |= 2;
// player->player_obj->unk_0A |= 2;
// }
// if (IsFlagSet(0x4e)) {

90
src/overlays/ovl_3D_EternalStar/254480.c
View File

@ -172,11 +172,11 @@ EventTableEntry D_800F9164_EternalStar[] = {
void func_8004DBD4(s32, u8);
s16 func_800F6610_EternalStar(void) {
s16 curSpaceIndex = GetCurrentSpaceIndex();
s16 cur_space = GetCurrentSpaceIndex();
s32 i;
for (i = 0; i < ARRAY_COUNT(D_800F8BE0_EternalStar); i++) {
if (curSpaceIndex == D_800F8BD0_EternalStar[i]) {
if (cur_space == D_800F8BD0_EternalStar[i]) {
return D_800F8BE0_EternalStar[i];
}
}
@ -383,7 +383,7 @@ void InitBoard(void) {
}
void func_800F6E34_EternalStar(void) {
playerMain* temp_s0;
GW_PLAYER* temp_s0;
s32 i;
omInitObjMan(0x50, 0x28);
@ -400,8 +400,8 @@ void func_800F6E34_EternalStar(void) {
for (i = 0; i < 4; i++) {
temp_s0 = GetPlayerStruct(i);
func_8003E174(temp_s0->playerObj);
temp_s0->playerObj->unk_0A |= 2;
func_8003E174(temp_s0->player_obj);
temp_s0->player_obj->unk_0A |= 2;
}
if (IsFlagSet(0x4E) != 0) {
@ -419,8 +419,8 @@ void func_800F6E34_EternalStar(void) {
}
void func_800F6F68_EternalStar(void) {
playerMain* playerNoFeatureFlag;
playerMain* playerFeatureFlag;
GW_PLAYER* playerNoFeatureFlag;
GW_PLAYER* playerFeatureFlag;
s32 i;
func_80060128(0xF);
@ -437,16 +437,16 @@ void func_800F6F68_EternalStar(void) {
if (IsFlagSet(0x4F) != 0) {
playerNoFeatureFlag = GetPlayerStruct(-1);
ClearBoardFeatureFlag(0x4F);
func_800A0D50(&playerNoFeatureFlag->playerObj->coords, &GetSpaceData(0x4E)->coords);
func_800A0E80(&playerNoFeatureFlag->playerObj->unk_18, &GetSpaceData(2)->coords, &playerNoFeatureFlag->playerObj->coords);
func_800A0D50(&playerNoFeatureFlag->player_obj->coords, &GetSpaceData(0x4E)->coords);
func_800A0E80(&playerNoFeatureFlag->player_obj->unk_18, &GetSpaceData(2)->coords, &playerNoFeatureFlag->player_obj->coords);
}
if (IsFlagSet(0x50) != 0) {
ClearBoardFeatureFlag(0x50);
for (i = 0; i < 4; i++) {
playerFeatureFlag = GetPlayerStruct(i);
playerFeatureFlag->playerObj->unk_0A &= ~2;
func_8003E664(playerFeatureFlag->playerObj);
playerFeatureFlag->player_obj->unk_0A &= ~2;
func_8003E664(playerFeatureFlag->player_obj);
}
}
}
@ -822,15 +822,15 @@ void func_800F7D20_EternalStar(void) {
Object* func_800F7D6C_EternalStar(s16 arg0) {
Object* temp_s0;
playerMain* temp_s1 = GetPlayerStruct(arg0);
GW_PLAYER* temp_s1 = GetPlayerStruct(arg0);
if (temp_s1->player_index == GetCurrentPlayerIndex()) {
temp_s0 = CreateObject(temp_s1->characterID, NULL);
temp_s0 = CreateObject(temp_s1->character, NULL);
} else {
temp_s0 = CreateObject(func_80052F6C(arg0), NULL);
}
func_800A0D50(&temp_s0->coords, &temp_s1->playerObj->coords);
func_800A0D50(&temp_s0->unk_18, &temp_s1->playerObj->unk_18);
func_800A0D50(&temp_s0->coords, &temp_s1->player_obj->coords);
func_800A0D50(&temp_s0->unk_18, &temp_s1->player_obj->unk_18);
func_80025930(*temp_s0->unk_3C->unk_40, 0, 0x8000);
func_80025930(*temp_s0->unk_40->unk_40, 0, 0x8000);
func_80021240(*temp_s0->unk_3C->unk_40);
@ -875,43 +875,43 @@ void func_800F7F7C_EternalStar(void) {
Object* temp_s3;
Process* process;
SpaceData* space;
playerMain* player = GetPlayerStruct(-1);
GW_PLAYER* player = GetPlayerStruct(-1);
player->playerObj->unk_0A &= ~2;
func_8003E664(player->playerObj);
player->player_obj->unk_0A &= ~2;
func_8003E664(player->player_obj);
temp_s3 = func_800F7D6C_EternalStar(-1);
temp_s1 = CreateObject(0x4C, NULL);
func_80025EB4(*temp_s1->unk_3C->unk_40, 2, 0);
func_800A0D50(&temp_s1->coords, &player->playerObj->coords);
func_800A0D50(&temp_s1->coords, &player->player_obj->coords);
func_80058910(-1, 3);
PlaySound(0x47);
func_800F7EE0_EternalStar(temp_s3);
DestroyObject(temp_s1);
space = GetSpaceData(GetAbsSpaceIndexFromChainSpaceIndex(player->nextChainIndex, player->nextSpaceIndex));
space = GetSpaceData(GetAbsSpaceIndexFromChainSpaceIndex(player->next_chain, player->next_space));
process = HuPrcCurrentGet();
HuPrcChildLink(process, func_8004D648(&player->playerObj->coords, &space->coords, &player->playerObj->coords, 25.0f));
HuPrcChildLink(process, func_8004D648(&player->player_obj->coords, &space->coords, &player->player_obj->coords, 25.0f));
HuPrcChildWatch();
SetPlayerOntoChain(-1, player->nextChainIndex, player->nextSpaceIndex);
SetPlayerOntoChain(-1, player->next_chain, player->next_space);
temp_s1 = CreateObject(0x4C, NULL);
func_80025EB4(*temp_s1->unk_3C->unk_40, 2, 0);
func_800A0D50(&temp_s1->coords, &player->playerObj->coords);
func_800A0D50(&temp_s1->coords, &player->player_obj->coords);
PlaySound(0x47);
func_800A0D50(&temp_s3->coords, &player->playerObj->coords);
func_800A0D50(&temp_s3->unk_18, &player->playerObj->unk_18);
func_800A0D50(&temp_s3->coords, &player->player_obj->coords);
func_800A0D50(&temp_s3->unk_18, &player->player_obj->unk_18);
func_800F7E78_EternalStar(temp_s3);
DestroyObject(temp_s1);
func_800F7E5C_EternalStar(temp_s3);
func_8003E5E0(player->playerObj);
player->playerObj->unk_0A |= 2;
func_8003E5E0(player->player_obj);
player->player_obj->unk_0A |= 2;
}
void func_800F8130_EternalStar(void) {
playerMain* player = GetPlayerStruct(-1);
s16 curSpaceIndex = GetCurrentSpaceIndex();
GW_PLAYER* player = GetPlayerStruct(-1);
s16 cur_space = GetCurrentSpaceIndex();
s32 i;
for (i = 0; i < ARRAY_COUNT(D_800F8F08_EternalStar); i++) {
if (D_800F8F08_EternalStar[i] != curSpaceIndex) {
if (D_800F8F08_EternalStar[i] != cur_space) {
continue;
} else {
while (func_8004B850() != 0) {
@ -942,7 +942,7 @@ void func_800F8240_EternalStar(void) {
void func_800F8298_EternalStar(void) {
Vec3f sp10;
playerMain* player;
GW_PLAYER* player;
s16 textWindowID;
SpaceData* temp_s0;
s32 tempVar;
@ -958,21 +958,21 @@ void func_800F8298_EternalStar(void) {
func_800F7F7C_EternalStar();
SetPlayerAnimation(-1, 0, 2);
temp_s0 = GetSpaceData(GetAbsSpaceIndexFromChainSpaceIndex(0x12, 1));
func_800A0E80(&player->playerObj->unk_18, &temp_s0->coords, &player->playerObj->coords);
func_8004D3F4(&player->playerObj->coords, &temp_s0->coords, &player->playerObj->coords, 0xF);
func_800A0E80(&player->player_obj->unk_18, &temp_s0->coords, &player->player_obj->coords);
func_8004D3F4(&player->player_obj->coords, &temp_s0->coords, &player->player_obj->coords, 0xF);
HuPrcSleep(0xF);
SetPlayerOntoChain(-1, 0x12, 1);
SetPlayerAnimation(-1, -1, 2);
HuPrcSleep(0xF);
func_800A0D50(&sp10, &player->playerObj->unk_18);
func_800A0D50(&sp10, &player->player_obj->unk_18);
func_8003D514(&sp10, -90.0f);
func_8004D1EC(&player->playerObj->unk_18, &sp10, &player->playerObj->unk_18, 4);
func_8004D1EC(&player->player_obj->unk_18, &sp10, &player->player_obj->unk_18, 4);
HuPrcSleep(4);
func_8003D514(&sp10, 170.0f);
func_8004D1EC(&player->playerObj->unk_18, &sp10, &player->playerObj->unk_18, 8);
func_8004D1EC(&player->player_obj->unk_18, &sp10, &player->player_obj->unk_18, 8);
HuPrcSleep(8);
func_8003D514(&sp10, -80.0f);
func_8004D1EC(&player->playerObj->unk_18, &sp10, &player->playerObj->unk_18, 4);
func_8004D1EC(&player->player_obj->unk_18, &sp10, &player->player_obj->unk_18, 4);
HuPrcSleep(4);
tempVar = D_800ED100.boardRam[15];
@ -1016,8 +1016,8 @@ void func_800F8514_EternalStar(void) {
}
void func_800F8588_EternalStar(void) {
playerMain* temp_s0_3;
playerMain* curPlayer;
GW_PLAYER* temp_s0_3;
GW_PLAYER* curPlayer;
s32 playerIndex;
Object* objectStructs[4];
s32 i;
@ -1041,8 +1041,8 @@ void func_800F8588_EternalStar(void) {
}
func_800F7E5C_EternalStar(objectStructs[playerIndex]);
curPlayer->playerObj->unk_0A |= 2;
func_8003E5E0(curPlayer->playerObj);
curPlayer->player_obj->unk_0A |= 2;
func_8003E5E0(curPlayer->player_obj);
HuPrcSleep(0xA);
for (j = 0; j < 4; j++) {
@ -1070,8 +1070,8 @@ void func_800F8588_EternalStar(void) {
temp_s0_3 = GetPlayerStruct(j);
if (temp_s0_3 != curPlayer) {
func_800F7E5C_EternalStar(objectStructs[j]);
temp_s0_3->playerObj->unk_0A |= 2;
func_8003E5E0(temp_s0_3->playerObj);
temp_s0_3->player_obj->unk_0A |= 2;
func_8003E5E0(temp_s0_3->player_obj);
}
}
@ -1158,13 +1158,13 @@ void func_800F8A30_EternalStar(void) {
}
void func_800F8A94_EternalStar(void) {
playerMain* temp_s0;
GW_PLAYER* temp_s0;
s32 i;
if (func_800F67AC_EternalStar(GetCurrentSpaceIndex()) == 2) {
for (i = 0; i < 4; i++) {
temp_s0 = GetPlayerStruct(i);
temp_s0->unk_00 = i != GetCurrentPlayerIndex();
temp_s0->group = i != GetCurrentPlayerIndex();
}
func_800587BC(1, 0, 5, 1);
}

28
src/overlays/ovl_3E_FirstMap/257020.c
View File

@ -18,7 +18,7 @@ void func_800F664C_FirstMap(void) {
func_800F6B0C_FirstMap();
for (i = 0; i < MAX_PLAYERS; i++) {
GetPlayerStruct(i)->characterID = D_800F8750_FirstMap[i];
GetPlayerStruct(i)->character = D_800F8750_FirstMap[i];
}
omOvlReturnEx(1);
@ -229,7 +229,7 @@ void func_800F6E20_FirstMap(void) {
func_8004B838(4.0f);
while (1) {
if (D_800F88A0_FirstMap < 0) {
func_8004B5DC(&GetPlayerStruct(CURRENT_PLAYER)->playerObj->coords);
func_8004B5DC(&GetPlayerStruct(CURRENT_PLAYER)->player_obj->coords);
} else {
func_8004B5DC(&GetSpaceData(D_800F88A0_FirstMap)->coords);
}
@ -249,7 +249,7 @@ void func_800F6EFC_FirstMap(void) {
}
void func_800F6F38_FirstMap(void) {
playerMain* player;
GW_PLAYER* player;
s32 i;
for (i = 0; i < 4; i++) {
@ -269,7 +269,7 @@ void func_800F6F80_FirstMap(void) {
}
void func_800F6FC4_FirstMap(void) {
playerMain* temp_s0;
GW_PLAYER* temp_s0;
s32 i;
if (++D_800ED5DC >= 4) {
@ -280,9 +280,9 @@ void func_800F6FC4_FirstMap(void) {
func_80052FD4(i);
func_80052E84(i);
temp_s0 = GetPlayerStruct(i);
func_8003E174(temp_s0->playerObj);
temp_s0->playerObj->unk_0A |= 2;
func_8004CC8C(i, GetAbsSpaceIndexFromChainSpaceIndex(temp_s0->curChainIndex, temp_s0->curSpaceIndex));
func_8003E174(temp_s0->player_obj);
temp_s0->player_obj->unk_0A |= 2;
func_8004CC8C(i, GetAbsSpaceIndexFromChainSpaceIndex(temp_s0->cur_chain, temp_s0->cur_space));
func_8004CDA0(i);
}
}
@ -312,8 +312,8 @@ INCLUDE_ASM("asm/nonmatchings/overlays/ovl_3E_FirstMap/257020", func_800F714C_Fi
void func_800F73A0_FirstMap(void) {
GameStatus* gameStatus = &D_800ED5C0;
playerMain* player = GetPlayerStruct(CURRENT_PLAYER);
SpaceData* space = GetSpaceData(GetAbsSpaceIndexFromChainSpaceIndex(player->curChainIndex, player->curSpaceIndex));
GW_PLAYER* player = GetPlayerStruct(CURRENT_PLAYER);
SpaceData* space = GetSpaceData(GetAbsSpaceIndexFromChainSpaceIndex(player->cur_chain, player->cur_space));
SetPlayerLandedSpaceType(-1, space->spaceType);
func_800546B4(D_800ED5DC, player->turn_status);
@ -508,7 +508,7 @@ void func_800F83D4_FirstMap(void) {
}
void func_800F852C_FirstMap(void) {
playerMain* player;
GW_PLAYER* player;
s32 i;
s16 absSpaceIndex;
@ -528,8 +528,8 @@ void func_800F852C_FirstMap(void) {
for (i = 0; i < 4; i++) {
player = GetPlayerStruct(i);
func_8003E174(player->playerObj);
player->playerObj->unk_0A |= 2;
func_8003E174(player->player_obj);
player->player_obj->unk_0A |= 2;
player->coins = 0xA;
}
@ -541,7 +541,7 @@ void func_800F852C_FirstMap(void) {
for (i = 0; i < 4; i++) {
player = GetPlayerStruct(i);
absSpaceIndex = GetAbsSpaceIndexFromChainSpaceIndex(player->curChainIndex, player->curSpaceIndex);
absSpaceIndex = GetAbsSpaceIndexFromChainSpaceIndex(player->cur_chain, player->cur_space);
func_8004CC8C(i, absSpaceIndex);
func_8004CDA0(i);
}
@ -549,7 +549,7 @@ void func_800F852C_FirstMap(void) {
func_8004A510();
func_8004B5C4(1.0f);
func_8004B838(-1.0f);
func_8004B5DC(&GetPlayerStruct(CURRENT_PLAYER)->playerObj->coords);
func_8004B5DC(&GetPlayerStruct(CURRENT_PLAYER)->player_obj->coords);
omAddPrcObj(func_800F77B4_FirstMap, 0x1005, 0, 0);
omAddPrcObj(func_800F6E20_FirstMap, 0x1005, 0, 0);
omPrcSetStatBit(omAddPrcObj(func_800F83D4_FirstMap, 0x1005, 0, 0), 0x80);

8
src/overlays/ovl_40_ResultsScene/259EB0.c
View File

@ -6,8 +6,8 @@ void func_800F65E0_ResultsScene(void) {
omInitObjMan(0x64, 0x50);
D_800FC440_ResultsScene = 0;
for (i = 0; i < 4; i++) {
D_800FC430_ResultsScene[D_800ED100.boardRam[i]] = gPlayers[D_800ED100.boardRam[i]].coins;
if (!(gPlayers[D_800ED100.boardRam[i]].flags & 1)) {
D_800FC430_ResultsScene[D_800ED100.boardRam[i]] = GwPlayer[D_800ED100.boardRam[i]].coins;
if (!(GwPlayer[D_800ED100.boardRam[i]].flags & 1)) {
D_800FC440_ResultsScene += D_800FC430_ResultsScene[D_800ED100.boardRam[i]];
}
}
@ -15,8 +15,8 @@ void func_800F65E0_ResultsScene(void) {
D_800FC448_ResultsScene = 0;
for (i = 0; i < 4; i++) {
if (!(gPlayers[D_800ED100.boardRam[i]].flags & 1)) {
D_800FC448_ResultsScene += gPlayers[D_800ED100.boardRam[i]].starAmount + D_800ED100.boardRam[D_800ED100.boardRam[i] + 10];
if (!(GwPlayer[D_800ED100.boardRam[i]].flags & 1)) {
D_800FC448_ResultsScene += GwPlayer[D_800ED100.boardRam[i]].stars + D_800ED100.boardRam[D_800ED100.boardRam[i] + 10];
}
}

22
src/overlays/ovl_41_YoshisTropicalIslandEndingScene/2721F0.c
View File

@ -1,25 +1,25 @@
#include "2721F0.h"
void func_80108B60_YoshisTropicalIslandEndingScene(omObjData* arg0) {
if ((gPlayers[arg0->work[0]].playerObj->unk_34 <= 0.0f) && (gPlayers[arg0->work[0]].playerObj->unk_30 <= 0.0f)) {
gPlayers[arg0->work[0]].playerObj->unk_30 = 0.0f;
if ((GwPlayer[arg0->work[0]].player_obj->unk_34 <= 0.0f) && (GwPlayer[arg0->work[0]].player_obj->unk_30 <= 0.0f)) {
GwPlayer[arg0->work[0]].player_obj->unk_30 = 0.0f;
return;
}
gPlayers[arg0->work[0]].playerObj->unk_38 = -4.0f;
gPlayers[arg0->work[0]].playerObj->unk_34 += gPlayers[arg0->work[0]].playerObj->unk_38;
gPlayers[arg0->work[0]].playerObj->unk_30 += gPlayers[arg0->work[0]].playerObj->unk_34;
GwPlayer[arg0->work[0]].player_obj->unk_38 = -4.0f;
GwPlayer[arg0->work[0]].player_obj->unk_34 += GwPlayer[arg0->work[0]].player_obj->unk_38;
GwPlayer[arg0->work[0]].player_obj->unk_30 += GwPlayer[arg0->work[0]].player_obj->unk_34;
if (gPlayers[arg0->work[0]].playerObj->unk_30 < 0.0f) {
gPlayers[arg0->work[0]].playerObj->unk_30 = 0.0f;
if (GwPlayer[arg0->work[0]].player_obj->unk_30 < 0.0f) {
GwPlayer[arg0->work[0]].player_obj->unk_30 = 0.0f;
}
func_800A0D00(&gPlayers[arg0->work[0]].playerObj->coords, gPlayers[arg0->work[0]].playerObj->coords.x, gPlayers[arg0->work[0]].playerObj->unk_30, gPlayers[arg0->work[0]].playerObj->coords.z);
func_800A0D00(&GwPlayer[arg0->work[0]].player_obj->coords, GwPlayer[arg0->work[0]].player_obj->coords.x, GwPlayer[arg0->work[0]].player_obj->unk_30, GwPlayer[arg0->work[0]].player_obj->coords.z);
}
void func_80108CB8_YoshisTropicalIslandEndingScene(omObjData* arg0) {
gPlayers[arg0->work[0]].playerObj->unk_30 = 0;
gPlayers[arg0->work[0]].playerObj->unk_34 = 15.0f;
gPlayers[arg0->work[0]].playerObj->unk_38 = -4.0f;
GwPlayer[arg0->work[0]].player_obj->unk_30 = 0;
GwPlayer[arg0->work[0]].player_obj->unk_34 = 15.0f;
GwPlayer[arg0->work[0]].player_obj->unk_38 = -4.0f;
arg0->func_ptr = &func_80108B60_YoshisTropicalIslandEndingScene;
}

152
src/overlays/ovl_46_BowserSpaceEvent/282820.c
View File

@ -48,10 +48,10 @@ void func_800F65E0_BowserSpaceEvent(void) {
func_800F8DF4_BowserSpaceEvent();
func_800F8C6C_BowserSpaceEvent();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
HidePlayerHUDVisibility(0, 1);
HidePlayerHUDVisibility(1, 1);
HidePlayerHUDVisibility(2, 1);
@ -91,7 +91,7 @@ void func_800F677C_BowserSpaceEvent(void) {
s32 windowID;
s32 var_s0;
if (func_800F66FC_BowserSpaceEvent() > gPlayers[D_800F8FF1_BowserSpaceEvent].coins ) {
if (func_800F66FC_BowserSpaceEvent() > GwPlayer[D_800F8FF1_BowserSpaceEvent].coins ) {
windowID = CreateTextWindow(40, 60, 18, 3);
LoadStringIntoWindow(windowID, (void*)0xCD, -1, -1);
func_8006E070(windowID, 0);
@ -99,7 +99,7 @@ void func_800F677C_BowserSpaceEvent(void) {
PlaySound(145);
func_8004DBD4(windowID, D_800F8FF1_BowserSpaceEvent);
HideTextWindow(windowID);
var_s0 = gPlayers[D_800F8FF1_BowserSpaceEvent].coins;
var_s0 = GwPlayer[D_800F8FF1_BowserSpaceEvent].coins;
} else {
windowID = CreateTextWindow(40, 60, 19, 3);
sprintf(&sp10, "%d", func_800F66FC_BowserSpaceEvent());
@ -115,7 +115,7 @@ void func_800F677C_BowserSpaceEvent(void) {
func_800F6744_BowserSpaceEvent();
func_8003E81C(D_800F8FF4_BowserSpaceEvent, 1, 0);
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 0, 0);
func_80060468(0x44A, gPlayers[D_800F8FF1_BowserSpaceEvent].characterID);
func_80060468(0x44A, GwPlayer[D_800F8FF1_BowserSpaceEvent].character);
func_80055960(D_800F8FF1_BowserSpaceEvent, -var_s0);
func_800503B0(D_800F8FF1_BowserSpaceEvent, 5);
func_8004F504(D_800F8FF4_BowserSpaceEvent);
@ -144,9 +144,9 @@ void func_800F69F0_BowserSpaceEvent(void) {
for (i = 0; i < 4; i++) {
if (i == D_800F8FF1_BowserSpaceEvent) {
gPlayers[i].unk_00 = 0;
GwPlayer[i].group = 0;
} else {
gPlayers[i].unk_00 = 1;
GwPlayer[i].group = 1;
}
}
D_800F8ED0_BowserSpaceEvent = 1;
@ -193,7 +193,7 @@ void func_800F6AF8_BowserSpaceEvent(void) {
temp_s2 = 0;
for (i = 0; i < 4; i++) {
temp_s2 += gPlayers[i].coins;
temp_s2 += GwPlayer[i].coins;
}
if (temp_s2 >= 0) {
@ -204,9 +204,9 @@ void func_800F6AF8_BowserSpaceEvent(void) {
temp_s2 = var_s0 >> 2;
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins < temp_s2) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins < temp_s2) {
var_s3 = 1;
} else if (temp_s2 < gPlayers[D_800F8FF1_BowserSpaceEvent].coins) {
} else if (temp_s2 < GwPlayer[D_800F8FF1_BowserSpaceEvent].coins) {
var_s3 = 2;
}
@ -214,23 +214,23 @@ void func_800F6AF8_BowserSpaceEvent(void) {
var_v1 = 0;
for (i = 0; i < 4; i++) {
if (var_v1 < (temp_s2 - gPlayers[i].coins)) {
if (var_v1 < (temp_s2 - GwPlayer[i].coins)) {
if (var_a0 != -1) {
D_800F8FFC_BowserSpaceEvent[var_a0] = 0;
}
D_800F8FFC_BowserSpaceEvent[i] = 1;
var_a0 = i;
var_v1 = temp_s2 - gPlayers[i].coins;
var_v1 = temp_s2 - GwPlayer[i].coins;
} else {
D_800F8FFC_BowserSpaceEvent[i] = 0;
}
}
temp_s4 = gPlayers[D_800F8FF1_BowserSpaceEvent].coins;
temp_s4 = GwPlayer[D_800F8FF1_BowserSpaceEvent].coins;
for (i = 0; i < 4; i++) {
func_80055810(i, temp_s2 - gPlayers[i].coins, D_800F8FFC_BowserSpaceEvent[i]);
if ((temp_s2 - gPlayers[i].coins) < 0) {
func_80055810(i, temp_s2 - GwPlayer[i].coins, D_800F8FFC_BowserSpaceEvent[i]);
if ((temp_s2 - GwPlayer[i].coins) < 0) {
func_800503B0(i, 5);
}
}
@ -243,10 +243,10 @@ void func_800F6AF8_BowserSpaceEvent(void) {
HuPrcVSleep();
}
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_80055544(0);
func_80055544(1);
func_80055544(2);
@ -262,15 +262,15 @@ void func_800F6AF8_BowserSpaceEvent(void) {
switch (var_s3) {
case 1:
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 3, 0);
if (temp_s4 + 10 <= gPlayers[D_800F8FF1_BowserSpaceEvent].coins) {
func_80060468(0x451, gPlayers[D_800F8FF1_BowserSpaceEvent].characterID);
if (temp_s4 + 10 <= GwPlayer[D_800F8FF1_BowserSpaceEvent].coins) {
func_80060468(0x451, GwPlayer[D_800F8FF1_BowserSpaceEvent].character);
HuPrcSleep(10);
}
break;
case 2:
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 0, 0);
if (temp_s4 - 10 >= gPlayers[D_800F8FF1_BowserSpaceEvent].coins) {
func_80060468(0x44A, gPlayers[D_800F8FF1_BowserSpaceEvent].characterID);
if (temp_s4 - 10 >= GwPlayer[D_800F8FF1_BowserSpaceEvent].coins) {
func_80060468(0x44A, GwPlayer[D_800F8FF1_BowserSpaceEvent].character);
HuPrcSleep(10);
}
break;
@ -296,9 +296,9 @@ void func_800F7044_BowserSpaceEvent(void) {
for (i = 0; i < 4; i++) {
if (i == D_800F8FF1_BowserSpaceEvent)
gPlayers[i].unk_00 = 0;
GwPlayer[i].group = 0;
else {
gPlayers[i].unk_00 = 1;
GwPlayer[i].group = 1;
}
}
@ -309,7 +309,7 @@ void func_800F7044_BowserSpaceEvent(void) {
return;
}
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg == 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg == 0) {
windowID = CreateTextWindow(80, 60, 14, 3);
LoadStringIntoWindow(windowID, (void*)0xD9, -1, -1);
func_8006E070(windowID, 0);
@ -320,7 +320,7 @@ void func_800F7044_BowserSpaceEvent(void) {
var_s0_2 = 0xF;
} else {
windowID = CreateTextWindow(60, 60, 16, 3);
var_a2 = gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg;
var_a2 = GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg;
if (var_a2 < 0) {
var_a2 = -var_a2;
@ -334,14 +334,14 @@ void func_800F7044_BowserSpaceEvent(void) {
PlaySound(0x4D);
func_8004DBD4(windowID, D_800F8FF1_BowserSpaceEvent);
HideTextWindow(windowID);
var_s0_2 = -gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg;
var_s0_2 = -GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg;
}
func_800F6744_BowserSpaceEvent();
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 0, 0);
func_8003E81C(D_800F8FF4_BowserSpaceEvent, 1, 0);
if (var_s0_2 >= 10) {
func_80060468(0x44A, gPlayers[D_800F8FF1_BowserSpaceEvent].characterID);
func_80060468(0x44A, GwPlayer[D_800F8FF1_BowserSpaceEvent].character);
}
func_80055960(D_800F8FF1_BowserSpaceEvent, -var_s0_2);
@ -349,7 +349,7 @@ void func_800F7044_BowserSpaceEvent(void) {
for (i = 0; i < 4; i++) {
if (i != D_800F8FF1_BowserSpaceEvent) {
func_80055810(i, gPlayers[i].coins_mg, 0);
func_80055810(i, GwPlayer[i].coins_mg, 0);
}
}
@ -386,7 +386,7 @@ void func_800F7410_BowserSpaceEvent(void) {
HideTextWindow(var_s1);
for (i = 0; i < 4; i++) {
gPlayers[i].unk_00 = i;
GwPlayer[i].group = i;
}
D_800F8ED0_BowserSpaceEvent = 3;
@ -398,7 +398,7 @@ void func_800F7410_BowserSpaceEvent(void) {
var_s4 = 0;
for (i = 0; i < 4; i++) {
switch (gPlayers[i].coins_mg) {
switch (GwPlayer[i].coins_mg) {
case 0:
var_s4++;
}
@ -421,8 +421,8 @@ void func_800F7410_BowserSpaceEvent(void) {
sprintf(&sp10, "%d", func_800F66FC_BowserSpaceEvent());
func_8006DA5C(var_s1, &sp10, 0);
for (i = 0, var_s2 = 1; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[gPlayers[i].characterID], var_s2++);
if (GwPlayer[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[GwPlayer[i].character], var_s2++);
}
}
LoadStringIntoWindow(var_s1, (void*)0xDC, -1, -1);
@ -437,8 +437,8 @@ void func_800F7410_BowserSpaceEvent(void) {
sprintf(&sp10, "%d", func_800F66FC_BowserSpaceEvent());
func_8006DA5C(var_s1, &sp10, 0);
for (i = 0, var_s2 = 1; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[gPlayers[i].characterID], var_s2++);
if (GwPlayer[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[GwPlayer[i].character], var_s2++);
}
}
LoadStringIntoWindow(var_s1, (void*)0xDD, -1, -1);
@ -455,8 +455,8 @@ void func_800F7410_BowserSpaceEvent(void) {
i = 0;
var_s2 = 1;
for (; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[gPlayers[i].characterID], var_s2++);
if (GwPlayer[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[GwPlayer[i].character], var_s2++);
}
}
LoadStringIntoWindow(var_s1, (void*)0xDE, -1, -1);
@ -468,8 +468,8 @@ void func_800F7410_BowserSpaceEvent(void) {
break;
default:
var_s1 = CreateTextWindow(60, 60, 16, 4);
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins < func_800F66FC_BowserSpaceEvent()) {
var_s2 = gPlayers[D_800F8FF1_BowserSpaceEvent].coins;
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins < func_800F66FC_BowserSpaceEvent()) {
var_s2 = GwPlayer[D_800F8FF1_BowserSpaceEvent].coins;
} else {
var_s2 = func_800F66FC_BowserSpaceEvent();
}
@ -488,19 +488,19 @@ void func_800F7410_BowserSpaceEvent(void) {
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 0, 0);
func_8003E81C(D_800F8FF4_BowserSpaceEvent, 1, 0);
func_80055960(D_800F8FF1_BowserSpaceEvent, -var_s2);
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins != 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins != 0) {
func_800503B0(D_800F8FF1_BowserSpaceEvent, 5);
}
} else {
for (i = 0; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
if (GwPlayer[i].coins_mg == 0) {
func_80054868(i + 10);
}
}
HuPrcSleep(0x14);
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg == 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg == 0) {
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 0, 0);
}
func_8003E81C(D_800F8FF4_BowserSpaceEvent, 1, 0U);
@ -510,12 +510,12 @@ void func_800F7410_BowserSpaceEvent(void) {
for (i = 0; i < 4; i++) {
if ((gPlayers[i].coins_mg == 0) && (var_a1_2 < gPlayers[i].coins)) {
if ((GwPlayer[i].coins_mg == 0) && (var_a1_2 < GwPlayer[i].coins)) {
if (tempVar != -1) {
D_800F8FFC_BowserSpaceEvent[tempVar] = 0;
}
D_800F8FFC_BowserSpaceEvent[i] = 1;
var_a1_2 = gPlayers[i].coins;
var_a1_2 = GwPlayer[i].coins;
tempVar = i;
} else {
D_800F8FFC_BowserSpaceEvent[i] = 0;
@ -524,9 +524,9 @@ void func_800F7410_BowserSpaceEvent(void) {
}
for (i = 0; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
if (GwPlayer[i].coins_mg == 0) {
func_80055810(i, -func_800F66FC_BowserSpaceEvent(), D_800F8FFC_BowserSpaceEvent[i]);
if (gPlayers[i].coins != 0) {
if (GwPlayer[i].coins != 0) {
func_800503B0(i, 5);
}
}
@ -563,9 +563,9 @@ void func_800F7BFC_BowserSpaceEvent(void) {
HideTextWindow(temp_s1);
for (i = 0; i < 4; i++) {
if (i == D_800F8FF1_BowserSpaceEvent) {
gPlayers[i].unk_00 = 0;
GwPlayer[i].group = 0;
} else {
gPlayers[i].unk_00 = 1;
GwPlayer[i].group = 1;
}
}
D_800F8ED0_BowserSpaceEvent = 4;
@ -573,7 +573,7 @@ void func_800F7BFC_BowserSpaceEvent(void) {
HuPrcSleep(0x1E);
return;
}
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg < 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg < 0) {
temp_s1 = CreateTextWindow(60, 60, 16, 3);
sprintf(&sp10, "%d", func_800F66FC_BowserSpaceEvent());
func_8006DA5C(temp_s1, &sp10, 0);
@ -583,7 +583,7 @@ void func_800F7BFC_BowserSpaceEvent(void) {
PlaySound(0x4D);
func_8004DBD4(temp_s1, D_800F8FF1_BowserSpaceEvent);
HideTextWindow(temp_s1);
} else if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg > 0) {
} else if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg > 0) {
temp_s1 = CreateTextWindow(60, 60, 16, 3);
sprintf(&sp10, "%d", func_800F66FC_BowserSpaceEvent());
func_8006DA5C(temp_s1, &sp10, 0);
@ -606,14 +606,14 @@ void func_800F7BFC_BowserSpaceEvent(void) {
}
for (i = 0; i < 4; i++) {
if (gPlayers[i].coins_mg <= 0) {
if (GwPlayer[i].coins_mg <= 0) {
func_80054868(i + 10);
}
}
HuPrcSleep(20);
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg <= 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg <= 0) {
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 0, 0);
}
@ -624,12 +624,12 @@ void func_800F7BFC_BowserSpaceEvent(void) {
for (i = 0; i < 4; i++) {
if ((gPlayers[i].coins_mg <= 0) && (var_a1_2 < gPlayers[i].coins)) {
if ((GwPlayer[i].coins_mg <= 0) && (var_a1_2 < GwPlayer[i].coins)) {
if (tempVar != -1) {
D_800F8FFC_BowserSpaceEvent[tempVar] = 0;
}
D_800F8FFC_BowserSpaceEvent[i] = 1;
var_a1_2 = gPlayers[i].coins;
var_a1_2 = GwPlayer[i].coins;
tempVar = i;
} else {
D_800F8FFC_BowserSpaceEvent[i] = 0;
@ -638,11 +638,11 @@ void func_800F7BFC_BowserSpaceEvent(void) {
}
for (i = 0; i < 4; i++) {
if (gPlayers[i].coins_mg > 0) {
if (GwPlayer[i].coins_mg > 0) {
continue;
} else {
func_80055810(i, -(func_800F66FC_BowserSpaceEvent()), D_800F8FFC_BowserSpaceEvent[i]);
if (gPlayers[i].coins) {
if (GwPlayer[i].coins) {
func_800503B0(i, 5);
}
}
@ -680,9 +680,9 @@ void func_800F80EC_BowserSpaceEvent(void) {
for (i = 0; i < 4; i++) {
if (i == D_800F8FF1_BowserSpaceEvent) {
gPlayers[i].unk_00 = 0;
GwPlayer[i].group = 0;
} else {
gPlayers[i].unk_00 = 1;
GwPlayer[i].group = 1;
}
}
@ -693,7 +693,7 @@ void func_800F80EC_BowserSpaceEvent(void) {
}
for (i = 0; i < 4; i++) {
if (gPlayers[i].coins_mg != 0) {
if (GwPlayer[i].coins_mg != 0) {
break;
}
}
@ -704,8 +704,8 @@ void func_800F80EC_BowserSpaceEvent(void) {
func_8006DA5C(var_s1, &sp10, 0);
for (i = 0, var_s2 = 1; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[gPlayers[i].characterID], var_s2++);
if (GwPlayer[i].coins_mg == 0) {
func_8006DA5C(var_s1, D_800C5218[GwPlayer[i].character], var_s2++);
}
}
@ -728,13 +728,13 @@ void func_800F80EC_BowserSpaceEvent(void) {
}
for (i = 0; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
if (GwPlayer[i].coins_mg == 0) {
func_80054868(i + 10);
}
}
HuPrcSleep(20);
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins_mg == 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins_mg == 0) {
func_8004F4D4(D_800F8FF8_BowserSpaceEvent, 0, 0);
}
@ -744,13 +744,13 @@ void func_800F80EC_BowserSpaceEvent(void) {
var_a1_2 = 0;
for (i = 0; i < 4; i++) {
if ((gPlayers[i].coins_mg == 0) && (var_a1_2 < gPlayers[i].coins)) {
if ((GwPlayer[i].coins_mg == 0) && (var_a1_2 < GwPlayer[i].coins)) {
if (tempVar != -1) {
D_800F8FFC_BowserSpaceEvent[tempVar] = 0;
}
D_800F8FFC_BowserSpaceEvent[i] = 1;
var_a1_2 = gPlayers[i].coins;
var_a1_2 = GwPlayer[i].coins;
tempVar = i;
} else {
D_800F8FFC_BowserSpaceEvent[i] = 0;
@ -758,9 +758,9 @@ void func_800F80EC_BowserSpaceEvent(void) {
}
for (i = 0; i < 4; i++) {
if (gPlayers[i].coins_mg == 0) {
if (GwPlayer[i].coins_mg == 0) {
func_80055810(i, -func_800F66FC_BowserSpaceEvent(), D_800F8FFC_BowserSpaceEvent[i]);
if (gPlayers[i].coins != 0) {
if (GwPlayer[i].coins != 0) {
func_800503B0(i, 5);
}
}
@ -789,8 +789,8 @@ void func_800F8608_BowserSpaceEvent(void) {
func_8004935C();
func_800499CC(D_800F8FF1_BowserSpaceEvent);
HuPrcSleep(0x1A);
if (gPlayers[D_800F8FF1_BowserSpaceEvent].coins == 0) {
if (gPlayers[D_800F8FF1_BowserSpaceEvent].starAmount == 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].coins == 0) {
if (GwPlayer[D_800F8FF1_BowserSpaceEvent].stars == 0) {
windowID = CreateTextWindow(80, 60, 14, 4);
LoadStringIntoWindow(windowID, (void*)0xCA, -1, -1);
func_8006E070(windowID, 0);
@ -823,7 +823,7 @@ void func_800F8608_BowserSpaceEvent(void) {
func_8003E81C(D_800F8FF8_BowserSpaceEvent, 1, 0);
func_80055994(D_800F8FF1_BowserSpaceEvent, 2);
new_var2 = D_800F8FF1_BowserSpaceEvent; //?
gPlayers[new_var2].starAmount--;
GwPlayer[new_var2].stars--;
func_80060618(0x44A, D_800F8FF1_BowserSpaceEvent);
func_80055960(D_800F8FF1_BowserSpaceEvent, 10);
func_800503B0(D_800F8FF1_BowserSpaceEvent, 6);
@ -886,7 +886,7 @@ void func_800F8608_BowserSpaceEvent(void) {
}
for (i = 0; i < 4; i++) {
gPlayers[i].coins_mg = 0;
GwPlayer[i].coins_mg = 0;
}
D_800F5144 = 1;
@ -954,11 +954,11 @@ void func_800F8C6C_BowserSpaceEvent(void) {
D_800F8FF4_BowserSpaceEvent->coords.y = D_800F8EF4_BowserSpaceEvent.y;
D_800F8FF4_BowserSpaceEvent->coords.z = D_800F8EF4_BowserSpaceEvent.z;
D_800F8FF4_BowserSpaceEvent->xScale = D_800F8FF4_BowserSpaceEvent->yScale = D_800F8FF4_BowserSpaceEvent->zScale = 1.5f;
D_800F8FF8_BowserSpaceEvent = CreateObject(func_80052F04(D_800F8FF1_BowserSpaceEvent), D_800F8F9C_BowserSpaceEvent[gPlayers[D_800F8FF1_BowserSpaceEvent].characterID]);
D_800F8FF8_BowserSpaceEvent = CreateObject(func_80052F04(D_800F8FF1_BowserSpaceEvent), D_800F8F9C_BowserSpaceEvent[GwPlayer[D_800F8FF1_BowserSpaceEvent].character]);
D_800F8FF8_BowserSpaceEvent->coords.x = D_800F8F00_BowserSpaceEvent.x;
D_800F8FF8_BowserSpaceEvent->coords.y = D_800F8F00_BowserSpaceEvent.y;
D_800F8FF8_BowserSpaceEvent->coords.z = D_800F8F00_BowserSpaceEvent.z;
func_80021B14(*D_800F8FF8_BowserSpaceEvent->unk_3C->unk_40, gPlayers[D_800F8FF1_BowserSpaceEvent].characterID, 0x80);
func_80021B14(*D_800F8FF8_BowserSpaceEvent->unk_3C->unk_40, GwPlayer[D_800F8FF1_BowserSpaceEvent].character, 0x80);
func_8004CCD0(&D_800F8FF8_BowserSpaceEvent->coords, &D_800F8FF4_BowserSpaceEvent->coords, &D_800F8FF8_BowserSpaceEvent->unk_18);
func_8004CCD0(&D_800F8FF4_BowserSpaceEvent->coords, &D_800F8FF8_BowserSpaceEvent->coords, &D_800F8FF4_BowserSpaceEvent->unk_18);
}

8
src/overlays/ovl_47/285230.c
View File

@ -10,10 +10,10 @@ void func_800F65E0_name_47(void) {
func_800F6E14_name_47();
func_800F6D1C_name_47();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(&func_800F6924_name_47, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6CBC_name_47);

16
src/overlays/ovl_48_BowserVisitDKBoard/285B70.c
View File

@ -32,10 +32,10 @@ void func_800F65E0_BowserVisitDKBoard(void) {
func_800F6FF8_BowserVisitDKBoard();
func_800F6E1C_BowserVisitDKBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F66BC_BowserVisitDKBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6DD0_BowserVisitDKBoard);
@ -50,7 +50,7 @@ void func_800F66BC_BowserVisitDKBoard(void) {
HuPrcSleep(0x10);
PlaySound(0x46A);
HuPrcSleep(0xA);
if (gPlayers[D_800F7170_ovl48].coins == 0) {
if (GwPlayer[D_800F7170_ovl48].coins == 0) {
temp_s1 = CreateTextWindow(0x28, 0x28, 0x10, 2);
LoadStringIntoWindow(temp_s1, (void* )0x192, -1, -1);
func_8006E070(temp_s1, 0);
@ -64,7 +64,7 @@ void func_800F66BC_BowserVisitDKBoard(void) {
PlaySound(0x46A);
func_8004DBD4(temp_s1, D_800F7170_ovl48);
HideTextWindow(temp_s1);
} else if (!(gPlayers[D_800F7170_ovl48].coins >= 0xA)) {
} else if (!(GwPlayer[D_800F7170_ovl48].coins >= 0xA)) {
temp_s1 = CreateTextWindow(0x28, 0x28, 0x10, 2);
LoadStringIntoWindow(temp_s1, (void* )0x18F, -1, -1);
func_8006E070(temp_s1, 0);
@ -80,7 +80,7 @@ void func_800F66BC_BowserVisitDKBoard(void) {
func_8003E81C(D_800F7174_ovl48, 1, 0);
func_8004F40C(D_800F7174_ovl48, 0, 2);
func_8003E81C(D_800F717C_ovl48, 1, 0);
func_80055960(D_800F7170_ovl48, -gPlayers[D_800F7170_ovl48].coins);
func_80055960(D_800F7170_ovl48, -GwPlayer[D_800F7170_ovl48].coins);
func_800503B0(D_800F7170_ovl48, 5);
func_80060618(0x44A, D_800F7170_ovl48);
HuPrcSleep(0x1E);
@ -204,7 +204,7 @@ void func_800F6E1C_BowserVisitDKBoard(void) {
D_800F7180_ovl48->rot.x = -12.0f;
D_800F7180_ovl48->rot.y = 0.0f;
D_800F7180_ovl48->work[0] = 0;
D_800F717C_ovl48 = CreateObject(func_80052F04(D_800F7170_ovl48), D_800F7148_BowserVisitDKBoard[gPlayers[D_800F7170_ovl48].characterID]);
D_800F717C_ovl48 = CreateObject(func_80052F04(D_800F7170_ovl48), D_800F7148_BowserVisitDKBoard[GwPlayer[D_800F7170_ovl48].character]);
D_800F717C_ovl48->coords.x = D_800F70E4_BowserVisitDKBoard.x;
D_800F717C_ovl48->coords.y = D_800F70E4_BowserVisitDKBoard.y;
D_800F717C_ovl48->coords.z = D_800F70E4_BowserVisitDKBoard.z;

16
src/overlays/ovl_49_BowserVisitPeachBoard/286700.c
View File

@ -20,10 +20,10 @@ void func_800F65E0_BowserVisitPeachBoard(void) {
func_800F7008_BowserVisitPeachBoard();
func_800F6E18_BowserVisitPeachBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F66BC_BowserVisitPeachBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6DCC_BowserVisitPeachBoard);
@ -38,7 +38,7 @@ void func_800F66BC_BowserVisitPeachBoard(void) {
HuPrcSleep(0x10);
PlaySound(0x46A);
HuPrcSleep(0xA);
if (gPlayers[D_800F7180_BowserVisitPeachBoard].coins == 0) {
if (GwPlayer[D_800F7180_BowserVisitPeachBoard].coins == 0) {
temp_s1 = CreateTextWindow(0x3C, 0x28, 0x10, 3);
LoadStringIntoWindow(temp_s1, (void* )0x1A0, -1, -1);
func_8006E070(temp_s1, 0);
@ -52,7 +52,7 @@ void func_800F66BC_BowserVisitPeachBoard(void) {
PlaySound(0x46A);
func_8004DBD4(temp_s1, D_800F7180_BowserVisitPeachBoard);
HideTextWindow(temp_s1);
} else if (!(gPlayers[D_800F7180_BowserVisitPeachBoard].coins >= 20)) {
} else if (!(GwPlayer[D_800F7180_BowserVisitPeachBoard].coins >= 20)) {
temp_s1 = CreateTextWindow(0x37, 0x28, 0x10, 3);
LoadStringIntoWindow(temp_s1, (void* )0x19D, -1, -1);
func_8006E070(temp_s1, 0);
@ -68,7 +68,7 @@ void func_800F66BC_BowserVisitPeachBoard(void) {
func_8003E81C(D_800F7184_BowserVisitPeachBoard, 1, 0);
func_8004F40C(D_800F7184_BowserVisitPeachBoard, 0, 2);
func_8003E81C(D_800F718C_BowserVisitPeachBoard, 1, 0);
func_80055960(D_800F7180_BowserVisitPeachBoard, -gPlayers[D_800F7180_BowserVisitPeachBoard].coins);
func_80055960(D_800F7180_BowserVisitPeachBoard, -GwPlayer[D_800F7180_BowserVisitPeachBoard].coins);
func_800503B0(D_800F7180_BowserVisitPeachBoard, 5);
func_80060618(0x44A, D_800F7180_BowserVisitPeachBoard);
HuPrcSleep(0x1E);
@ -193,7 +193,7 @@ void func_800F6E18_BowserVisitPeachBoard(void) {
D_800F7190_BowserVisitPeachBoard->rot.y = 0.0f;
D_800F7190_BowserVisitPeachBoard->work[0] = 0;
D_800F7188_BowserVisitPeachBoard->unk_0A |= 1;
D_800F718C_BowserVisitPeachBoard = CreateObject(func_80052F04(D_800F7180_BowserVisitPeachBoard), D_800F7158_BowserVisitPeachBoard[gPlayers[D_800F7180_BowserVisitPeachBoard].characterID]);
D_800F718C_BowserVisitPeachBoard = CreateObject(func_80052F04(D_800F7180_BowserVisitPeachBoard), D_800F7158_BowserVisitPeachBoard[GwPlayer[D_800F7180_BowserVisitPeachBoard].character]);
D_800F718C_BowserVisitPeachBoard->coords.x = D_800F70F4_BowserVisitPeachBoard.x;
D_800F718C_BowserVisitPeachBoard->coords.y = D_800F70F4_BowserVisitPeachBoard.y;
D_800F718C_BowserVisitPeachBoard->coords.z = D_800F70F4_BowserVisitPeachBoard.z;

10
src/overlays/ovl_4A_GoombaCoinStealPeachBoard/2872A0.c
View File

@ -7,10 +7,10 @@ void func_800F65E0_GoombaCoinStealPeachBoard(void) {
func_800F7A00_GoombaCoinStealPeachBoard();
func_800F77D0_GoombaCoinStealPeachBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(&func_800F6CB0_GoombaCoinStealPeachBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F7688_GoombaCoinStealPeachBoard);
@ -94,7 +94,7 @@ void func_800F77D0_GoombaCoinStealPeachBoard(void) {
D_800F7BE4_GoombaCoinStealPeachBoard->coords.z = D_800F7B04_GoombaCoinStealPeachBoard.z;
}
D_800F7BE8_GoombaCoinStealPeachBoard = CreateObject(func_80052F04(D_800F7BE0_GoombaCoinStealPeachBoard), D_800F7B88_GoombaCoinStealPeachBoard[gPlayers[D_800F7BE0_GoombaCoinStealPeachBoard].characterID]);
D_800F7BE8_GoombaCoinStealPeachBoard = CreateObject(func_80052F04(D_800F7BE0_GoombaCoinStealPeachBoard), D_800F7B88_GoombaCoinStealPeachBoard[GwPlayer[D_800F7BE0_GoombaCoinStealPeachBoard].character]);
D_800F7BE8_GoombaCoinStealPeachBoard->coords.x = D_800F7B1C_GoombaCoinStealPeachBoard.x;
D_800F7BE8_GoombaCoinStealPeachBoard->coords.y = D_800F7B1C_GoombaCoinStealPeachBoard.y;
D_800F7BE8_GoombaCoinStealPeachBoard->coords.z = D_800F7B1C_GoombaCoinStealPeachBoard.z;

8
src/overlays/ovl_4B_FlowerLotteryPeachBoard/2888A0.c
View File

@ -13,10 +13,10 @@ void func_800F65E0_FlowerLotteryPeachBoard(void) {
func_800F76EC_FlowerLotteryPeachBoard();
func_800F744C_FlowerLotteryPeachBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F6A48_FlowerLotteryPeachBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F7320_FlowerLotteryPeachBoard);

28
src/overlays/ovl_4C_PiranhaPlantStarStealPeachBoard/289BA0.c
View File

@ -58,10 +58,10 @@ void func_800F65E0_PiranhaPlantStarStealPeachBoard(void) {
func_800F741C_PiranhaPlantStarStealPeachBoard();
func_800F718C_PiranhaPlantStarStealPeachBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F66B4_PiranhaPlantStarStealPeachBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F7020_PiranhaPlantStarStealPeachBoard);
@ -81,7 +81,7 @@ void func_800F66B4_PiranhaPlantStarStealPeachBoard(void) {
func_800421E0();
HuPrcSleep(0x1A);
if (gPlayers[D_800F75E0_PiranhaPlantStarStealPeachBoard].starAmount == 0) {
if (GwPlayer[D_800F75E0_PiranhaPlantStarStealPeachBoard].stars == 0) {
func_8004EE14(0, &D_800F7550_PiranhaPlantStarStealPeachBoard, 5, D_800F74F0_PiranhaPlantStarStealPeachBoard);
HuPrcSleep(0x14);
PlaySound(0x96);
@ -133,7 +133,7 @@ void func_800F66B4_PiranhaPlantStarStealPeachBoard(void) {
func_80025798(D_800F750C_PiranhaPlantStarStealPeachBoard, D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.x, D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.y, D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.z);
func_80025830(D_800F750C_PiranhaPlantStarStealPeachBoard, 0.5f, 0.5f, 0.5f);
func_80055994(D_800F75E0_PiranhaPlantStarStealPeachBoard, 2);
gPlayers[D_800F75E0_PiranhaPlantStarStealPeachBoard].starAmount -= 1;
GwPlayer[D_800F75E0_PiranhaPlantStarStealPeachBoard].stars -= 1;
func_80060618(0x44A, new_var = D_800F75E0_PiranhaPlantStarStealPeachBoard); //func_80060618(0x44A, D_800F75E0_PiranhaPlantStarStealPeachBoard);
func_800503B0(D_800F75E0_PiranhaPlantStarStealPeachBoard, 6);
PlaySound(0x6D);
@ -187,11 +187,11 @@ void func_800F66B4_PiranhaPlantStarStealPeachBoard(void) {
D_800F74F0_PiranhaPlantStarStealPeachBoard = NULL;
D_800F74F4_PiranhaPlantStarStealPeachBoard = NULL;
func_800F7120_PiranhaPlantStarStealPeachBoard();
D_800F75E4_PiranhaPlantStarStealPeachBoard = CreateObject(func_80052F04(D_800ED100.boardRam[D_800ED100.boardRam[14]]), D_800F75A4_PiranhaPlantStarStealPeachBoard[gPlayers[D_800ED100.boardRam[D_800ED100.boardRam[14]]].characterID]);
D_800F75E4_PiranhaPlantStarStealPeachBoard = CreateObject(func_80052F04(D_800ED100.boardRam[D_800ED100.boardRam[14]]), D_800F75A4_PiranhaPlantStarStealPeachBoard[GwPlayer[D_800ED100.boardRam[D_800ED100.boardRam[14]]].character]);
D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.x = 0.0f;
D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.y = D_800F752C_PiranhaPlantStarStealPeachBoard.y;
D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.z = D_800F752C_PiranhaPlantStarStealPeachBoard.z;
func_80021B14(*D_800F75E4_PiranhaPlantStarStealPeachBoard->unk_3C->unk_40, gPlayers[D_800ED100.boardRam[D_800ED100.boardRam[14]]].characterID, 0x80);
func_80021B14(*D_800F75E4_PiranhaPlantStarStealPeachBoard->unk_3C->unk_40, GwPlayer[D_800ED100.boardRam[D_800ED100.boardRam[14]]].character, 0x80);
func_8004CCD0(&D_800F75E4_PiranhaPlantStarStealPeachBoard->coords, &D_800F32A0->coords, &D_800F75E4_PiranhaPlantStarStealPeachBoard->unk_18);
SetFadeInTypeAndTime(0, 0x10);
HuPrcSleep(0x1A);
@ -218,15 +218,15 @@ void func_800F66B4_PiranhaPlantStarStealPeachBoard(void) {
func_800427D4(D_800F7510_PiranhaPlantStarStealPeachBoard);
D_800F7510_PiranhaPlantStarStealPeachBoard = NULL;
func_8003E81C(D_800F75E4_PiranhaPlantStarStealPeachBoard, 1, 0U);
func_80021CDC(*D_800F75E4_PiranhaPlantStarStealPeachBoard->unk_3C->unk_40, gPlayers[D_800ED100.boardRam[D_800ED100.boardRam[14]]].characterID, 0x81);
func_80021CDC(*D_800F75E4_PiranhaPlantStarStealPeachBoard->unk_3C->unk_40, GwPlayer[D_800ED100.boardRam[D_800ED100.boardRam[14]]].character, 0x81);
func_80055994(D_800ED100.boardRam[D_800ED100.boardRam[14]], 1);
if (gPlayers[D_800ED100.boardRam[D_800ED100.boardRam[14]]].starAmount < 99) {
gPlayers[D_800ED100.boardRam[D_800ED100.boardRam[14]]].starAmount++;
if (GwPlayer[D_800ED100.boardRam[D_800ED100.boardRam[14]]].stars < 99) {
GwPlayer[D_800ED100.boardRam[D_800ED100.boardRam[14]]].stars++;
}
HuPrcSleep(0x24);
func_80060468(0x443, gPlayers[D_800ED100.boardRam[D_800ED100.boardRam[14]]].characterID);
func_80060468(0x443, GwPlayer[D_800ED100.boardRam[D_800ED100.boardRam[14]]].character);
HuPrcSleep(0x30);
func_80050160();
D_800ED100.boardRam[D_800ED100.boardRam[14]] = -1;
@ -292,12 +292,12 @@ void func_800F718C_PiranhaPlantStarStealPeachBoard(void) {
D_800F74F8_PiranhaPlantStarStealPeachBoard->coords.y = D_800F7544_PiranhaPlantStarStealPeachBoard.y;
D_800F74F8_PiranhaPlantStarStealPeachBoard->coords.z = D_800F7544_PiranhaPlantStarStealPeachBoard.z;
func_8004CCD0(&D_800F74F8_PiranhaPlantStarStealPeachBoard->coords, &D_800F32A0->coords, &D_800F74F8_PiranhaPlantStarStealPeachBoard->unk_18);
D_800F75E4_PiranhaPlantStarStealPeachBoard = CreateObject(func_80052F04(D_800F75E0_PiranhaPlantStarStealPeachBoard), D_800F75A4_PiranhaPlantStarStealPeachBoard[gPlayers[D_800F75E0_PiranhaPlantStarStealPeachBoard].characterID]);
D_800F75E4_PiranhaPlantStarStealPeachBoard = CreateObject(func_80052F04(D_800F75E0_PiranhaPlantStarStealPeachBoard), D_800F75A4_PiranhaPlantStarStealPeachBoard[GwPlayer[D_800F75E0_PiranhaPlantStarStealPeachBoard].character]);
D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.x = D_800F752C_PiranhaPlantStarStealPeachBoard.x;
D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.y = D_800F752C_PiranhaPlantStarStealPeachBoard.y;
D_800F75E4_PiranhaPlantStarStealPeachBoard->coords.z = D_800F752C_PiranhaPlantStarStealPeachBoard.z;
func_8004CCD0(&D_800F75E4_PiranhaPlantStarStealPeachBoard->coords, &D_800F74F0_PiranhaPlantStarStealPeachBoard->coords, &D_800F75E4_PiranhaPlantStarStealPeachBoard->unk_18);
D_800F74F4_PiranhaPlantStarStealPeachBoard = CreateObject((gPlayers[D_800ED100.boardRam[D_800ED100.boardRam[14]]].characterID + 0x1D), NULL);
D_800F74F4_PiranhaPlantStarStealPeachBoard = CreateObject((GwPlayer[D_800ED100.boardRam[D_800ED100.boardRam[14]]].character + 0x1D), NULL);
D_800F74F4_PiranhaPlantStarStealPeachBoard->coords.x = D_800F7538_PiranhaPlantStarStealPeachBoard.x;
D_800F74F4_PiranhaPlantStarStealPeachBoard->coords.y = D_800F7538_PiranhaPlantStarStealPeachBoard.y;
D_800F74F4_PiranhaPlantStarStealPeachBoard->coords.z = D_800F7538_PiranhaPlantStarStealPeachBoard.z;

24
src/overlays/ovl_4D_ThwompTollYoshiBoard/28ABA0.c
View File

@ -7,10 +7,10 @@ void func_800F65E0_ThwompTollYoshiBoard(void) {
func_800F7550_ThwompTollYoshiBoard();
func_800F741C_ThwompTollYoshiBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(&func_800F6A98_ThwompTollYoshiBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F73BC_ThwompTollYoshiBoard);
@ -28,8 +28,8 @@ s32 func_800F68C8_ThwompTollYoshiBoard(void) { //slightly odd match with assignm
s32 var_v0;
temp_v0 = func_8005021C(100.0f);
if ((D_800ED100.boardRam[D_800ED100.boardRam[2]] + 40) < gPlayers[D_800F76B0_ThwompTollYoshiBoard].coins) {
if (gPlayers[D_800F76B0_ThwompTollYoshiBoard].cpuDifficultyCopy == 0) {
if ((D_800ED100.boardRam[D_800ED100.boardRam[2]] + 40) < GwPlayer[D_800F76B0_ThwompTollYoshiBoard].coins) {
if (GwPlayer[D_800F76B0_ThwompTollYoshiBoard].cpu_difficulty_copy == 0) {
var_v0 = 1;
if (temp_v0 >= 80) {
var_v0 = (-(temp_v0 >= 95) & 3) | 2;
@ -50,8 +50,8 @@ s32 func_800F68C8_ThwompTollYoshiBoard(void) { //slightly odd match with assignm
}
} else {
if ((D_800ED100.boardRam[D_800ED100.boardRam[2]] + 20) < gPlayers[D_800F76B0_ThwompTollYoshiBoard].coins) {
if (gPlayers[D_800F76B0_ThwompTollYoshiBoard].cpuDifficultyCopy != 0) {
if ((D_800ED100.boardRam[D_800ED100.boardRam[2]] + 20) < GwPlayer[D_800F76B0_ThwompTollYoshiBoard].coins) {
if (GwPlayer[D_800F76B0_ThwompTollYoshiBoard].cpu_difficulty_copy != 0) {
if (temp_v0 >= 70) {
var_v0 = (-(temp_v0 >= 90) & 3) | 2;
} else {
@ -63,7 +63,7 @@ s32 func_800F68C8_ThwompTollYoshiBoard(void) { //slightly odd match with assignm
var_v0 = (-(temp_v0 >= 95) & 3) | 2;
}
}
} else if ((gPlayers[D_800F76B0_ThwompTollYoshiBoard].cpuDifficultyCopy == 0) || (var_v0 = temp_v0 < 95, ((temp_v0 < 80) != 0))) {
} else if ((GwPlayer[D_800F76B0_ThwompTollYoshiBoard].cpu_difficulty_copy == 0) || (var_v0 = temp_v0 < 95, ((temp_v0 < 80) != 0))) {
var_v0 = 1;
} else {
var_v0 = (-(temp_v0 >= 95) & 3) | 2;
@ -76,8 +76,8 @@ s32 func_800F68C8_ThwompTollYoshiBoard(void) { //slightly odd match with assignm
var_v0 = 50;
}
if (gPlayers[D_800F76B0_ThwompTollYoshiBoard].coins < var_v0) {
var_v0 = gPlayers[D_800F76B0_ThwompTollYoshiBoard].coins;
if (GwPlayer[D_800F76B0_ThwompTollYoshiBoard].coins < var_v0) {
var_v0 = GwPlayer[D_800F76B0_ThwompTollYoshiBoard].coins;
}
return var_v0;
@ -120,7 +120,7 @@ void func_800F741C_ThwompTollYoshiBoard(void) {
D_800F76B4_ThwompTollYoshiBoard->coords.y = D_800F7624_ThwompTollYoshiBoard.y;
D_800F76B4_ThwompTollYoshiBoard->coords.z = D_800F7624_ThwompTollYoshiBoard.z;
func_800A0D00(&D_800F76B4_ThwompTollYoshiBoard->xScale, 2.0f, 2.0f, 2.0f);
D_800F76B8_ThwompTollYoshiBoard = CreateObject(func_80052F04(D_800F76B0_ThwompTollYoshiBoard), D_800F7678_ThwompTollYoshiBoard[gPlayers[D_800F76B0_ThwompTollYoshiBoard].characterID]);
D_800F76B8_ThwompTollYoshiBoard = CreateObject(func_80052F04(D_800F76B0_ThwompTollYoshiBoard), D_800F7678_ThwompTollYoshiBoard[GwPlayer[D_800F76B0_ThwompTollYoshiBoard].character]);
D_800F76B8_ThwompTollYoshiBoard->coords.x = D_800F7630_ThwompTollYoshiBoard.x;
D_800F76B8_ThwompTollYoshiBoard->coords.y = D_800F7630_ThwompTollYoshiBoard.y;
D_800F76B8_ThwompTollYoshiBoard->coords.z = D_800F7630_ThwompTollYoshiBoard.z;

8
src/overlays/ovl_4E_BowserToadSwapPlacesYoshiBoard/28BC70.c
View File

@ -31,10 +31,10 @@ void func_800F65E0_BowserToadSwapPlacesYoshiBoard(void) {
func_800F7764_BowserToadSwapPlacesYoshiBoard();
func_800F73C0_BowserToadSwapPlacesYoshiBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F67BC_BowserToadSwapPlacesYoshiBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F737C_BowserToadSwapPlacesYoshiBoard);

8
src/overlays/ovl_4F_BowserVisitYoshiBoard/28CFF0.c
View File

@ -7,10 +7,10 @@ void func_800F65E0_BowserVisitYoshiBoard(void) {
func_800F744C_BowserVisitYoshiBoard();
func_800F7264_BowserVisitYoshiBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F67F0_BowserVisitYoshiBoard, 0x300U, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F7218_BowserVisitYoshiBoard);

10
src/overlays/ovl_50_LoadCannonWarioBoard/28E030.c
View File

@ -24,10 +24,10 @@ void func_800F65E0_LoadCannonWarioBoard(void) {
func_800F6A54_LoadCannonWarioBoard();
func_800F6918_LoadCannonWarioBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(&func_800F66B4_LoadCannonWarioBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F68F4_LoadCannonWarioBoard);
@ -99,7 +99,7 @@ void func_800F6918_LoadCannonWarioBoard(void) {
D_800F6BE4_LoadCannonWarioBoard->coords.x = D_800F6B20_LoadCannonWarioBoard.x;
D_800F6BE4_LoadCannonWarioBoard->coords.y = D_800F6B20_LoadCannonWarioBoard.y;
D_800F6BE4_LoadCannonWarioBoard->coords.z = D_800F6B20_LoadCannonWarioBoard.z;
D_800F6BE8_LoadCannonWarioBoard = CreateObject(func_80052F04(D_800F6BE0_LoadCannonWarioBoard), D_800F6BBC_LoadCannonWarioBoard[gPlayers[D_800F6BE0_LoadCannonWarioBoard].characterID]);
D_800F6BE8_LoadCannonWarioBoard = CreateObject(func_80052F04(D_800F6BE0_LoadCannonWarioBoard), D_800F6BBC_LoadCannonWarioBoard[GwPlayer[D_800F6BE0_LoadCannonWarioBoard].character]);
D_800F6BE8_LoadCannonWarioBoard->coords.x = D_800F6B2C_LoadCannonWarioBoard.x;
D_800F6BE8_LoadCannonWarioBoard->coords.y = D_800F6B2C_LoadCannonWarioBoard.y;
D_800F6BE8_LoadCannonWarioBoard->coords.z = D_800F6B2C_LoadCannonWarioBoard.z;

8
src/overlays/ovl_51_ChangeCannonTargetWarioBoard/28E630.c
View File

@ -26,10 +26,10 @@ void func_800F65E0_ChangeCannonTargetWarioBoard(void) {
func_800F6B30_ChangeCannonTargetWarioBoard();
func_800F69D8_ChangeCannonTargetWarioBoard(1);
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F66B4_ChangeCannonTargetWarioBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6994_ChangeCannonTargetWarioBoard);

8
src/overlays/ovl_52_FlyGuyWarioBoard/28ECA0.c
View File

@ -7,10 +7,10 @@ void func_800F65E0_FlyGuyWarioBoard(void) {
func_800F7FA4_FlyGuyWarioBoard();
func_800F7DF0_FlyGuyWarioBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F742C_FlyGuyWarioBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F7D90_FlyGuyWarioBoard);

12
src/overlays/ovl_55_MoveDoorsLuigiBoard/292020.c
View File

@ -7,10 +7,10 @@ void func_800F65E0_MoveDoorsLuigiBoard(void) {
func_800F765C_MoveDoorsLuigiBoard();
func_800F7528_MoveDoorsLuigiBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F7198_MoveDoorsLuigiBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F74C8_MoveDoorsLuigiBoard);
@ -43,7 +43,7 @@ void func_800F7198_MoveDoorsLuigiBoard(void) {
temp_v0 = CreateTextWindow(0x3C, 0x28, 0x11, 7);
if (gPlayers[D_800F7820_MoveDoorsLuigiBoard].coins < 0x14) {
if (GwPlayer[D_800F7820_MoveDoorsLuigiBoard].coins < 0x14) {
func_8006DA5C(temp_v0, &D_800F7810_MoveDoorsLuigiBoard, 0);
sp10[0] = 0;
} else {
@ -129,7 +129,7 @@ void func_800F7528_MoveDoorsLuigiBoard(void) {
D_800F7824_MoveDoorsLuigiBoard->coords.y = D_800F7724_MoveDoorsLuigiBoard.y;
D_800F7824_MoveDoorsLuigiBoard->coords.z = D_800F7724_MoveDoorsLuigiBoard.z;
func_8003E81C(D_800F7824_MoveDoorsLuigiBoard, 1, 2);
D_800F7828_MoveDoorsLuigiBoard = CreateObject(func_80052F04(D_800F7820_MoveDoorsLuigiBoard), D_800C5490[gPlayers[D_800F7820_MoveDoorsLuigiBoard].characterID]);
D_800F7828_MoveDoorsLuigiBoard = CreateObject(func_80052F04(D_800F7820_MoveDoorsLuigiBoard), D_800C5490[GwPlayer[D_800F7820_MoveDoorsLuigiBoard].character]);
D_800F7828_MoveDoorsLuigiBoard->coords.x = D_800F7730_MoveDoorsLuigiBoard.x;
D_800F7828_MoveDoorsLuigiBoard->coords.y = D_800F7730_MoveDoorsLuigiBoard.y;
D_800F7828_MoveDoorsLuigiBoard->coords.z = D_800F7730_MoveDoorsLuigiBoard.z;

8
src/overlays/ovl_56_BowserToadSwapPlacesMarioBoard/293260.c
View File

@ -13,10 +13,10 @@ void func_800F65E0_BowserToadSwapPlacesMarioBoard(void) {
func_800F6CE8_BowserToadSwapPlacesMarioBoard();
func_800F6B1C_BowserToadSwapPlacesMarioBoard();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
omAddPrcObj(func_800F692C_BowserToadSwapPlacesMarioBoard, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6AC8_BowserToadSwapPlacesMarioBoard);
SetFadeInTypeAndTime(4, 16);

32
src/overlays/ovl_5A_ShortcutRouletteMagmaMountain/295E40.c
View File

@ -26,10 +26,10 @@ void func_800F65E0_ShortcutRouletteMagmaMountain(void) {
func_800F711C_ShortcutRouletteMagmaMountain();
func_800F6F5C_ShortcutRouletteMagmaMountain();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
func_8003FCD4();
omAddPrcObj(func_800F6898_ShortcutRouletteMagmaMountain, 0x300, 0, 0);
@ -49,15 +49,15 @@ s32 func_800F66D8_ShortcutRouletteMagmaMountain(s32 arg0) {
for (i = 0; i < 4; i++) {
if (i == D_800F7310_ShortcutRouletteMagmaMountain) {
if (gPlayers[i].flags & 1) {
if (GwPlayer[i].flags & 1) {
var_s3 = 1;
sp18[gPlayers[i].port] = -0x8000;
sp18[GwPlayer[i].port] = -0x8000;
} else {
func_8007155C(arg0, sp20.unk_00[gPlayers[i].port]);
sp18[gPlayers[i].port] = -1;
func_8007155C(arg0, sp20.unk_00[GwPlayer[i].port]);
sp18[GwPlayer[i].port] = -1;
}
} else {
sp18[gPlayers[i].port] = -0;
sp18[GwPlayer[i].port] = -0;
}
}
@ -126,7 +126,7 @@ void func_800F6898_ShortcutRouletteMagmaMountain(void) {
while (var_s1 != 2) {
switch (var_s1) {
case 0:
if (((gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].flags & 1) && (temp_s2 >= 0xF)) || (!(gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].flags & 1) && (D_800F5460[gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].port] & 0x8000))) {
if (((GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].flags & 1) && (temp_s2 >= 0xF)) || (!(GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].flags & 1) && (D_800F5460[GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].port] & 0x8000))) {
var_s1 = 1;
func_8003E81C(D_800F7314_ShortcutRouletteMagmaMountain, 2, 0);
func_8004F40C(D_800F7314_ShortcutRouletteMagmaMountain, 1, 2);
@ -153,7 +153,7 @@ void func_800F6898_ShortcutRouletteMagmaMountain(void) {
ShowTextWindow(windowID);
PlaySound(0xE6);
func_8004F4D4(D_800F7314_ShortcutRouletteMagmaMountain, 6, 0);
func_80060468(0x44A, gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].characterID);
func_80060468(0x44A, GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].character);
} else {
windowID = CreateTextWindow(0x60, 0x3C, 0xA, 2);
LoadStringIntoWindow(windowID, (void* )0x1F4, -1, -1);
@ -161,7 +161,7 @@ void func_800F6898_ShortcutRouletteMagmaMountain(void) {
ShowTextWindow(windowID);
PlaySound(0xE6);
func_8004F4D4(D_800F7314_ShortcutRouletteMagmaMountain, 5, 0);
func_80060468(0x451, gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].characterID);
func_80060468(0x451, GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].character);
}
func_8004DBD4(windowID, D_800F7310_ShortcutRouletteMagmaMountain);
HideTextWindow(windowID);
@ -221,13 +221,13 @@ void func_800F6F5C_ShortcutRouletteMagmaMountain(void) {
func_8004F2AC();
func_8004F8DC();
D_800F7318_ShortcutRouletteMagmaMountain = func_8004F954(0x26, 0x20);
D_800F7314_ShortcutRouletteMagmaMountain = CreateObject(func_80052F04(D_800F7310_ShortcutRouletteMagmaMountain), D_800F72E8_ShortcutRouletteMagmaMountain[gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].characterID]);
D_800F7314_ShortcutRouletteMagmaMountain = CreateObject(func_80052F04(D_800F7310_ShortcutRouletteMagmaMountain), D_800F72E8_ShortcutRouletteMagmaMountain[GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].character]);
VEC3F_COPY_TO_OBJ(D_800F7314_ShortcutRouletteMagmaMountain, D_800F7210_ShortcutRouletteMagmaMountain);
func_80021B14(*D_800F7314_ShortcutRouletteMagmaMountain->unk_3C->unk_40, gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].characterID, 0x80);
func_80021B14(*D_800F7314_ShortcutRouletteMagmaMountain->unk_3C->unk_40, GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].character, 0x80);
func_8004CCD0(&D_800F7314_ShortcutRouletteMagmaMountain->coords, &D_800F7204_ShortcutRouletteMagmaMountain, &D_800F7314_ShortcutRouletteMagmaMountain->unk_18);
func_80052E84(D_800F7310_ShortcutRouletteMagmaMountain);
func_8003E664(gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].playerObj);
VEC3F_COPY_TO_OBJ(gPlayers[D_800F7310_ShortcutRouletteMagmaMountain].playerObj, D_800F721C_ShortcutRouletteMagmaMountain);
func_8003E664(GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].player_obj);
VEC3F_COPY_TO_OBJ(GwPlayer[D_800F7310_ShortcutRouletteMagmaMountain].player_obj, D_800F721C_ShortcutRouletteMagmaMountain);
}
void func_800F70E8_ShortcutRouletteMagmaMountain(void) {

36
src/overlays/ovl_5B_BowservisitMagmaMountain/296B70.c
View File

@ -23,10 +23,10 @@ void func_800F65E0_BowservisitMagmaMountain(void) {
func_800F74C0_BowservisitMagmaMountain();
func_800F7120_BowservisitMagmaMountain();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
func_8003FCD4();
omAddPrcObj(func_800F66C4_BowservisitMagmaMountain, 0x300, 0, 0);
@ -54,7 +54,7 @@ void func_800F66C4_BowservisitMagmaMountain(void) { //fix me: remove gotos
PlaySound(0x46A);
HuPrcSleep(0xA);
if (gPlayers[D_800F7650_BowservisitMagmaMountain].starAmount != 0 && gPlayers[D_800F7650_BowservisitMagmaMountain].coins == 0) {
if (GwPlayer[D_800F7650_BowservisitMagmaMountain].stars != 0 && GwPlayer[D_800F7650_BowservisitMagmaMountain].coins == 0) {
windowID = CreateTextWindow(0x3C, 0x3C, 0x12, 3);
LoadStringIntoWindow(windowID, (void* )0x1EE, -1, -1);
func_8006E070(windowID, 0);
@ -72,7 +72,7 @@ void func_800F66C4_BowservisitMagmaMountain(void) { //fix me: remove gotos
func_80025798(D_800F7598_BowservisitMagmaMountain, D_800F765C_BowservisitMagmaMountain->coords.x, D_800F765C_BowservisitMagmaMountain->coords.y, D_800F765C_BowservisitMagmaMountain->coords.z);
func_80025830(D_800F7598_BowservisitMagmaMountain, 0.5f, 0.5f, 0.5f);
func_80055994(D_800F7650_BowservisitMagmaMountain, 2);
gPlayers[D_800F7650_BowservisitMagmaMountain].starAmount--;
GwPlayer[D_800F7650_BowservisitMagmaMountain].stars--;
func_800503B0(D_800F7650_BowservisitMagmaMountain, 6);
func_80060618(0x44A, D_800F7650_BowservisitMagmaMountain);
PlaySound(0x79);
@ -116,12 +116,12 @@ void func_800F66C4_BowservisitMagmaMountain(void) { //fix me: remove gotos
D_800F759C_BowservisitMagmaMountain = NULL;
}
else if (gPlayers[D_800F7650_BowservisitMagmaMountain].coins != 0 && gPlayers[D_800F7650_BowservisitMagmaMountain].starAmount == 0) {
else if (GwPlayer[D_800F7650_BowservisitMagmaMountain].coins != 0 && GwPlayer[D_800F7650_BowservisitMagmaMountain].stars == 0) {
windowID = CreateTextWindow(0x3C, 0x3C, 0x12, 3);
if (!(gPlayers[D_800F7650_BowservisitMagmaMountain].coins < 0x14)) {
if (!(GwPlayer[D_800F7650_BowservisitMagmaMountain].coins < 0x14)) {
var_s2 = 0x14;
} else {
var_s2 = gPlayers[D_800F7650_BowservisitMagmaMountain].coins;
var_s2 = GwPlayer[D_800F7650_BowservisitMagmaMountain].coins;
}
sprintf(&sp10, "%d", var_s2);
func_8006DA5C(windowID, &sp10, 0);
@ -140,7 +140,7 @@ void func_800F66C4_BowservisitMagmaMountain(void) { //fix me: remove gotos
HuPrcSleep(0x1E);
}
else if (gPlayers[D_800F7650_BowservisitMagmaMountain].starAmount == 0 && gPlayers[D_800F7650_BowservisitMagmaMountain].coins == 0) {
else if (GwPlayer[D_800F7650_BowservisitMagmaMountain].stars == 0 && GwPlayer[D_800F7650_BowservisitMagmaMountain].coins == 0) {
windowID = CreateTextWindow(0x3C, 0x3C, 0x11, 3);
LoadStringIntoWindow(windowID, (void*)0x1EA, -1, -1);
func_8006E070(windowID, 0);
@ -160,7 +160,7 @@ void func_800F66C4_BowservisitMagmaMountain(void) { //fix me: remove gotos
while (tempVar != 2) {
switch (tempVar) {
case 0:
if (((gPlayers[D_800F7650_BowservisitMagmaMountain].flags & 1) && (temp_s2 >= 0xF)) || (!(gPlayers[D_800F7650_BowservisitMagmaMountain].flags & 1) && (D_800F5460[gPlayers[D_800F7650_BowservisitMagmaMountain].port] & 0x8000))) {
if (((GwPlayer[D_800F7650_BowservisitMagmaMountain].flags & 1) && (temp_s2 >= 0xF)) || (!(GwPlayer[D_800F7650_BowservisitMagmaMountain].flags & 1) && (D_800F5460[GwPlayer[D_800F7650_BowservisitMagmaMountain].port] & 0x8000))) {
tempVar = 1;
func_8004F4D4(D_800F7658_BowservisitMagmaMountain, 1, 0);
func_8004F40C(D_800F7658_BowservisitMagmaMountain, 3, 2);
@ -181,10 +181,10 @@ void func_800F66C4_BowservisitMagmaMountain(void) { //fix me: remove gotos
if (func_80041624(D_800F7650_BowservisitMagmaMountain) == 0) {
windowID = CreateTextWindow(0x46, 0x41, 0xE, 2);
if (!(gPlayers[D_800F7650_BowservisitMagmaMountain].coins < 0x14)) {
if (!(GwPlayer[D_800F7650_BowservisitMagmaMountain].coins < 0x14)) {
var_s2 = 0x14;
} else {
var_s2 = gPlayers[D_800F7650_BowservisitMagmaMountain].coins;
var_s2 = GwPlayer[D_800F7650_BowservisitMagmaMountain].coins;
}
sprintf(&sp10, "%d", var_s2);
@ -264,16 +264,16 @@ void func_800F7120_BowservisitMagmaMountain(void) {
func_80025F60(*D_800F7658_BowservisitMagmaMountain->unk_3C->unk_40, 0);
func_800258EC(*D_800F7658_BowservisitMagmaMountain->unk_40->unk_40, 0x180, 0x80);
func_80025AD4(*D_800F7658_BowservisitMagmaMountain->unk_40->unk_40);
D_800F765C_BowservisitMagmaMountain = CreateObject(func_80052F04(D_800F7650_BowservisitMagmaMountain), D_800F7620_BowservisitMagmaMountain[gPlayers[D_800F7650_BowservisitMagmaMountain].characterID]);
D_800F765C_BowservisitMagmaMountain = CreateObject(func_80052F04(D_800F7650_BowservisitMagmaMountain), D_800F7620_BowservisitMagmaMountain[GwPlayer[D_800F7650_BowservisitMagmaMountain].character]);
func_80025B34(*D_800F765C_BowservisitMagmaMountain->unk_3C->unk_40);
VEC3F_COPY_TO_OBJ(D_800F765C_BowservisitMagmaMountain, D_800F75B8_BowservisitMagmaMountain);
func_8004CCD0(&D_800F765C_BowservisitMagmaMountain->coords, &D_800F7658_BowservisitMagmaMountain->coords, &D_800F765C_BowservisitMagmaMountain->unk_18);
func_8004CCD0(&D_800F7658_BowservisitMagmaMountain->coords, &D_800F765C_BowservisitMagmaMountain->coords, &D_800F7658_BowservisitMagmaMountain->unk_18);
func_80052E84(D_800F7650_BowservisitMagmaMountain);
func_8003E664(gPlayers[D_800F7650_BowservisitMagmaMountain].playerObj);
(gPlayers[D_800F7650_BowservisitMagmaMountain].playerObj)->coords.x = D_800F75AC_BowservisitMagmaMountain.x;
(gPlayers[D_800F7650_BowservisitMagmaMountain].playerObj)->coords.y = D_800F75AC_BowservisitMagmaMountain.y;
(gPlayers[D_800F7650_BowservisitMagmaMountain].playerObj)->coords.z = D_800F75AC_BowservisitMagmaMountain.z;
func_8003E664(GwPlayer[D_800F7650_BowservisitMagmaMountain].player_obj);
(GwPlayer[D_800F7650_BowservisitMagmaMountain].player_obj)->coords.x = D_800F75AC_BowservisitMagmaMountain.x;
(GwPlayer[D_800F7650_BowservisitMagmaMountain].player_obj)->coords.y = D_800F75AC_BowservisitMagmaMountain.y;
(GwPlayer[D_800F7650_BowservisitMagmaMountain].player_obj)->coords.z = D_800F75AC_BowservisitMagmaMountain.z;
}
void func_800F7404_BowservisitMagmaMountain(void) {

8
src/overlays/ovl_5C_HappeningSpaceEternalStar/297BE0.c
View File

@ -24,10 +24,10 @@ void func_800F65E0_HappeningSpaceEternalStar(void) {
func_800F68C0_HappeningSpaceEternalStar();
func_800F6824_HappeningSpaceEternalStar();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F66B4_HappeningSpaceEternalStar, 0x300, 0x2000, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F67E0_HappeningSpaceEternalStar);

18
src/overlays/ovl_5D_BowserVisitEternalStar/297FB0.c
View File

@ -38,10 +38,10 @@ void func_800F65E0_BowserVisitEternalStar(void) {
func_800F6F90_BowserVisitEternalStar();
func_800F6DD4_BowserVisitEternalStar();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F66BC_BowserVisitEternalStar, 0x300, 0x2000, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6D88_BowserVisitEternalStar);
@ -66,7 +66,7 @@ void func_800F66BC_BowserVisitEternalStar(void) {
PlaySound(0x46A);
HuPrcSleep(0xA);
if (gPlayers[D_800F7110_BowserVisitEternalStar].starAmount != 0) {
if (GwPlayer[D_800F7110_BowserVisitEternalStar].stars != 0) {
windowID = CreateTextWindow(0x28, 0x28, 0x15, 3);
LoadStringIntoWindow(windowID, (void* )0x1F8, -1, -1);
func_8006E070(windowID, 0);
@ -83,7 +83,7 @@ void func_800F66BC_BowserVisitEternalStar(void) {
func_80025798(D_800F7068_BowserVisitEternalStar, D_800F7118_BowserVisitEternalStar->coords.x, D_800F7118_BowserVisitEternalStar->coords.y, D_800F7118_BowserVisitEternalStar->coords.z);
func_80025830(D_800F7068_BowserVisitEternalStar, 0.5f, 0.5f, 0.5f);
func_80055994(D_800F7110_BowserVisitEternalStar, 2);
gPlayers[D_800F7110_BowserVisitEternalStar].starAmount--;
GwPlayer[D_800F7110_BowserVisitEternalStar].stars--;
func_800503B0(D_800F7110_BowserVisitEternalStar, 6);
func_80060618(0x44A, D_800F7110_BowserVisitEternalStar);
PlaySound(0x79);
@ -136,7 +136,7 @@ void func_800F66BC_BowserVisitEternalStar(void) {
HuPrcSleep(30);
}
else if (gPlayers[D_800F7110_BowserVisitEternalStar].coins == 0) {
else if (GwPlayer[D_800F7110_BowserVisitEternalStar].coins == 0) {
windowID = CreateTextWindow(0x3C, 0x28, 0x14, 3);
LoadStringIntoWindow(windowID, (void* )0x1FB, -1, -1);
func_8006E070(windowID, 0);
@ -147,7 +147,7 @@ void func_800F66BC_BowserVisitEternalStar(void) {
HuPrcSleep(30);
} else {
windowID = CreateTextWindow(0x28, 0x28, 0x15, 3);
temp = gPlayers[D_800F7110_BowserVisitEternalStar].coins;
temp = GwPlayer[D_800F7110_BowserVisitEternalStar].coins;
if (temp < 20) {
var_s2 = temp;
@ -221,7 +221,7 @@ void func_800F6DD4_BowserVisitEternalStar(void) {
D_800F7114_BowserVisitEternalStar->zScale = 1.5f;
D_800F7114_BowserVisitEternalStar->yScale = 1.5f;
D_800F7114_BowserVisitEternalStar->xScale = 1.5f;
D_800F7118_BowserVisitEternalStar = CreateObject(func_80052F04(D_800F7110_BowserVisitEternalStar), D_800F70E4_BowserVisitEternalStar[gPlayers[D_800F7110_BowserVisitEternalStar].characterID]);
D_800F7118_BowserVisitEternalStar = CreateObject(func_80052F04(D_800F7110_BowserVisitEternalStar), D_800F70E4_BowserVisitEternalStar[GwPlayer[D_800F7110_BowserVisitEternalStar].character]);
D_800F7118_BowserVisitEternalStar->coords.x = D_800F707C_BowserVisitEternalStar.x;
D_800F7118_BowserVisitEternalStar->coords.y = D_800F707C_BowserVisitEternalStar.y;
D_800F7118_BowserVisitEternalStar->coords.z = D_800F707C_BowserVisitEternalStar.z;

48
src/overlays/ovl_5E_StarVisitEternalStar/298AE0.c
View File

@ -106,10 +106,10 @@ void func_800F65E0_StarVisitEternalStar(void) {
func_800F7CF8_StarVisitEternalStar();
func_800F7A90_StarVisitEternalStar();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
func_8003FCD4();
omAddPrcObj(func_800F76D4_StarVisitEternalStar, 0x300, 0x2000, 0);
@ -129,15 +129,15 @@ s32 func_800F66D8_StarVisitEternalStar(s32 arg0) {
for (i = 0; i < 4; i++) {
if (i == D_800F7F00_StarVisitEternalStar) {
if (gPlayers[i].flags & 1) {
if (GwPlayer[i].flags & 1) {
var_s3 = 1;
sp18[gPlayers[i].port] = -0x8000;
sp18[GwPlayer[i].port] = -0x8000;
} else {
func_8007155C(arg0, sp20[gPlayers[i].port]);
sp18[gPlayers[i].port] = -1;
func_8007155C(arg0, sp20[GwPlayer[i].port]);
sp18[GwPlayer[i].port] = -1;
}
} else {
sp18[gPlayers[i].port] = -0;
sp18[GwPlayer[i].port] = -0;
}
}
if (var_s3 != 0) {
@ -183,7 +183,7 @@ void func_800F6898_StarVisitEternalStar(void) {
while (var_s0 != 2) {
switch (var_s0) {
case 0:
if (((gPlayers[D_800F7F00_StarVisitEternalStar].flags & 1) && (var_s2 >= 0xF)) || (!(gPlayers[D_800F7F00_StarVisitEternalStar].flags & 1) && (D_800F5460[gPlayers[D_800F7F00_StarVisitEternalStar].port] & 0x8000))) {
if (((GwPlayer[D_800F7F00_StarVisitEternalStar].flags & 1) && (var_s2 >= 0xF)) || (!(GwPlayer[D_800F7F00_StarVisitEternalStar].flags & 1) && (D_800F5460[GwPlayer[D_800F7F00_StarVisitEternalStar].port] & 0x8000))) {
var_s0 = 1;
func_8003E81C(D_800F7F08_StarVisitEternalStar, 2, 0);
func_8004F40C(D_800F7F08_StarVisitEternalStar, 1, 2);
@ -304,20 +304,20 @@ void func_800F6898_StarVisitEternalStar(void) {
D_800F7DC0_StarVisitEternalStar = NULL;
func_800427D4(D_800F7DC4_StarVisitEternalStar);
D_800F7DC4_StarVisitEternalStar = NULL;
func_80021CDC(*D_800F7F08_StarVisitEternalStar->unk_3C->unk_40, gPlayers[D_800F7F00_StarVisitEternalStar].characterID, 0x81);
func_80021CDC(*D_800F7F08_StarVisitEternalStar->unk_3C->unk_40, GwPlayer[D_800F7F00_StarVisitEternalStar].character, 0x81);
func_8004CCD0(&D_800F7F08_StarVisitEternalStar->coords, &D_800F32A0->coords, &D_800F7F08_StarVisitEternalStar->unk_18);
func_8003E81C(D_800F7F08_StarVisitEternalStar, 4, 0U);
gPlayers[D_800F7F00_StarVisitEternalStar].starAmount++;
GwPlayer[D_800F7F00_StarVisitEternalStar].stars++;
D_800F7DD0_StarVisitEternalStar = func_8004D8A4();
HuPrcSleep(0x24);
func_80060468(0x443, gPlayers[D_800F7F00_StarVisitEternalStar].characterID);
func_80060468(0x443, GwPlayer[D_800F7F00_StarVisitEternalStar].character);
HuPrcSleep(0x30);
func_80050160();
D_800F7DCC_StarVisitEternalStar = 1;
return;
}
if (gPlayers[D_800F7F00_StarVisitEternalStar].starAmount == 0) {
if (GwPlayer[D_800F7F00_StarVisitEternalStar].stars == 0) {
windowID = CreateTextWindow(0x50, 0x3C, 0xE, 3);
LoadStringIntoWindow(windowID, (void* )0x204, -1, -1);
func_8006E070(windowID, 0);
@ -337,11 +337,11 @@ void func_800F6898_StarVisitEternalStar(void) {
func_8004F4D4(D_800F7F08_StarVisitEternalStar, 5, 0);
func_8004F504(D_800F7F08_StarVisitEternalStar);
if (gPlayers[D_800F7F00_StarVisitEternalStar].starAmount != 0) {
if (GwPlayer[D_800F7F00_StarVisitEternalStar].stars != 0) {
func_800500A4();
PlaySound(0x44);
PlaySound(0x6D);
gPlayers[D_800F7F00_StarVisitEternalStar].starAmount--;
GwPlayer[D_800F7F00_StarVisitEternalStar].stars--;
func_800503B0((s32) D_800F7F00_StarVisitEternalStar, 6);
D_800F7DC0_StarVisitEternalStar = CreateObject(0x40U, NULL);
func_800A0D00(&D_800F7DC0_StarVisitEternalStar->coords, D_800F7DE0_StarVisitEternalStar.x, D_800F7DE0_StarVisitEternalStar.y + 200.0f, D_800F7DE0_StarVisitEternalStar.z);
@ -385,7 +385,7 @@ void func_800F76D4_StarVisitEternalStar(void) {
HuPrcSleep(8);
}
if (gPlayers[D_800F7F00_StarVisitEternalStar].starAmount >= 99) {
if (GwPlayer[D_800F7F00_StarVisitEternalStar].stars >= 99) {
windowID = CreateTextWindow(0x78, 0x3C, 0xC, 4);
LoadStringIntoWindow(windowID, (void*)0x207, -1, -1);
func_8006E070(windowID, 0);
@ -393,7 +393,7 @@ void func_800F76D4_StarVisitEternalStar(void) {
func_8004DBD4(windowID, D_800F7F00_StarVisitEternalStar);
HideTextWindow(windowID);
}
else if (gPlayers[D_800F7F00_StarVisitEternalStar].coins < 20) {
else if (GwPlayer[D_800F7F00_StarVisitEternalStar].coins < 20) {
windowID = CreateTextWindow(0x78, 0x28, 0xC, 6);
LoadStringIntoWindow(windowID, (void*)0x200, -1, -1);
func_8006E070(windowID, 0);
@ -485,18 +485,18 @@ void func_800F7A90_StarVisitEternalStar(void) {
D_800F7F04_StarVisitEternalStar->coords.y = D_800F7DD4_StarVisitEternalStar.y;
D_800F7F04_StarVisitEternalStar->coords.z = D_800F7DD4_StarVisitEternalStar.z;
D_800F7F04_StarVisitEternalStar->xScale = D_800F7F04_StarVisitEternalStar->yScale = D_800F7F04_StarVisitEternalStar->zScale = 1.5f;
D_800F7F08_StarVisitEternalStar = CreateObject(func_80052F04(D_800F7F00_StarVisitEternalStar), D_800F7EB4_StarVisitEternalStar[gPlayers[D_800F7F00_StarVisitEternalStar].characterID]);
D_800F7F08_StarVisitEternalStar = CreateObject(func_80052F04(D_800F7F00_StarVisitEternalStar), D_800F7EB4_StarVisitEternalStar[GwPlayer[D_800F7F00_StarVisitEternalStar].character]);
D_800F7F08_StarVisitEternalStar->coords.x = D_800F7DE0_StarVisitEternalStar.x;
D_800F7F08_StarVisitEternalStar->coords.y = D_800F7DE0_StarVisitEternalStar.y;
D_800F7F08_StarVisitEternalStar->coords.z = D_800F7DE0_StarVisitEternalStar.z;
func_80021B14(*D_800F7F08_StarVisitEternalStar->unk_3C->unk_40, gPlayers[D_800F7F00_StarVisitEternalStar].characterID, 0x80);
func_80021B14(*D_800F7F08_StarVisitEternalStar->unk_3C->unk_40, GwPlayer[D_800F7F00_StarVisitEternalStar].character, 0x80);
func_8004CCD0(&D_800F7F08_StarVisitEternalStar->coords, &D_800F7F04_StarVisitEternalStar->coords, &D_800F7F08_StarVisitEternalStar->unk_18);
func_8004CCD0(&D_800F7F04_StarVisitEternalStar->coords, &D_800F7F08_StarVisitEternalStar->coords, &D_800F7F04_StarVisitEternalStar->unk_18);
func_80052E84(D_800F7F00_StarVisitEternalStar);
func_8003E664(gPlayers[D_800F7F00_StarVisitEternalStar].playerObj);
(gPlayers[D_800F7F00_StarVisitEternalStar].playerObj)->coords.x = D_800F7DEC_StarVisitEternalStar.x;
(gPlayers[D_800F7F00_StarVisitEternalStar].playerObj)->coords.y = D_800F7DEC_StarVisitEternalStar.y;
(gPlayers[D_800F7F00_StarVisitEternalStar].playerObj)->coords.z = D_800F7DEC_StarVisitEternalStar.z;
func_8003E664(GwPlayer[D_800F7F00_StarVisitEternalStar].player_obj);
(GwPlayer[D_800F7F00_StarVisitEternalStar].player_obj)->coords.x = D_800F7DEC_StarVisitEternalStar.x;
(GwPlayer[D_800F7F00_StarVisitEternalStar].player_obj)->coords.y = D_800F7DEC_StarVisitEternalStar.y;
(GwPlayer[D_800F7F00_StarVisitEternalStar].player_obj)->coords.z = D_800F7DEC_StarVisitEternalStar.z;
}
void func_800F7C88_StarVisitEternalStar(void) {

14
src/overlays/ovl_5F_KoopaVisitEternalStar/29A400.c
View File

@ -59,10 +59,10 @@ void func_800F65E0_KoopaVisitEternalStar(void) {
func_800F6B80_KoopaVisitEternalStar();
func_800F69CC_KoopaVisitEternalStar();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(&func_800F673C_KoopaVisitEternalStar, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6988_KoopaVisitEternalStar);
@ -100,7 +100,7 @@ void func_800F673C_KoopaVisitEternalStar(void) {
func_8004CCD0(&D_800F6D18_KoopaVisitEternalStar->coords, &D_800F32A0->coords, &D_800F6D18_KoopaVisitEternalStar->unk_18);
func_8004F4D4(D_800F6D18_KoopaVisitEternalStar, 0, 0);
func_80060468(0x451, gPlayers[D_800F6D11_KoopaVisitEternalStar].characterID);
func_80060468(0x451, GwPlayer[D_800F6D11_KoopaVisitEternalStar].character);
func_80055960(D_800F6D11_KoopaVisitEternalStar, D_800F6C60_KoopaVisitEternalStar[D_800F6D12_KoopaVisitEternalStar]);
HuPrcSleep(0x28);
D_800F5144 = 1;
@ -139,11 +139,11 @@ void func_800F69CC_KoopaVisitEternalStar(void) {
D_800F6D14_KoopaVisitEternalStar->coords.x = D_800F6C94_KoopaVisitEternalStar.x;
D_800F6D14_KoopaVisitEternalStar->coords.y = D_800F6C94_KoopaVisitEternalStar.y;
D_800F6D14_KoopaVisitEternalStar->coords.z = D_800F6C94_KoopaVisitEternalStar.z;
D_800F6D18_KoopaVisitEternalStar = CreateObject(func_80052F04(D_800F6D11_KoopaVisitEternalStar), D_800F6CDC_KoopaVisitEternalStar[gPlayers[D_800F6D11_KoopaVisitEternalStar].characterID]);
D_800F6D18_KoopaVisitEternalStar = CreateObject(func_80052F04(D_800F6D11_KoopaVisitEternalStar), D_800F6CDC_KoopaVisitEternalStar[GwPlayer[D_800F6D11_KoopaVisitEternalStar].character]);
D_800F6D18_KoopaVisitEternalStar->coords.x = D_800F6CA0_KoopaVisitEternalStar.x;
D_800F6D18_KoopaVisitEternalStar->coords.y = D_800F6CA0_KoopaVisitEternalStar.y;
D_800F6D18_KoopaVisitEternalStar->coords.z = D_800F6CA0_KoopaVisitEternalStar.z;
func_80021B14(*D_800F6D18_KoopaVisitEternalStar->unk_3C->unk_40, gPlayers[D_800F6D11_KoopaVisitEternalStar].characterID, 0x80);
func_80021B14(*D_800F6D18_KoopaVisitEternalStar->unk_3C->unk_40, GwPlayer[D_800F6D11_KoopaVisitEternalStar].character, 0x80);
func_8004CCD0(&D_800F6D14_KoopaVisitEternalStar->coords, &D_800F6D18_KoopaVisitEternalStar->coords, &D_800F6D14_KoopaVisitEternalStar->unk_18);
func_8004CCD0(&D_800F6D18_KoopaVisitEternalStar->coords, &D_800F6D14_KoopaVisitEternalStar->coords, &D_800F6D18_KoopaVisitEternalStar->unk_18);
}

18
src/overlays/ovl_60/29AB30.c
View File

@ -16,10 +16,10 @@ void func_800F65E0_name_60(void) {
func_800F6B8C_name_60();
func_800F69BC_name_60();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(&func_800F66C4_name_60, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F6978_name_60);
@ -45,7 +45,7 @@ void func_800F66C4_name_60(void) {
HideTextWindow(textWindowID);
func_8004CCD0(&D_800F6EC8_name_60->coords , &D_800F32A0->coords, &D_800F6EC8_name_60->unk_18 );
func_8004F4D4(D_800F6EC8_name_60, 0, 0);
func_80060468(0x451, gPlayers[D_800F6EC1_name_60].characterID);
func_80060468(0x451, GwPlayer[D_800F6EC1_name_60].character);
func_80055960(D_800F6EC1_name_60, 20);
HuPrcSleep(40);
func_8003E81C(D_800F6EC8_name_60, 1, 2);
@ -97,11 +97,11 @@ void func_800F69BC_name_60(void) {
D_800F6EC4_name_60->coords.z = D_800F6D50_name_60[D_800F6EC0_name_60].z;
D_800F6EC4_name_60->unk_30 = 1000.0f;
func_8004F140(*D_800F6EC4_name_60->unk_3C->unk_40);
D_800F6EC8_name_60 = CreateObject(func_80052F04(D_800F6EC1_name_60), D_800F6E64_name_60[gPlayers[D_800F6EC1_name_60].characterID]);
D_800F6EC8_name_60 = CreateObject(func_80052F04(D_800F6EC1_name_60), D_800F6E64_name_60[GwPlayer[D_800F6EC1_name_60].character]);
D_800F6EC8_name_60->coords.x = D_800F6DB0_name_60[D_800F6EC0_name_60].x;
D_800F6EC8_name_60->coords.y = D_800F6DB0_name_60[D_800F6EC0_name_60].y;
D_800F6EC8_name_60->coords.z = D_800F6DB0_name_60[D_800F6EC0_name_60].z;
func_80021B14(*D_800F6EC8_name_60->unk_3C->unk_40, gPlayers[D_800F6EC1_name_60].characterID, 0x80);
func_80021B14(*D_800F6EC8_name_60->unk_3C->unk_40, GwPlayer[D_800F6EC1_name_60].character, 0x80);
func_8004CCD0(&D_800F6EC4_name_60->coords, &D_800F6EC8_name_60->coords, &D_800F6EC4_name_60->unk_18);
func_8004CCD0(&D_800F6EC8_name_60->coords, &D_800F6EC4_name_60->coords, &D_800F6EC8_name_60->unk_18);
}
@ -121,14 +121,14 @@ void func_800F6B8C_name_60(void) {
LoadBackgroundData(FE2310_ROM_START);
switch (D_800F6EC0_name_60) {
case 1:
if (gPlayers[D_800F6EC1_name_60].curChainIndex == 2) {
if (GwPlayer[D_800F6EC1_name_60].cur_chain == 2) {
var_a0 = 12;
} else {
var_a0 = 9;
}
break;
case 3:
switch (gPlayers[D_800F6EC1_name_60].curChainIndex) {
switch (GwPlayer[D_800F6EC1_name_60].cur_chain) {
case 2:
var_a0 = 29;
break;

14
src/overlays/ovl_62_BoardIntro/2A2500.c
View File

@ -16,16 +16,16 @@ INCLUDE_ASM("asm/nonmatchings/overlays/ovl_62_BoardIntro/2A2500", func_800F65E0_
// }
void func_800F6660_BoardIntro(s32 arg0, s32 arg1) {
playerMain* temp_s1;
playerMain* temp_s2;
playerMain* temp_v0;
GW_PLAYER* temp_s1;
GW_PLAYER* temp_s2;
GW_PLAYER* temp_v0;
temp_s1 = GetPlayerStruct(arg0);
temp_s2 = GetPlayerStruct(arg1);
temp_v0 = HuMemDirectMalloc(sizeof(playerMain));
bcopy(temp_s1, temp_v0, sizeof(playerMain));
bcopy(temp_s2, temp_s1, sizeof(playerMain));
bcopy(temp_v0, temp_s2, sizeof(playerMain));
temp_v0 = HuMemDirectMalloc(sizeof(GW_PLAYER));
bcopy(temp_s1, temp_v0, sizeof(GW_PLAYER));
bcopy(temp_s2, temp_s1, sizeof(GW_PLAYER));
bcopy(temp_v0, temp_s2, sizeof(GW_PLAYER));
HuMemDirectFree(temp_v0);
}

8
src/overlays/ovl_65_UnknownBooStealScene/2B74A0.c
View File

@ -19,10 +19,10 @@ void func_800F65E0_UnknownBooStealScene(void) {
func_800F922C_UnknownBooStealScene();
func_800F9024_UnknownBooStealScene();
func_800544E4();
func_800546B4(0, gPlayers[0].turn_status);
func_800546B4(1, gPlayers[1].turn_status);
func_800546B4(2, gPlayers[2].turn_status);
func_800546B4(3, gPlayers[3].turn_status);
func_800546B4(0, GwPlayer[0].turn_status);
func_800546B4(1, GwPlayer[1].turn_status);
func_800546B4(2, GwPlayer[2].turn_status);
func_800546B4(3, GwPlayer[3].turn_status);
func_8006CEA0();
omAddPrcObj(func_800F884C_UnknownBooStealScene, 0x300, 0, 0);
omAddObj(0x1000, 0, 0, -1, &func_800F8F18_UnknownBooStealScene);

10
src/overlays/ovl_74/2F9710.c
View File

@ -40,7 +40,7 @@ void func_800F6610_name_74(void) {
void func_800F666C_name_74(void) {
Object* temp_v1;
playerMain* player;
GW_PLAYER* player;
omInitObjMan(0x50, 0x28);
func_80060088();
@ -52,8 +52,8 @@ void func_800F666C_name_74(void) {
func_8005C3FC(0x51, 0x50);
func_80052E84(0);
player = GetPlayerStruct(0);
func_8003E174(player->playerObj);
player->playerObj->unk_0A |= 2;
func_8003E174(player->player_obj);
player->player_obj->unk_0A |= 2;
func_800F68E8_name_74();
func_800F6988_name_74();
func_800F6C88_name_74();
@ -79,12 +79,12 @@ void func_800F67A0_name_74(void) {
void func_800F67CC_name_74(void) {
unkUserData* temp_s1 = HuPrcCurrentGet()->user_data;
playerMain* temp_s2 = GetPlayerStruct(-1);
GW_PLAYER* temp_s2 = GetPlayerStruct(-1);
Vec3f* vec = &temp_s1->vec2;
while (1) {
HuPrcVSleep();
func_800A0E80(vec, &temp_s2->playerObj->coords, &temp_s1->vec1);
func_800A0E80(vec, &temp_s2->player_obj->coords, &temp_s1->vec1);
func_8003D408(vec);
}
}

14
src/overlays/ovl_75/2FA150.c
View File

@ -41,7 +41,7 @@ void func_800F6610_name_75(void) {
void func_800F666C_name_75(void) {
Object* temp_v1;
playerMain* player;
GW_PLAYER* player;
omInitObjMan(0x50, 0x28);
func_80060088();
@ -53,8 +53,8 @@ void func_800F666C_name_75(void) {
func_8005C3FC(0x52, 0x51);
func_80052E84(0);
player = GetPlayerStruct(0);
func_8003E174(player->playerObj);
player->playerObj->unk_0A |= 2;
func_8003E174(player->player_obj);
player->player_obj->unk_0A |= 2;
func_800F69F4_name_75();
EventTableHydrate(&D_800F6D04_name_75);
func_800F6610_name_75();
@ -78,19 +78,19 @@ void func_800F6790_name_75(void) {
void func_800F67BC_name_75(void) {
unkUserData* temp_s1 = HuPrcCurrentGet()->user_data;
playerMain* temp_s2 = GetPlayerStruct(-1);
GW_PLAYER* temp_s2 = GetPlayerStruct(-1);
Vec3f* vec = &temp_s1->vec2;
while (1) {
HuPrcVSleep();
func_800A0E80(vec, &temp_s2->playerObj->coords, &temp_s1->vec1);
func_800A0E80(vec, &temp_s2->player_obj->coords, &temp_s1->vec1);
func_8003D408(vec);
}
}
void func_800F682C_name_75(void) {
Object* temp_s0;
playerMain* temp_s1;
GW_PLAYER* temp_s1;
temp_s0 = HuPrcCurrentGet()->user_data;
temp_s1 = GetPlayerStruct(-1);
@ -98,7 +98,7 @@ void func_800F682C_name_75(void) {
while (1) {
HuPrcVSleep();
if (GetAbsSpaceIndexFromChainSpaceIndex(temp_s1->curChainIndex, temp_s1->curSpaceIndex) != 6) {
if (GetAbsSpaceIndexFromChainSpaceIndex(temp_s1->cur_chain, temp_s1->cur_space) != 6) {
continue;
}

6
src/overlays/ovl_76/2FA8D0.c
View File

@ -33,7 +33,7 @@ void func_800F6610_name_76(void) {
}
void func_800F666C_name_76(void) {
playerMain* player;
GW_PLAYER* player;
omInitObjMan(0x50, 0x28);
func_80060088();
@ -45,8 +45,8 @@ void func_800F666C_name_76(void) {
func_8005C3FC(0x53, 0x52);
func_80052E84(0);
player = GetPlayerStruct(0);
func_8003E174(player->playerObj);
player->playerObj->unk_0A |= 2;
func_8003E174(player->player_obj);
player->player_obj->unk_0A |= 2;
EventTableHydrate(&D_800F6A9C_name_76);
func_800F6610_name_76();
func_8005CC3C();

2
src/overlays/ovl_79/3005B0.c
View File

@ -28,7 +28,7 @@ s32 func_800F6AB4_name_79(void) {
INCLUDE_ASM("asm/nonmatchings/overlays/ovl_79/3005B0", func_800F6B00_name_79);
void func_800F6D18_name_79(s16 arg0) {
s16 thing = 1 << gPlayers[0].port;
s16 thing = 1 << GwPlayer[0].port;
func_8007155C(arg0, thing);
}

2
src/overlays/ovl_7D_MinigameIslandMISS/30C540.c
View File

@ -55,5 +55,5 @@ INCLUDE_ASM("asm/nonmatchings/overlays/ovl_7D_MinigameIslandMISS/30C540", func_8
INCLUDE_ASM("asm/nonmatchings/overlays/ovl_7D_MinigameIslandMISS/30C540", func_800F9020_MinigameIslandMISS);
s32 func_800F90F0_MinigameIslandMISS(s16 arg0) {
return (D_800F91B0_MinigameIslandMISS[arg0].unk_00 > gPlayers[0].coins_mg) ^ 1;
return (D_800F91B0_MinigameIslandMISS[arg0].unk_00 > GwPlayer[0].coins_mg) ^ 1;
}

12
src/overlays/ovl_82_MiniGameStadiumStartCopy/316440.c
View File

@ -11,16 +11,16 @@ void func_800F65E0_MiniGameStadiumStartCopy(void) {
}
void func_800F6650_MiniGameStadiumStartCopy(s32 arg0, s32 arg1) {
playerMain* temp_s0;
playerMain* temp_s1;
GW_PLAYER* temp_s0;
GW_PLAYER* temp_s1;
void* temp_s2;
temp_s1 = GetPlayerStruct(arg0);
temp_s2 = GetPlayerStruct(arg1);
temp_s0 = HuMemDirectMalloc(sizeof(playerMain));
bcopy(temp_s1, temp_s0, sizeof(playerMain));
bcopy(temp_s2, temp_s1, sizeof(playerMain));
bcopy(temp_s0, temp_s2, sizeof(playerMain));
temp_s0 = HuMemDirectMalloc(sizeof(GW_PLAYER));
bcopy(temp_s1, temp_s0, sizeof(GW_PLAYER));
bcopy(temp_s2, temp_s1, sizeof(GW_PLAYER));
bcopy(temp_s0, temp_s2, sizeof(GW_PLAYER));
HuMemDirectFree(temp_s0);
}

2
src/overlays/ovl_83_DebugMinigameMenu/317980.h
View File

@ -3,5 +3,5 @@
void func_800F8A34_DebugMinigameMenu(void);
void func_800622BC(u16, u16, s32);
extern s32 D_800ECB24;
extern playerMain D_800FAC60_DebugMinigameMenu[4]; //struct of size 0x30?
extern GW_PLAYER D_800FAC60_DebugMinigameMenu[4]; //struct of size 0x30?

2
symbol_addrs.txt
View File

@ -58,7 +58,7 @@ gThread3Stack = 0x800F2A70;
gInitThread = 0x800CD650;
gMainThread = 0x800CD800;
DecodeFile = 0x8001745C;
gPlayers = 0x800F32B0;
GwPlayer = 0x800F32B0;
SetPlayerAnimation = 0x80052BE8;
HuPrcCurrentGet = 0x800633A8;
HuPrcVSleep = 0x800635B4;

4
tools/install.sh
View File

@ -6,7 +6,7 @@ if cat /etc/os-release | grep -E 'ID=debian|ID_LIKE=(.*)debian' &> /dev/null; th
echo "Installing packages for Debian or derivative (apt)"
sudo apt install python3.10-venv
sudo apt -y install python3.10-venv
# Add i386 arch for wine32
sudo apt -y install python3-pip
sudo apt-get install -y gcc-mips-linux-gnu
@ -26,7 +26,7 @@ if cat /etc/os-release | grep -E 'ID=debian|ID_LIKE=(.*)debian' &> /dev/null; th
# Install the required dependencies
echo "Installing dependencies..."
pip install -r requirements.txt
pip3 install -r requirements.txt
echo "Setup complete! Virtual environment is ready and dependencies are installed."