From 83000dbb16f075ecd174b4f8a42efa84208d0438 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Wed, 6 Mar 2024 20:22:54 -0600 Subject: [PATCH] Document board/com files Also did various cleanups --- config/GMPE01_00/symbols.txt | 16 +- include/board_unsplit.h | 2 +- include/game/board/com.h | 2 +- include/game/board/com_path.h | 8 +- include/game/gamework_data.h | 14 + src/REL/w10Dll/main.c | 5 +- src/REL/w10Dll/scene.c | 2 +- src/game/board/com.c | 655 +++++++++++++++++----------------- src/game/board/com_path.c | 547 ++++++++++++++-------------- src/game/board/main.c | 7 - src/game/board/pause.c | 39 +- src/game/board/ui.c | 2 +- src/game/board/window.c | 19 +- 13 files changed, 645 insertions(+), 673 deletions(-) diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index c1a3fc7e..2f787f26 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -1339,7 +1339,7 @@ ExecComKey = .text:0x80071410; // type:function size:0xE8 scope:local BoardComPreferItemGet = .text:0x800714F8; // type:function size:0x100 BoardComPreferItemCheck = .text:0x800715F8; // type:function size:0x120 BoardComItemWeightGet = .text:0x80071718; // type:function size:0x74 -BoardComTutorialItemGet = .text:0x8007178C; // type:function size:0xD0 +BoardComUseItemSlotGet = .text:0x8007178C; // type:function size:0xD0 BoardComUseItemSet = .text:0x8007185C; // type:function size:0x6C BoardComUseItemCheck = .text:0x800718C8; // type:function size:0x68 ChooseUseItem = .text:0x80071930; // type:function size:0x16C scope:local @@ -1351,7 +1351,7 @@ CheckSwapUse = .text:0x80072370; // type:function size:0x198 scope:local CheckBooUse = .text:0x80072508; // type:function size:0x7C scope:local CheckLampUse = .text:0x80072584; // type:function size:0x74 scope:local BoardComJunctionInputGet = .text:0x800725F8; // type:function size:0x304 -BoardComBestPlayerFind = .text:0x800728FC; // type:function size:0xA8 +BoardComFarPlayerFind = .text:0x800728FC; // type:function size:0xA8 BoardViewOverheadExec = .text:0x800729A4; // type:function size:0x134 BoardViewFocusGetPos = .text:0x80072AD8; // type:function size:0x3C BoardViewFocusSet = .text:0x80072B14; // type:function size:0xF0 @@ -1517,7 +1517,7 @@ ShrinkCharWheel = .text:0x80082688; // type:function size:0x10C scope:local KillCharWheelSpr = .text:0x80082794; // type:function size:0x38 scope:local SetCharWheelChars = .text:0x800827CC; // type:function size:0xBC scope:local GetInput = .text:0x80082888; // type:function size:0x224 scope:local -BoardCharWheelSetTarget = .text:0x80082AAC; // type:function size:0x10 +BoardCharWheelTargetSet = .text:0x80082AAC; // type:function size:0x10 GetComDelay = .text:0x80082ABC; // type:function size:0x148 scope:local GetComInput = .text:0x80082C04; // type:function size:0x8C scope:local BoardMushroomExec = .text:0x80082C90; // type:function size:0xA4 @@ -1915,7 +1915,7 @@ BoardLast5Exec = .text:0x800A9708; // type:function size:0x84 DestroyLast5 = .text:0x800A978C; // type:function size:0x30 scope:local ExecLast5 = .text:0x800A97BC; // type:function size:0x1D4 scope:local CreateLast5 = .text:0x800A9990; // type:function size:0x184 scope:local -DestroyLast5 = .text:0x800A9B14; // type:function size:0x48 scope:local +KillLast5 = .text:0x800A9B14; // type:function size:0x48 scope:local InitHost = .text:0x800A9B5C; // type:function size:0x10C scope:local KillHost = .text:0x800A9C68; // type:function size:0xA4 scope:local Last5Main = .text:0x800A9D0C; // type:function size:0xCC0 scope:local @@ -1991,12 +1991,12 @@ AddValidLinks = .text:0x800B1CEC; // type:function size:0xD0 scope:local CheckPathSpace = .text:0x800B1DBC; // type:function size:0x30 scope:local FindValidLink = .text:0x800B1DEC; // type:function size:0xAC scope:local CheckEndSpace = .text:0x800B1E98; // type:function size:0xF0 scope:local -BoardComPathReachCheck = .text:0x800B1F88; // type:function size:0x74C +BoardComPathShortcutLenGet = .text:0x800B1F88; // type:function size:0x74C BoardComPathBestGet = .text:0x800B26D4; // type:function size:0x3E4 BoardComPathLenGet = .text:0x800B2AB8; // type:function size:0x65C CheckPath = .text:0x800B3114; // type:function size:0x488 scope:local -BoardComPathW20BestGet = .text:0x800B359C; // type:function size:0x45C -CheckW20Path = .text:0x800B39F8; // type:function size:0x4E0 scope:local +BoardComPathBestGetFlag = .text:0x800B359C; // type:function size:0x45C +CheckPathFlag = .text:0x800B39F8; // type:function size:0x4E0 scope:local TutorialProcFunc = .text:0x800B3ED8; // type:function size:0x34 scope:local BoardTutorialInit = .text:0x800B3F0C; // type:function size:0x80 BoardTutorialKill = .text:0x800B3F8C; // type:function size:0x4C @@ -5192,7 +5192,7 @@ megaSquishSfxTbl = .data:0x80139A80; // type:object size:0x20 scope:local PortraitTbl = .data:0x80139AA0; // type:object size:0x24 scope:local StarPortraitTbl = .data:0x80139AC4; // type:object size:0x24 scope:local boardMusTbl = .data:0x80139AE8; // type:object size:0x12 scope:local -comItemWeightTbl = .data:0x80139B00; // type:object size:0x60 scope:local +comItemPreferTbl = .data:0x80139B00; // type:object size:0x60 scope:local comItemUseCheckFuncTbl = .data:0x80139B60; // type:object size:0x38 scope:local comJunctionDirTbl = .data:0x80139B98; // type:object size:0x30 scope:local overhead2DPos = .data:0x80139BC8; // type:object size:0x28 scope:local diff --git a/include/board_unsplit.h b/include/board_unsplit.h index 2c7dcf01..8e005d90 100644 --- a/include/board_unsplit.h +++ b/include/board_unsplit.h @@ -16,7 +16,7 @@ s32 BoardSpacePosGet(s32, s32, Vec*); void BoardShopTutorialExec(s32); void BoardMGSetupTutorialExec(void); void BoardBooHouseTutorialExec(void); -void BoardCharWheelSetTarget(s32); +void BoardCharWheelTargetSet(s32); void BoardSpaceStarSetIndex(s32); void BoardLightHookSet(BoardLightHook set, BoardLightHook reset); s32 fn_8006DDE8(s16, f32); diff --git a/include/game/board/com.h b/include/game/board/com.h index a75d35ab..d0db30fa 100755 --- a/include/game/board/com.h +++ b/include/game/board/com.h @@ -10,7 +10,7 @@ void BoardComKeySetDown(void); s8 BoardComPreferItemGet(s32 arg0, s8 *arg1, s8 arg2); s8 BoardComPreferItemCheck(s32 arg0, s8 arg1, s8 arg2, s8 arg3); s32 BoardComItemWeightGet(s32 arg0, s32 arg1); -s32 BoardComTutorialItemGet(s32 arg0); +s32 BoardComUseItemSlotGet(s32 arg0); s32 BoardComUseItemSet(s32 arg0, s32 arg1); BOOL BoardComUseItemCheck(s32 arg0); s32 BoardComJunctionInputGet(s32 arg0, Vec *arg1, s32 arg2, float *arg3); diff --git a/include/game/board/com_path.h b/include/game/board/com_path.h index 2fa6e313..869d3b48 100755 --- a/include/game/board/com_path.h +++ b/include/game/board/com_path.h @@ -3,9 +3,9 @@ #include "dolphin/types.h" -s16 BoardComPathReachCheck(s16 arg0, u32 arg1, s32 arg2); -s16 BoardComPathBestGet(s16 arg0); -s16 BoardComPathLenGet(s16 arg0, s16 arg1); -s16 BoardComPathW20BestGet(s16 arg0, u32 arg1, s16 arg2); +s16 BoardComPathShortcutLenGet(s16 space, u32 type, s32 block_pipe); +s16 BoardComPathBestGet(s16 space); +s16 BoardComPathLenGet(s16 space, s16 space_other); +s16 BoardComPathBestGetFlag(s16 space, u32 flag, s16 len); #endif diff --git a/include/game/gamework_data.h b/include/game/gamework_data.h index 874b1e71..1ab6b00d 100644 --- a/include/game/gamework_data.h +++ b/include/game/gamework_data.h @@ -180,14 +180,28 @@ static inline s32 GWMGShowComGet(void) static inline s32 GWMGListGet(void) { + if (GWSystem.mg_list == 3) { + GWSystem.mg_list = 0; + } return GWSystem.mg_list; } static inline s32 GWMessSpeedGet(void) { + if (GWSystem.mess_speed == 3) { + GWSystem.mess_speed = 1; + } return GWSystem.mess_speed; } +static inline s32 GWSaveModeGet(void) +{ + if (GWSystem.save_mode == 3) { + GWSystem.save_mode = 1; + } + return GWSystem.save_mode; +} + static inline s32 GWTurnGet(void) { return GWSystem.turn; diff --git a/src/REL/w10Dll/main.c b/src/REL/w10Dll/main.c index c38b242f..00e96288 100644 --- a/src/REL/w10Dll/main.c +++ b/src/REL/w10Dll/main.c @@ -5,6 +5,7 @@ #include "game/board/model.h" #include "game/board/star.h" #include "game/board/tutorial.h" +#include "game/board/main.h" #include "math.h" @@ -78,9 +79,9 @@ void BoardCreate(void) { s32 i; unkw10Dll* temp_r30; s32 temp; - s32 temp2; + s32 board; - temp2 = get_current_board(); + board = BoardCurrGet(); lbl_1_bss_0 = (W10State *)&GWSystem.board_data; lbl_1_bss_0->unk0 = 0; lbl_1_bss_0->unk4 = 0; diff --git a/src/REL/w10Dll/scene.c b/src/REL/w10Dll/scene.c index 0570fce7..52909d78 100644 --- a/src/REL/w10Dll/scene.c +++ b/src/REL/w10Dll/scene.c @@ -113,7 +113,7 @@ void fn_1_1134(void) { fn_1_1E3C(7, 0x122, 0x8C); fn_1_BA0(0x2E0017); fn_1_1FB0(); - BoardCharWheelSetTarget(1); + BoardCharWheelTargetSet(1); } void fn_1_1178(void) { diff --git a/src/game/board/com.c b/src/game/board/com.c index fae9cae0..9540d290 100755 --- a/src/game/board/com.c +++ b/src/game/board/com.c @@ -7,28 +7,29 @@ #include "game/board/space.h" #include "game/board/tutorial.h" #include "game/board/window.h" +#include "game/board/boo.h" #include "math.h" -s32 BoardBooComUseCheck(s32); +typedef BOOL (*UseCheckFunc)(s32 player, s32 item); static void ExecComKeyLeft(void); static void ExecComKeyRight(void); static void ExecComKeyUp(void); static void ExecComKeyDown(void); -static void ExecComKey(s32 arg0, s32 arg1, s32 arg2); -static s32 ChooseUseItem(s32 arg0); -static BOOL CheckMiniUse(s32 arg0, s32 arg1); -static BOOL CheckMegaUse(s32 arg0, s32 arg1); -static BOOL CheckSparkUse(s32 arg0, s32 arg1); -static BOOL CheckBoardChangeUse(s32 arg0, s32 arg1); -static BOOL CheckSwapUse(s32 arg0, s32 arg1); -static BOOL CheckBooUse(s32 arg0, s32 arg1); -static BOOL CheckLampUse(s32 arg0, s32 arg1); +static void ExecComKey(s32 player, s32 move, s32 vertical); +static s32 ChooseUseItem(s32 player); +static BOOL CheckMiniUse(s32 player, s32 item); +static BOOL CheckMegaUse(s32 player, s32 item); +static BOOL CheckSparkUse(s32 player, s32 item); +static BOOL CheckBoardChangeUse(s32 player, s32 item); +static BOOL CheckSwapUse(s32 player, s32 item); +static BOOL CheckBooUse(s32 player, s32 item); +static BOOL CheckLampUse(s32 player, s32 item); static s8 itemUse = -1; -static s8 comItemWeightTbl[8][12] = { +static s8 comItemPreferTbl[8][12] = { { 0x0C, 0x0B, 0x05, 0x03, 0x01, 0x02, 0x06, 0x04, 0x00, 0x07, 0x09, 0x0A }, { 0x0C, 0x0B, 0x05, 0x0A, 0x03, 0x01, 0x02, 0x00, 0x06, 0x04, 0x07, 0x09 }, { 0x0C, 0x0B, 0x05, 0x06, 0x03, 0x01, 0x02, 0x0A, 0x07, 0x09, 0x00, 0x04 }, @@ -39,7 +40,7 @@ static s8 comItemWeightTbl[8][12] = { { 0x0C, 0x05, 0x07, 0x0B, 0x0A, 0x09, 0x04, 0x06, 0x03, 0x01, 0x02, 0x00 } }; -static BOOL (*comItemUseCheckFuncTbl[])(s32, s32) = { +static UseCheckFunc comItemUseCheckFuncTbl[] = { CheckMiniUse, CheckMegaUse, CheckMiniUse, @@ -95,322 +96,322 @@ void BoardComKeySetDown(void) { BoardWinComKeyFuncSet(ExecComKeyDown); } -static void ExecComKey(s32 arg0, s32 arg1, s32 arg2) { - s32 sp14[4]; - s32 temp_r31; - s16 temp_r30; - s32 var_r29; +static void ExecComKey(s32 player, s32 move, s32 vertical) { + s32 comkey[4]; + s32 port; + s16 delay; + s32 dpad; - sp14[0] = sp14[1] = sp14[2] = sp14[3] = 0; - temp_r31 = GWPlayer[arg0].port; - temp_r30 = GWMessDelayGet(); - if (arg2 == 0) { - var_r29 = 4; + comkey[0] = comkey[1] = comkey[2] = comkey[3] = 0; + port = GWPlayer[player].port; + delay = GWMessDelayGet(); + if (vertical == 0) { + dpad = PAD_BUTTON_DOWN; } else { - var_r29 = 2; + dpad = PAD_BUTTON_RIGHT; } - if (arg1 == 1) { - sp14[temp_r31] = var_r29; - HuWinComKeyWait(sp14[0], sp14[1], sp14[2], sp14[3], temp_r30); + if (move == 1) { + comkey[port] = dpad; + HuWinComKeyWait(comkey[0], comkey[1], comkey[2], comkey[3], delay); } - sp14[temp_r31] = 0x100; - HuWinComKeyWait(sp14[0], sp14[1], sp14[2], sp14[3], temp_r30); + comkey[port] = 0x100; + HuWinComKeyWait(comkey[0], comkey[1], comkey[2], comkey[3], delay); } -s8 BoardComPreferItemGet(s32 arg0, s8 *arg1, s8 arg2) { - s32 temp_r26; - s32 var_r28; - s32 temp_r29; - s32 var_r27; +s8 BoardComPreferItemGet(s32 player, s8 *items, s8 num_items) { + s32 character; + s32 weight; + s32 item; + s32 prefer; s32 i; s32 j; - temp_r26 = GWPlayer[arg0].character; - var_r27 = -1; - var_r28 = 0x64; - for (i = 0; i < arg2; i++) { - temp_r29 = arg1[i]; - for (j = 0; j < 0xC; j++) { - if (temp_r29 == comItemWeightTbl[temp_r26][j]) { - if (j < var_r28 && (BoardPlayerItemFind(arg0, temp_r29) == -1 || temp_r29 == 0xC || temp_r29 == 0xB)) { - var_r28 = j; - var_r27 = i; + character = GWPlayer[player].character; + prefer = -1; + weight = 100; + for (i = 0; i < num_items; i++) { + item = items[i]; + for (j = 0; j < 12; j++) { + if (item == comItemPreferTbl[character][j]) { + if (j < weight && (BoardPlayerItemFind(player, item) == -1 || item == 0xC || item == 0xB)) { + weight = j; + prefer = i; } break; } } } - if (var_r28 == 0x64) { + if (weight == 100) { return -1; } - return var_r27; + return prefer; } -s8 BoardComPreferItemCheck(s32 arg0, s8 arg1, s8 arg2, s8 arg3) { - s8 spB[3]; - s8 temp_r25; +s8 BoardComPreferItemCheck(s32 player, s8 item1, s8 item2, s8 item3) { + s8 items[3]; + s8 prefer; - spB[0] = arg1; - spB[1] = arg2; - spB[2] = arg3; - temp_r25 = BoardComPreferItemGet(arg0, spB, 3); - return temp_r25; + items[0] = item1; + items[1] = item2; + items[2] = item3; + prefer = BoardComPreferItemGet(player, items, 3); + return prefer; } -s32 BoardComItemWeightGet(s32 arg0, s32 arg1) { - s32 var_r30; +s32 BoardComItemWeightGet(s32 player, s32 item) { + s32 weight; s32 i; - for (i = 0; i < 0xC; i++) { - if (arg1 == comItemWeightTbl[GWPlayer[arg0].character][i]) { + for (i = 0; i < 12; i++) { + if (item == comItemPreferTbl[GWPlayer[player].character][i]) { break; } } - var_r30 = 0xB - i; - return var_r30; + weight = 12-1-i; + return weight; } -s32 BoardComTutorialItemGet(s32 arg0) { - s32 var_r30; - s32 var_r31; +s32 BoardComUseItemSlotGet(s32 player) { + s32 slot; + s32 item; - if (!GWPlayer[arg0].com) { + if (!GWPlayer[player].com) { return -1; } if (itemUse != -1) { - var_r31 = itemUse; + item = itemUse; } - if (boardTutorialUseItem >= 0 && boardTutorialUseItem <= 0xD) { - var_r31 = boardTutorialUseItem; + if (boardTutorialUseItem >= 0 && boardTutorialUseItem <= 13) { + item = boardTutorialUseItem; boardTutorialUseItem = -1; } - if (var_r31 != -1) { - var_r30 = BoardPlayerItemFind(arg0, var_r31); + if (item != -1) { + slot = BoardPlayerItemFind(player, item); } else { - var_r30 = -1; + slot = -1; } - return var_r30; + return slot; } -s32 BoardComUseItemSet(s32 arg0, s32 arg1) { - if (arg1 == -1) { +s32 BoardComUseItemSet(s32 player, s32 item) { + if (item == -1) { itemUse = -1; return 1; } - if (BoardPlayerItemFind(arg0, arg1) != -1) { - itemUse = arg1; + if (BoardPlayerItemFind(player, item) != -1) { + itemUse = item; return 1; } return 0; } -BOOL BoardComUseItemCheck(s32 arg0) { - s32 var_r31; +BOOL BoardComUseItemCheck(s32 player) { + s32 count; - var_r31 = BoardPlayerItemCount(arg0); - if (var_r31 <= 0) { + count = BoardPlayerItemCount(player); + if (count <= 0) { return FALSE; } - if (ChooseUseItem(arg0) != -1) { + if (ChooseUseItem(player) != -1) { return TRUE; } return FALSE; } -static s32 ChooseUseItem(s32 arg0) { +static s32 ChooseUseItem(s32 player) { s32 i; s32 j; - s32 temp_r29; - s32 var_r28; - s32 temp_r27; - s32 temp_r25; - BOOL (*temp_r24)(s32, s32); - s8 temp_r23; + s32 useItem; + s32 weight; + s32 item; + s32 character; + UseCheckFunc func; + s8 result; - temp_r29 = -1; - temp_r25 = GWPlayer[arg0].character; - var_r28 = 0x64; + useItem = -1; + character = GWPlayer[player].character; + weight = 0x64; for (i = 0; i < 3; i++) { - temp_r27 = GWPlayer[arg0].items[i]; - if (temp_r27 == -1) { + item = GWPlayer[player].items[i]; + if (item == -1) { continue; } - temp_r24 = comItemUseCheckFuncTbl[temp_r27]; - if (!temp_r24) { + func = comItemUseCheckFuncTbl[item]; + if (!func) { continue; } - temp_r23 = temp_r24(arg0, temp_r27); - if (temp_r23) { + result = func(player, item); + if (result) { for (j = 0; j < 0xC; j++) { - if (temp_r27 == comItemWeightTbl[temp_r25][j]) { - if (j < var_r28) { - var_r28 = j; + if (item == comItemPreferTbl[character][j]) { + if (j < weight) { + weight = j; } break; } } } } - if (var_r28 == 0x64) { + if (weight == 0x64) { return -1; } - temp_r29 = comItemWeightTbl[temp_r25][var_r28]; - if (temp_r29 == -1) { + useItem = comItemPreferTbl[character][weight]; + if (useItem == -1) { itemUse = -1; - } else if (BoardPlayerItemFind(arg0, temp_r29) != -1) { - itemUse = temp_r29; + } else if (BoardPlayerItemFind(player, useItem) != -1) { + itemUse = useItem; } - return temp_r29; + return useItem; } -static BOOL CheckMiniUse(s32 arg0, s32 arg1) { - s32 temp_r29; - s32 var_r26; - s32 var_r25; - s32 temp_r28; - s32 temp_r23; - s32 var_r24; - s32 var_r31; - s32 var_r30; +static BOOL CheckMiniUse(s32 player, s32 item) { + s32 space; + s32 star_dist_pipe; + s32 star_dist_no_pipe; + s32 diff; + s32 character; + s32 force_use_mini; + s32 max_dist; + s32 chance; - var_r24 = 0; - temp_r29 = GWPlayer[arg0].space_curr; - temp_r28 = GWPlayer[arg0].diff; - temp_r23 = GWPlayer[arg0].character; - switch (temp_r28) { + force_use_mini = 0; + space = GWPlayer[player].space_curr; + diff = GWPlayer[player].diff; + character = GWPlayer[player].character; + switch (diff) { case 0: - var_r30 = 0x32; + chance = 50; break; case 1: - var_r30 = 0x19; + chance = 25; break; case 2: - var_r30 = 5; + chance = 5; break; case 3: - var_r30 = 0; + chance = 0; break; } - if ((temp_r28 == 0 || temp_r28 == 1) && temp_r23 == 1) { - var_r30 = 7; + if ((diff == 0 || diff == 1) && character == 1) { + chance = 7; } if (GWBoardGet() != 7 && GWBoardGet() != 8) { - var_r26 = BoardComPathReachCheck(temp_r29, 8, 0); - var_r25 = BoardComPathReachCheck(temp_r29, 8, 1); + star_dist_pipe = BoardComPathShortcutLenGet(space, 8, 0); + star_dist_no_pipe = BoardComPathShortcutLenGet(space, 8, 1); } else { - var_r26 = 0x3E7; - var_r25 = BoardComPathW20BestGet(temp_r29, 0x10000000, 0xA); + star_dist_pipe = 0x3E7; + star_dist_no_pipe = BoardComPathBestGetFlag(space, 0x10000000, 10); if ((GWBoardGet() == 8 || GWBoardGet() == 7) && BoardRandMod(0x64) < 0x3C) { - var_r24 = 1; + force_use_mini = 1; } } - switch (GWPlayer[arg0].diff) { + switch (GWPlayer[player].diff) { case 0: - var_r31 = 5; + max_dist = 5; break; case 1: - var_r31 = 7; + max_dist = 7; break; case 2: - var_r31 = 9; + max_dist = 9; break; case 3: - var_r31 = 0xA; + max_dist = 10; break; } - if ((var_r25 < var_r31 || var_r26 < var_r31 || var_r24 != 0) && BoardRandMod(0x64) >= var_r30) { + if ((star_dist_no_pipe < max_dist || star_dist_pipe < max_dist || force_use_mini != 0) && BoardRandMod(0x64) >= chance) { return TRUE; } return FALSE; } -static BOOL CheckMegaUse(s32 arg0, s32 arg1) { - s32 temp_r27; - s32 temp_r26; - s32 temp_r24; - s32 temp_r29; - s16 temp_r25; - s16 var_r28; - s16 temp_r23; - s16 temp_r22; +static BOOL CheckMegaUse(s32 player, s32 item) { + s32 short_len; + s32 character; + s32 space; + s32 diff; + s16 path_len; + s16 max_len; + s16 space_search; + s16 space_other; s16 i; - temp_r29 = GWPlayer[arg0].diff; - temp_r26 = GWPlayer[arg0].character; - switch (temp_r29) { + diff = GWPlayer[player].diff; + character = GWPlayer[player].character; + switch (diff) { case 0: - var_r28 = 5; + max_len = 5; break; case 1: - var_r28 = 7; + max_len = 7; break; case 2: - var_r28 = 9; + max_len = 9; break; case 3: - var_r28 = 0xA; + max_len = 10; break; } - if (((temp_r29 == 0 || temp_r29 == 1) && temp_r26 == 0) || ((temp_r29 == 0 || temp_r29 == 1) && temp_r26 == 5)) { - var_r28 = 8; + if (((diff == 0 || diff == 1) && character == 0) || ((diff == 0 || diff == 1) && character == 5)) { + max_len = 8; } - if (GWBoardGet() != 7 || BoardRandMod(0x64) >= 0x3C) { - temp_r24 = GWPlayer[arg0].space_curr; - temp_r27 = BoardComPathReachCheck(temp_r24, 8, 0); - temp_r23 = GWPlayer[arg0].space_curr; + if (GWBoardGet() != 7 || BoardRandMod(0x64) >= 60) { + space = GWPlayer[player].space_curr; + short_len = BoardComPathShortcutLenGet(space, 8, 0); + space_search = GWPlayer[player].space_curr; for (i = 0; i < 4; i++) { - if (i != arg0) { - temp_r22 = GWPlayer[i].space_curr; - temp_r25 = BoardComPathLenGet(temp_r23, temp_r22); - if (temp_r25 < var_r28 + 0x14 && temp_r25 > 0 && GWTeamGet() && i == BoardPlayerSameTeamFind(arg0)) { + if (i != player) { + space_other = GWPlayer[i].space_curr; + path_len = BoardComPathLenGet(space_search, space_other); + if (path_len < max_len + 20 && path_len > 0 && GWTeamGet() && i == BoardPlayerSameTeamFind(player)) { return FALSE; } } } - if (GWBoardGet() != 7 && GWBoardGet() != 8 && temp_r27 < 0xA && temp_r27 > 0) { + if (GWBoardGet() != 7 && GWBoardGet() != 8 && short_len < 10 && short_len > 0) { return FALSE; } } - if (BoardPlayerItemFind(arg0, arg1) != -1) { + if (BoardPlayerItemFind(player, item) != -1) { return TRUE; } return FALSE; } -static BOOL CheckSparkUse(s32 arg0, s32 arg1) { - s32 temp_r27; - s32 temp_r28; - s32 temp_r26; - s32 temp_r25; - s32 temp_r24; +static BOOL CheckSparkUse(s32 player, s32 item) { + s32 length; + s32 diff; + s32 space_other; + s32 space; + s32 character; s32 i; - s32 var_r30; + s32 chance; - temp_r25 = GWPlayer[arg0].space_curr; - temp_r28 = GWPlayer[arg0].diff; - temp_r24 = GWPlayer[arg0].character; - switch (temp_r28) { + space = GWPlayer[player].space_curr; + diff = GWPlayer[player].diff; + character = GWPlayer[player].character; + switch (diff) { case 0: - var_r30 = 0x32; + chance = 50; break; case 1: - var_r30 = 0x19; + chance = 25; break; case 2: - var_r30 = 5; + chance = 5; break; case 3: - var_r30 = 0; + chance = 0; break; } - if ((temp_r28 == 0 || temp_r28 == 1) && temp_r24 == 7) { - var_r30 = 7; + if ((diff == 0 || diff == 1) && character == 7) { + chance = 7; } for (i = 0; i < 4; i++) { - if (i != arg0) { - temp_r26 = GWPlayer[i].space_curr; - temp_r27 = BoardComPathLenGet(temp_r26, temp_r25); - if (temp_r27 > 0 && temp_r27 <= 0xF && BoardPlayerItemFind(arg0, arg1) != -1 && BoardRandMod(0x64) >= var_r30) { + if (i != player) { + space_other = GWPlayer[i].space_curr; + length = BoardComPathLenGet(space_other, space); + if (length > 0 && length <= 15 && BoardPlayerItemFind(player, item) != -1 && BoardRandMod(0x64) >= chance) { return TRUE; } } @@ -418,260 +419,260 @@ static BOOL CheckSparkUse(s32 arg0, s32 arg1) { return FALSE; } -static BOOL CheckBoardChangeUse(s32 arg0, s32 arg1) { - s32 temp_r25; - s32 temp_r24; - s32 temp_r23; - s32 temp_r22; - s32 temp_r21; - s32 temp_r26; - s32 var_r30; - s32 var_r29; - s32 var_r27; +static BOOL CheckBoardChangeUse(s32 player, s32 item) { + s32 diff; + s32 character; + s32 mini_len; + s32 non_mini_len; + s32 search_space; + s32 space; + s32 length_min; + s32 length; + s32 chance; s32 i; - temp_r25 = GWPlayer[arg0].diff; - temp_r24 = GWPlayer[arg0].character; - switch (temp_r25) { + diff = GWPlayer[player].diff; + character = GWPlayer[player].character; + switch (diff) { case 0: - var_r27 = 0x32; + chance = 0x32; break; case 1: - var_r27 = 0x19; + chance = 0x19; break; case 2: - var_r27 = 5; + chance = 5; break; case 3: - var_r27 = 0; + chance = 0; break; } - if (((arg1 == 4 && temp_r24 == 4) || (arg1 == 5 && (temp_r24 == 6 || temp_r24 == 3))) && (temp_r25 == 0 || temp_r25 == 1)) { - var_r27 = 7; + if (((item == 4 && character == 4) || (item == 5 && (character == 6 || character == 3))) && (diff == 0 || diff == 1)) { + chance = 7; } - var_r30 = 0x3E7; + length_min = 999; for (i = 0; i < 4; i++) { - if (arg0 == i) { + if (player == i) { continue; } - temp_r21 = GWPlayer[i].space_curr; - if (!GWTeamGet() || i != BoardPlayerSameTeamFind(arg0)) { - temp_r26 = GWPlayer[i].space_curr; + search_space = GWPlayer[i].space_curr; + if (!GWTeamGet() || i != BoardPlayerSameTeamFind(player)) { + space = GWPlayer[i].space_curr; if (GWBoardGet() == 7) { - if (BoardComPathW20BestGet(temp_r21, 0x10000000, 0xA) != -1) { - var_r29 = 0xA; + if (BoardComPathBestGetFlag(search_space, 0x10000000, 10) != -1) { + length = 10; } else { - var_r29 = 0; + length = 0; } } else if (GWBoardGet() == 8) { - if (BoardComPathW20BestGet(temp_r21, 0x200000, 0xA) != -1 || BoardComPathW20BestGet(temp_r21, 0x400000, 0xA) != -1) { - var_r29 = 0xA; + if (BoardComPathBestGetFlag(search_space, 0x200000, 10) != -1 || BoardComPathBestGetFlag(search_space, 0x400000, 10) != -1) { + length = 10; } else { - var_r29 = 0; + length = 0; } } else { - var_r29 = BoardComPathReachCheck(temp_r26, 8, 0); + length = BoardComPathShortcutLenGet(space, 8, 0); } - if (var_r29 != 0 && var_r29 < var_r30) { - var_r30 = var_r29; + if (length != 0 && length < length_min) { + length_min = length; } } } - if ((var_r30 > 0xF && var_r30 != 0x3E7) || (GWTeamGet() && i == BoardPlayerSameTeamFind(arg0))) { + if ((length_min > 0xF && length_min != 999) || (GWTeamGet() && i == BoardPlayerSameTeamFind(player))) { return FALSE; } - temp_r26 = GWPlayer[arg0].space_curr; - temp_r23 = BoardComPathReachCheck(temp_r26, 8, 0); - temp_r22 = BoardComPathReachCheck(temp_r26, 8, 1); - if (BoardPlayerItemFind(arg0, arg1) != -1 && BoardRandMod(0x64) >= var_r27) { - if ((temp_r23 == 0 || temp_r22 == 0) && var_r30 == 0x3E7) { + space = GWPlayer[player].space_curr; + mini_len = BoardComPathShortcutLenGet(space, 8, 0); + non_mini_len = BoardComPathShortcutLenGet(space, 8, 1); + if (BoardPlayerItemFind(player, item) != -1 && BoardRandMod(0x64) >= chance) { + if ((mini_len == 0 || non_mini_len == 0) && length_min == 999) { return TRUE; } - if (temp_r23 > var_r30 || temp_r22 > var_r30) { + if (mini_len > length_min || non_mini_len > length_min) { return TRUE; } - if (temp_r23 > 0xA || temp_r22 > 0xA) { + if (mini_len > 10 || non_mini_len > 10) { return TRUE; } } return FALSE; } -BOOL CheckSwapUse(s32 arg0, s32 arg1) { - s32 temp_r27; - s32 temp_r26; - s32 temp_r25; - s32 var_r30; - s32 var_r29; +static BOOL CheckSwapUse(s32 player, s32 item) { + s32 diff; + s32 team_player; + s32 character; + s32 item_count; + s32 chance; s32 i; - temp_r27 = GWPlayer[arg0].diff; - temp_r25 = GWPlayer[arg0].character; - switch (temp_r27) { + diff = GWPlayer[player].diff; + character = GWPlayer[player].character; + switch (diff) { case 0: - var_r29 = 0x32; + chance = 0x32; break; case 1: - var_r29 = 0x19; + chance = 0x19; break; case 2: - var_r29 = 5; + chance = 5; break; case 3: - var_r29 = 0; + chance = 0; break; } - if ((temp_r27 == 0 || temp_r27 == 1) && temp_r25 == 2) { - var_r29 = 7; + if ((diff == 0 || diff == 1) && character == 2) { + chance = 7; } - for (var_r30 = i = 0; i < 4; i++) { - if (i != arg0) { - var_r30 += BoardPlayerItemCount(i); + for (item_count = i = 0; i < 4; i++) { + if (i != player) { + item_count += BoardPlayerItemCount(i); } } - if (var_r30 == 0) { + if (item_count == 0) { return FALSE; } if (GWTeamGet()) { - temp_r26 = BoardPlayerSameTeamFind(arg0); - for (var_r30 = i = 0; i < 4; i++) { - if (temp_r26 != i && i != arg0) { - var_r30 += BoardPlayerItemCount(i); + team_player = BoardPlayerSameTeamFind(player); + for (item_count = i = 0; i < 4; i++) { + if (team_player != i && i != player) { + item_count += BoardPlayerItemCount(i); } } - if (var_r30 == 0) { + if (item_count == 0) { return FALSE; } } - if (BoardPlayerItemFind(arg0, arg1) != -1 && BoardRandMod(0x64) >= var_r29) { + if (BoardPlayerItemFind(player, item) != -1 && BoardRandMod(0x64) >= chance) { return TRUE; } return FALSE; } -static BOOL CheckBooUse(s32 arg0, s32 arg1) { - if (BoardPlayerCoinsGet(arg0) < 5) { +static BOOL CheckBooUse(s32 player, s32 item) { + if (BoardPlayerCoinsGet(player) < 5) { return FALSE; } - if (BoardBooComUseCheck(arg0) == 0) { + if (BoardBooComUseCheck(player) == 0) { return FALSE; } - if (BoardPlayerItemFind(arg0, arg1) == -1) { + if (BoardPlayerItemFind(player, item) == -1) { return FALSE; } return TRUE; } -static BOOL CheckLampUse(s32 arg0, s32 arg1) { - if ((BoardPlayerCoinsGet(arg0) >= 0x14 || GWSystem.last5_effect == 4) && BoardPlayerItemFind(arg0, arg1) != -1) { +static BOOL CheckLampUse(s32 player, s32 item) { + if ((BoardPlayerCoinsGet(player) >= 0x14 || GWSystem.last5_effect == 4) && BoardPlayerItemFind(player, item) != -1) { return TRUE; } return FALSE; } -s32 BoardComJunctionInputGet(s32 arg0, Vec *arg1, s32 arg2, float *arg3) { - Vec sp28; - Vec sp1C; - Vec sp10; - float var_f30; - float var_f29; - float var_f31; - s32 var_r29; - s32 var_r27; - s32 temp_r26; - s32 var_r24; - s32 var_r23; - s32 var_r21; +s32 BoardComJunctionInputGet(s32 item, Vec *input, s32 num_dirs, float *dirs) { + Vec pos_next; + Vec pos_junction; + Vec dir; + float dist_min; + float dist; + float angle; + s32 chance_random; + s32 best_dir; + s32 board; + s32 path_unknown; + s32 choose_path; + s32 dir_random; s32 i; - s16 var_r28; - s16 temp_r25; - s16 spC; + s16 space_next; + s16 space; + s16 roll; - temp_r26 = GWBoardGet(); - var_r24 = 0; - temp_r25 = GWPlayer[arg0].space_curr; - var_r28 = -1; - spC = GWPlayer[arg0].roll; - switch (GWPlayer[arg0].diff) { + board = GWBoardGet(); + path_unknown = 0; + space = GWPlayer[item].space_curr; + space_next = -1; + roll = GWPlayer[item].roll; + switch (GWPlayer[item].diff) { case 3: - var_r29 = 0; + chance_random = 0; break; case 2: - var_r29 = 0; + chance_random = 0; break; case 1: - var_r29 = 0xA; + chance_random = 10; break; default: case 0: - var_r29 = 0x1E; + chance_random = 0x1E; break; } - if (BoardRandMod(0x64) >= var_r29) { - var_r23 = 1; + if (BoardRandMod(0x64) >= chance_random) { + choose_path = 1; } else { - var_r23 = 0; + choose_path = 0; } - if (var_r23 != 0) { - if (temp_r26 >= 0 && temp_r26 <= 5) { - var_r28 = BoardComPathBestGet(temp_r25); - } else if (temp_r26 == 7) { - var_r28 = BoardComPathW20BestGet(temp_r25, 0x10000000, 0xA); + if (choose_path != 0) { + if (board >= 0 && board <= 5) { + space_next = BoardComPathBestGet(space); + } else if (board == 7) { + space_next = BoardComPathBestGetFlag(space, 0x10000000, 10); } - if (var_r28 == -1) { - var_r24 = 1; + if (space_next == -1) { + path_unknown = 1; } else { - BoardSpacePosGet(0, temp_r25, &sp1C); - BoardSpacePosGet(0, var_r28, &sp28); - PSVECSubtract(&sp28, &sp1C, &sp10); - var_f31 = BoardDAngleCalc(90.0 - 180.0 * (atan2(sp10.z, sp10.x) / M_PI)); - if (var_f31 < 0.0f) { - var_f31 += 360.0f; + BoardSpacePosGet(0, space, &pos_junction); + BoardSpacePosGet(0, space_next, &pos_next); + PSVECSubtract(&pos_next, &pos_junction, &dir); + angle = BoardDAngleCalc(90.0 - 180.0 * (atan2(dir.z, dir.x) / M_PI)); + if (angle < 0.0f) { + angle += 360.0f; } - if (var_f31 > 360.0f) { - var_f31 -= 360.0f; + if (angle > 360.0f) { + angle -= 360.0f; } } } - if (var_r24 != 0) { - var_r21 = BoardRandMod(arg2); - var_f31 = arg3[var_r21]; + if (path_unknown != 0) { + dir_random = BoardRandMod(num_dirs); + angle = dirs[dir_random]; } - var_f30 = 999.0f; - for (var_r27 = i = 0; i < 4; i++) { - var_f29 = (comJunctionDirTbl[i].x - var_f31 < 0.0f) - ? -(comJunctionDirTbl[i].x - var_f31) - : (comJunctionDirTbl[i].x - var_f31); - if (var_f29 < var_f30) { - var_r27 = i; - var_f30 = var_f29; + dist_min = 999.0f; + for (best_dir = i = 0; i < 4; i++) { + dist = (comJunctionDirTbl[i].x - angle < 0.0f) + ? -(comJunctionDirTbl[i].x - angle) + : (comJunctionDirTbl[i].x - angle); + if (dist < dist_min) { + best_dir = i; + dist_min = dist; } } - arg1->x = comJunctionDirTbl[var_r27].y; - arg1->z = comJunctionDirTbl[var_r27].z; - arg1->y = 0.0f; + input->x = comJunctionDirTbl[best_dir].y; + input->z = comJunctionDirTbl[best_dir].z; + input->y = 0.0f; return 0; } -s32 BoardComBestPlayerFind(void) { - s32 temp_r30; - s32 var_r29; - s32 var_r28; - s32 var_r27; +s32 BoardComFarPlayerFind(void) { + s32 len; + s32 max_len; + s32 far_player; + s32 space; s32 i; if (_CheckFlag(0x1000B) != 0) { return -1; } - var_r28 = -1; - var_r29 = -1; + far_player = -1; + max_len = -1; for (i = 0; i < 4; i++) { - var_r27 = GWPlayer[i].space_curr; - temp_r30 = BoardComPathReachCheck(var_r27, 8, 0); - if (temp_r30 > 0 && temp_r30 > var_r29) { - var_r29 = temp_r30; - var_r28 = i; + space = GWPlayer[i].space_curr; + len = BoardComPathShortcutLenGet(space, 8, 0); + if (len > 0 && len > max_len) { + max_len = len; + far_player = i; } } - return var_r28; + return far_player; } diff --git a/src/game/board/com_path.c b/src/game/board/com_path.c index c6b480a1..c4917348 100755 --- a/src/game/board/com_path.c +++ b/src/game/board/com_path.c @@ -5,20 +5,19 @@ typedef struct { /* 0x00 */ struct { - u8 unk00_field0 : 1; - u8 unk00_field1 : 1; - s8 unk00_field2 : 1; - s8 unk00_field3 : 1; - u8 unk00_field4 : 1; - u8 unk00_field5 : 1; + u8 used : 1; + u8 star : 1; + u8 pipe : 1; + u8 shop : 1; + u8 boo : 1; + u8 lottery : 1; }; - /* 0x01 */ s8 unk01; - /* 0x02 */ s8 unk02; - /* 0x03 */ s8 unk03; - /* 0x04 */ s16 unk04; - /* 0x06 */ s16 unk06[2]; // array size unknown - /* 0x0A */ char unk0A[0x3C]; - /* 0x46 */ s16 unk46[5]; + /* 0x01 */ s8 num_links; + /* 0x02 */ s8 num_children; + /* 0x03 */ s8 max_len; + /* 0x04 */ s16 start; + /* 0x06 */ s16 children[32]; + /* 0x46 */ s16 links[BOARD_SPACE_LINKMAX+1]; } PathNode; // Size 0x50 static PathNode *SearchPathNodeSpace(s16 arg0); @@ -30,7 +29,7 @@ static BOOL CheckPathSpace(BoardSpace *arg0); static s16 FindValidLink(BoardSpace *arg0); static BOOL CheckEndSpace(BoardSpace *arg0, PathNode *arg1); static BOOL CheckPath(PathNode *arg0); -static BOOL CheckW20Path(PathNode *arg0, u32 arg1); +static BOOL CheckPathFlag(PathNode *arg0, u32 arg1); static PathNode pathNodeData[16]; static PathNode *candidateNodes[16]; @@ -40,89 +39,89 @@ static s16 startPathSpace[16]; static s16 numCandidates; static s16 childNodeCnt; -static PathNode *SearchPathNodeSpace(s16 arg0) { - PathNode *var_r31; +static PathNode *SearchPathNodeSpace(s16 space) { + PathNode *node; s32 i; - for (var_r31 = pathNodeData, i = 0; i < 16; i++, var_r31++) { - if (var_r31->unk04 == arg0) { + for (node = pathNodeData, i = 0; i < 16; i++, node++) { + if (node->start == space) { break; } } if (i == 16) { - var_r31 = NULL; + node = NULL; } - return var_r31; + return node; } -static s16 InitPathNode(PathNode *arg0) { - BoardSpace *temp_r30; - PathNode *var_r23; - s32 var_r29; +static s16 InitPathNode(PathNode *node) { + BoardSpace *space_ptr; + PathNode *child; + s32 done; s16 i; - s16 var_r27; - s16 var_r26; - s16 var_r25; - s16 var_r24; + s16 space; + s16 num_links; + s16 path_len; + s16 space_link; - var_r24 = arg0->unk04; - var_r29 = 0; - arg0->unk02 = var_r25 = 0; + space_link = node->start; + done = 0; + node->num_children = path_len = 0; do { - var_r27 = var_r24; - temp_r30 = BoardSpaceGet(0, var_r27); - arg0->unk06[arg0->unk02] = var_r27; - var_r23 = FindChildNode(var_r27, arg0); - if (var_r23) { - AddValidLinks(temp_r30, arg0); - arg0->unk01 = 1; - arg0->unk46[0] = var_r27; + space = space_link; + space_ptr = BoardSpaceGet(0, space); + node->children[node->num_children] = space; + child = FindChildNode(space, node); + if (child) { + AddValidLinks(space_ptr, node); + node->num_links = 1; + node->links[0] = space; for (i = 1; i < 5; i++) { - arg0->unk46[i] = 0; + node->links[i] = 0; } return 0; } - if (temp_r30->link_cnt == 0) { - var_r26 = 0; - var_r29 = 1; + if (space_ptr->link_cnt == 0) { + num_links = 0; + done = 1; } else { - var_r26 = GetNumValidLinks(temp_r30, arg0); - if (var_r26 == 1) { - var_r24 = FindValidLink(temp_r30); + num_links = GetNumValidLinks(space_ptr, node); + if (num_links == 1) { + space_link = FindValidLink(space_ptr); } else { - var_r29 = 1; + done = 1; } } - if (CheckEndSpace(temp_r30, arg0)) { - var_r25++; - if (var_r25 >= arg0->unk03) { - var_r26 = 0; - var_r29 = 1; + if (CheckEndSpace(space_ptr, node)) { + path_len++; + if (path_len >= node->max_len) { + num_links = 0; + done = 1; } } - arg0->unk02++; - } while (var_r29 == 0); - AddValidLinks(temp_r30, arg0); - arg0->unk01 = var_r26; - return arg0->unk03 - var_r25; + node->num_children++; + } while (done == 0); + AddValidLinks(space_ptr, node); + node->num_links = num_links; + return node->max_len - path_len; } static PathNode *FindChildNode(s16 arg0, PathNode *arg1) { - PathNode *temp_r31; - s32 var_r28; + PathNode *node; + s32 node_idx; s32 i; s32 j; - var_r28 = NODE_INDEX(arg1); - if (var_r28 == -1) { + node_idx = NODE_INDEX(arg1); + if (node_idx == -1) { return NULL; } for (i = 0; i < childNodeCnt; i++) { - temp_r31 = &pathNodeData[i]; - if (temp_r31 != arg1) { - for (j = 0; j < temp_r31->unk02; j++) { - if (arg0 == temp_r31->unk06[j]) { - return temp_r31; + node = &pathNodeData[i]; + if (node != arg1) { + for (j = 0; j < node->num_children; j++) { + if (arg0 == node->children[j]) { + return node; } } } @@ -130,85 +129,85 @@ static PathNode *FindChildNode(s16 arg0, PathNode *arg1) { return NULL; } -static s32 GetNumValidLinks(BoardSpace *arg0, PathNode *arg1) { - BoardSpace *var_r28; +static s32 GetNumValidLinks(BoardSpace *space, PathNode *node) { + BoardSpace *link_space; s16 i; - s16 var_r29; + s16 invalid_links; - for (var_r29 = i = 0; i < arg0->link_cnt; i++) { - var_r28 = BoardSpaceGet(0, arg0->link[i]); - if (!CheckPathSpace(var_r28)) { - var_r29++; + for (invalid_links = i = 0; i < space->link_cnt; i++) { + link_space = BoardSpaceGet(0, space->link[i]); + if (!CheckPathSpace(link_space)) { + invalid_links++; } } - if (var_r29 >= arg0->link_cnt) { + if (invalid_links >= space->link_cnt) { return 0; } - return arg0->link_cnt - var_r29; + return space->link_cnt - invalid_links; } -static void AddValidLinks(BoardSpace *arg0, PathNode *arg1) { - BoardSpace *var_r27; - s16 var_r30; - s16 var_r31; +static void AddValidLinks(BoardSpace *space, PathNode *node) { + BoardSpace *link_space; + s16 i; + s16 link; - for (var_r31 = var_r30 = 0; var_r30 < arg0->link_cnt; var_r30++) { - var_r27 = BoardSpaceGet(0, arg0->link[var_r30]); - if (CheckPathSpace(var_r27)) { - arg1->unk46[var_r31] = arg0->link[var_r30]; - var_r31++; + for (link = i = 0; i < space->link_cnt; i++) { + link_space = BoardSpaceGet(0, space->link[i]); + if (CheckPathSpace(link_space)) { + node->links[link] = space->link[i]; + link++; } } - for (; var_r31 < 5; var_r31++) { - arg1->unk46[var_r31] = 0; + for (; link < BOARD_SPACE_LINKMAX+1; link++) { + node->links[link] = 0; } } -static BOOL CheckPathSpace(BoardSpace *arg0) { - if ((arg0->flag & 0x02000000) || (arg0->flag & 0x04000000)) { +static BOOL CheckPathSpace(BoardSpace *space) { + if ((space->flag & 0x02000000) || (space->flag & 0x04000000)) { return FALSE; } else { return TRUE; } } -static s16 FindValidLink(BoardSpace *arg0) { - s16 var_r29; +static s16 FindValidLink(BoardSpace *space) { + s16 space_link; s16 i; - BoardSpace *temp_r30; + BoardSpace *space_ptr; - for (var_r29 = i = 0; i < arg0->link_cnt; i++) { - var_r29 = arg0->link[i]; - temp_r30 = BoardSpaceGet(0, var_r29); - if (CheckPathSpace(temp_r30)) { + for (space_link = i = 0; i < space->link_cnt; i++) { + space_link = space->link[i]; + space_ptr = BoardSpaceGet(0, space_link); + if (CheckPathSpace(space_ptr)) { break; } } - return var_r29; + return space_link; } -static BOOL CheckEndSpace(BoardSpace *arg0, PathNode *arg1) { - if (arg0->flag & 0x80000000) { +static BOOL CheckEndSpace(BoardSpace *space, PathNode *node) { + if (space->flag & 0x80000000) { } - if (arg0->flag & 0x4000000) { + if (space->flag & 0x4000000) { } - if (arg0->flag & 0x2000000) { + if (space->flag & 0x2000000) { } - if (arg0->flag & 0x180000) { - arg1->unk00_field3 = 1; + if (space->flag & 0x180000) { + node->shop = 1; } - if (arg0->flag & 0x48000000) { - arg1->unk00_field4 = 1; + if (space->flag & 0x48000000) { + node->boo = 1; } - if (arg0->flag & 0x20000000) { - arg1->unk00_field2 = 1; + if (space->flag & 0x20000000) { + node->pipe = 1; } - if (arg0->flag & 0x10000000) { - arg1->unk00_field5 = 1; + if (space->flag & 0x10000000) { + node->lottery = 1; } - switch (arg0->type) { + switch (space->type) { case 8: - arg1->unk00_field1 = 1; + node->star = 1; return FALSE; case 10: return FALSE; @@ -218,151 +217,151 @@ static BOOL CheckEndSpace(BoardSpace *arg0, PathNode *arg1) { return TRUE; } -static inline void ComPathInlineFunc02(PathNode *arg0) { +static inline void PushCandidate(PathNode *node) { if (numCandidates < 16) { - candidateNodes[numCandidates] = arg0; + candidateNodes[numCandidates] = node; numCandidates++; } } -static inline PathNode *ComPathInlineFunc03(void) { - PathNode *ret; +static inline PathNode *PopCandidate(void) { + PathNode *node; numCandidates--; if (numCandidates < 0) { return NULL; } else { - ret = candidateNodes[numCandidates]; + node = candidateNodes[numCandidates]; candidateNodes[numCandidates] = NULL; - return ret; + return node; } } -static inline PathNode *ComPathInlineFunc04(s16 arg0, s16 arg1) { - PathNode *var_r26; +static inline PathNode *CreateNode(s16 start, s16 len) { + PathNode *node; s32 i; - var_r26 = pathNodeData; - for (i = 0; i < 16; i++, var_r26++) { - if (var_r26->unk00_field0 == 0) { + node = pathNodeData; + for (i = 0; i < 16; i++, node++) { + if (node->used == 0) { break; } } if (i == 16) { return NULL; } else { - var_r26->unk00_field0 = 1; - var_r26->unk04 = arg0; - var_r26->unk03 = arg1; + node->used = 1; + node->start = start; + node->max_len = len; childNodeCnt++; - return var_r26; + return node; } } -static inline void ComPathInlineFunc05(s16 arg0, s16 arg1) { - PathNode *var_r28; - s32 var_r24; - s32 temp_r17; +static inline void PopulateCandidates(s16 start, s16 len) { + PathNode *node; + s32 num_paths; + s32 lookahead; s32 i; - PathNode *var_r23; + PathNode *new_node; memset(pathNodeData, 0, sizeof(pathNodeData)); memset(candidateNodes, 0, sizeof(candidateNodes)); numCandidates = 0; childNodeCnt = 0; - var_r23 = ComPathInlineFunc04(arg0, arg1); - ComPathInlineFunc02(var_r23); - var_r24 = 1; - temp_r17 = arg1; + new_node = CreateNode(start, len); + PushCandidate(new_node); + num_paths = 1; + lookahead = len; while (1) { - if (var_r24 <= 0) { + if (num_paths <= 0) { break; } - var_r28 = ComPathInlineFunc03(); - if (!var_r28) { + node = PopCandidate(); + if (!node) { break; } - var_r24--; - temp_r17 = InitPathNode(var_r28); - if (temp_r17 != 0) { - if (var_r28->unk01 <= 1) { + num_paths--; + lookahead = InitPathNode(node); + if (lookahead != 0) { + if (node->num_links <= 1) { break; } - for (i = 0; i < var_r28->unk01; var_r24++, i++) { - var_r23 = ComPathInlineFunc04(var_r28->unk46[i], temp_r17); - if (!var_r23) { + for (i = 0; i < node->num_links; num_paths++, i++) { + new_node = CreateNode(node->links[i], lookahead); + if (!new_node) { break; } - ComPathInlineFunc02(var_r23); + PushCandidate(new_node); } } } } -s16 BoardComPathReachCheck(s16 arg0, u32 arg1, s32 arg2) { - s16 sp80[10]; - s16 sp6C[10]; - PathNode *sp68; - PathNode *var_r29; - s16 sp1C; - s16 sp1A; - s16 temp_r20; - s16 var_r22; - s16 var_r28; +s16 BoardComPathShortcutLenGet(s16 space, u32 type, s32 block_pipe) { + s16 len_tbl[10]; + s16 node_tbl[10]; + PathNode *node_link; + PathNode *node; + s16 node_idx; + s16 node_start_idx; + s16 node_idx_link; + s16 num_nodes; + s16 len; s16 i; - s32 var_r19; + s32 search_child; if (_CheckFlag(0x1000B)) { return 0; } - ComPathInlineFunc05(arg0, 0x1E); + PopulateCandidates(space, 30); memset(startPathSpaceSearch, 0, sizeof(startPathSpaceSearch)); - memset(sp80, 0, sizeof(sp80)); + memset(len_tbl, 0, sizeof(len_tbl)); memset(candidateNodes, 0, sizeof(candidateNodes)); numCandidates = 0; - var_r29 = SearchPathNodeSpace(arg0); - sp1A = NODE_INDEX(var_r29); - ComPathInlineFunc02(var_r29); - var_r28 = 0; - var_r22 = 0; - startPathSpaceSearch[sp1A] = var_r28; - var_r19 = 0; + node = SearchPathNodeSpace(space); + node_start_idx = NODE_INDEX(node); + PushCandidate(node); + len = 0; + num_nodes = 0; + startPathSpaceSearch[node_start_idx] = len; + search_child = 0; while (1) { - var_r29 = ComPathInlineFunc03(); - sp1C = NODE_INDEX(var_r29); - if (sp1C == -1) { - if (var_r22 != 0) { + node = PopCandidate(); + node_idx = NODE_INDEX(node); + if (node_idx == -1) { + if (num_nodes != 0) { break; } } else { - var_r19 = 0; - var_r28 = startPathSpaceSearch[sp1C]; - for (i = 0; i < var_r29->unk02; i++) { - if (arg2 == 0 && (BoardSpaceFlagGet(0, var_r29->unk06[i]) & 0x20000000)) { + search_child = 0; + len = startPathSpaceSearch[node_idx]; + for (i = 0; i < node->num_children; i++) { + if (block_pipe == 0 && (BoardSpaceFlagGet(0, node->children[i]) & 0x20000000)) { break; } - if (arg1 == BoardSpaceTypeGet(0, var_r29->unk06[i])) { - sp80[var_r22] = var_r28; - sp6C[var_r22] = sp1C; - if (++var_r22 < 0xA) { - var_r19 = 1; + if (type == BoardSpaceTypeGet(0, node->children[i])) { + len_tbl[num_nodes] = len; + node_tbl[num_nodes] = node_idx; + if (++num_nodes < 10) { + search_child = 1; break; } else { - goto return_r28; + goto done; } } - if (var_r28++ >= 0x1E) { - var_r19 = 1; + if (len++ >= 30) { + search_child = 1; break; } } - if (var_r19 == 0) { - for (i = 0; i < var_r29->unk01; i++) { - sp68 = SearchPathNodeSpace(var_r29->unk46[i]); - temp_r20 = NODE_INDEX(sp68); - if (temp_r20 != -1 && temp_r20 >= 0 && temp_r20 < 16) { - startPathSpaceSearch[temp_r20] = var_r28; - ComPathInlineFunc02(sp68); + if (search_child == 0) { + for (i = 0; i < node->num_links; i++) { + node_link = SearchPathNodeSpace(node->links[i]); + node_idx_link = NODE_INDEX(node_link); + if (node_idx_link != -1 && node_idx_link >= 0 && node_idx_link < 16) { + startPathSpaceSearch[node_idx_link] = len; + PushCandidate(node_link); } } } @@ -370,89 +369,89 @@ s16 BoardComPathReachCheck(s16 arg0, u32 arg1, s32 arg2) { } return 0; } -return_r28: - var_r28 = 10000; +done: + len = 10000; for (i = 0; i < 10; i++) { - if (var_r28 > sp80[i] && sp80[i] != 0) { - var_r28 = sp80[i]; + if (len > len_tbl[i] && len_tbl[i] != 0) { + len = len_tbl[i]; } } - return var_r28; + return len; } -s16 BoardComPathBestGet(s16 arg0) { - PathNode *sp30; - PathNode *sp2C; +s16 BoardComPathBestGet(s16 space) { + PathNode *link_node; + PathNode *node; s32 i; - ComPathInlineFunc05(arg0, 0x1E); - sp2C = SearchPathNodeSpace(arg0); - if (sp2C->unk00_field1 != 0) { + PopulateCandidates(space, 30); + node = SearchPathNodeSpace(space); + if (node->star != 0) { return -1; } - if (sp2C->unk01 <= 1) { + if (node->num_links <= 1) { return -1; } - for (i = 0; i < sp2C->unk01; i++) { - sp30 = SearchPathNodeSpace(sp2C->unk46[i]); - if (sp30 && CheckPath(sp30)) { - return sp2C->unk46[i]; + for (i = 0; i < node->num_links; i++) { + link_node = SearchPathNodeSpace(node->links[i]); + if (link_node && CheckPath(link_node)) { + return node->links[i]; } } return -1; } -s16 BoardComPathLenGet(s16 arg0, s16 arg1) { - PathNode *var_r30; - s16 temp_r21; - s16 var_r25; +s16 BoardComPathLenGet(s16 space, s16 space_other) { + PathNode *node; + s16 link_node_idx; + s16 len; s16 sp16; - s16 sp14; - s16 sp12; + s16 node_idx; + s16 node_start_idx; s16 i; - s32 sp5C; - PathNode *sp58; + s32 search_child; + PathNode *link_node; - ComPathInlineFunc05(arg0, 0x1E); + PopulateCandidates(space, 30); memset(startPathSpace, 0, sizeof(startPathSpace)); memset(candidateNodes, 0, sizeof(candidateNodes)); numCandidates = 0; - var_r30 = SearchPathNodeSpace(arg0); - sp12 = NODE_INDEX(var_r30); - ComPathInlineFunc02(var_r30); - var_r25 = 0; + node = SearchPathNodeSpace(space); + node_start_idx = NODE_INDEX(node); + PushCandidate(node); + len = 0; sp16 = 0; - startPathSpace[sp12] = var_r25; - sp5C = 0; + startPathSpace[node_start_idx] = len; + search_child = 0; while (1) { - var_r30 = ComPathInlineFunc03(); - sp14 = NODE_INDEX(var_r30); - if (sp14 == -1) { + node = PopCandidate(); + node_idx = NODE_INDEX(node); + if (node_idx == -1) { if (sp16 != 0) { break; } } else { - sp5C = 0; - var_r25 = startPathSpace[sp14]; - for (i = 0; i < var_r30->unk02; i++) { - if (BoardSpaceFlagGet(0, var_r30->unk06[i]) & 0x20000000) { + search_child = 0; + len = startPathSpace[node_idx]; + for (i = 0; i < node->num_children; i++) { + if (BoardSpaceFlagGet(0, node->children[i]) & 0x20000000) { break; } - if (var_r30->unk06[i] == arg1) { - goto return_r25; + if (node->children[i] == space_other) { + goto done; } - if (var_r25++ >= 0x1E) { - sp5C = 1; + if (len++ >= 30) { + search_child = 1; break; } } - if (sp5C == 0) { - for (i = 0; i < var_r30->unk01; i++) { - sp58 = SearchPathNodeSpace(var_r30->unk46[i]); - temp_r21 = NODE_INDEX(sp58); - if (temp_r21 != -1 && temp_r21 >= 0 && temp_r21 < 16) { - startPathSpace[temp_r21] = var_r25; - ComPathInlineFunc02(sp58); + if (search_child == 0) { + for (i = 0; i < node->num_links; i++) { + link_node = SearchPathNodeSpace(node->links[i]); + link_node_idx = NODE_INDEX(link_node); + if (link_node_idx != -1 && link_node_idx >= 0 && link_node_idx < 16) { + startPathSpace[link_node_idx] = len; + PushCandidate(link_node); } } } @@ -460,84 +459,84 @@ s16 BoardComPathLenGet(s16 arg0, s16 arg1) { } return 0; } -return_r25: - return var_r25; +done: + return len; } -static BOOL CheckPath(PathNode *arg0) { +static BOOL CheckPath(PathNode *node) { s32 i; - PathNode *sp1C; + PathNode *link; - if (arg0->unk00_field1 != 0) { + if (node->star != 0) { return TRUE; } - if (arg0->unk01 <= 1) { + if (node->num_links <= 1) { return FALSE; } - for (i = 0; i < arg0->unk01; i++) { - sp1C = SearchPathNodeSpace(arg0->unk46[i]); - if (sp1C && CheckPath(sp1C)) { + for (i = 0; i < node->num_links; i++) { + link = SearchPathNodeSpace(node->links[i]); + if (link && CheckPath(link)) { return TRUE; } } return FALSE; } -s16 BoardComPathW20BestGet(s16 arg0, u32 arg1, s16 arg2) { - PathNode *var_r31; - PathNode *sp38; +s16 BoardComPathBestGetFlag(s16 space, u32 flag, s16 len) { + PathNode *node; + PathNode *node_link; s32 i; - ComPathInlineFunc05(arg0, arg2); - var_r31 = SearchPathNodeSpace(arg0); - if (arg1 & 0x180000) { - if (var_r31->unk00_field1 != 0) { + PopulateCandidates(space, len); + node = SearchPathNodeSpace(space); + if (flag & 0x180000) { + if (node->star != 0) { return -1; } - } else if (arg1 & 0x08000000) { - if (var_r31->unk00_field4 != 0) { + } else if (flag & 0x08000000) { + if (node->boo != 0) { return -1; } - } else if (arg1 & 0x10000000) { - if (var_r31->unk00_field5 != 0) { + } else if (flag & 0x10000000) { + if (node->lottery != 0) { return -1; } } - if (var_r31->unk01 <= 1) { + if (node->num_links <= 1) { return -1; } - for (i = 0; i < var_r31->unk01; i++) { - sp38 = SearchPathNodeSpace(var_r31->unk46[i]); - if (sp38 && CheckW20Path(sp38, arg1)) { - return var_r31->unk46[i]; + for (i = 0; i < node->num_links; i++) { + node_link = SearchPathNodeSpace(node->links[i]); + if (node_link && CheckPathFlag(node_link, flag)) { + return node->links[i]; } } return -1; } -static BOOL CheckW20Path(PathNode *arg0, u32 arg1) { +static BOOL CheckPathFlag(PathNode *node, u32 flag) { s32 i; - PathNode *sp1C; + PathNode *link_node; - if (arg1 & 0x180000) { - if (arg0->unk00_field1 != 0) { + if (flag & 0x180000) { + if (node->star != 0) { return TRUE; } - } else if (arg1 & 0x08000000) { - if (arg0->unk00_field4 != 0) { + } else if (flag & 0x08000000) { + if (node->boo != 0) { return TRUE; } - } else if (arg1 & 0x10000000) { - if (arg0->unk00_field5 != 0) { + } else if (flag & 0x10000000) { + if (node->lottery != 0) { return TRUE; } } - if (arg0->unk01 <= 1) { + if (node->num_links <= 1) { return FALSE; } - for (i = 0; i < arg0->unk01; i++) { - sp1C = SearchPathNodeSpace(arg0->unk46[i]); - if (sp1C && CheckW20Path(sp1C, arg1)) { + for (i = 0; i < node->num_links; i++) { + link_node = SearchPathNodeSpace(node->links[i]); + if (link_node && CheckPathFlag(link_node, flag)) { return TRUE; } } diff --git a/src/game/board/main.c b/src/game/board/main.c index 41990f14..013dc2f5 100644 --- a/src/game/board/main.c +++ b/src/game/board/main.c @@ -24,7 +24,6 @@ typedef struct camera_view { s16 fov; } CameraView; - omObjData *boardMainObj; u32 boardRandSeed; static omObjData *last5GfxObj; @@ -619,16 +618,10 @@ static void CreateBoard(void) GWSystem.mg_next = -1; if(!GWGameStat.field10E_bit5) { s32 type_temp; - if(GWSystem.mg_list == 3) { - GWSystem.mg_list = 0; - } if(GWMGListGet() == 2) { GWSystem.mg_list = 0; } } - if(GWSystem.mess_speed == 3) { - GWSystem.mess_speed = 1; - } mess_speed = GWMessSpeedGet(); GWSystem.mess_speed = mess_speed; switch(mess_speed) { diff --git a/src/game/board/pause.c b/src/game/board/pause.c index ed26e8a7..17e379e2 100755 --- a/src/game/board/pause.c +++ b/src/game/board/pause.c @@ -151,27 +151,6 @@ void BoardPauseStart(void) { HuPrcDestructorSet2(mainProcess, PauseExit); } -static inline s32 PauseExitInlineFunc01(void) { - if (GWSystem.mg_list == 3) { - GWSystem.mg_list = 0; - } - return GWSystem.mg_list; -} - -static inline s32 PauseExitInlineFunc02(void) { - if (GWSystem.mess_speed == 3) { - GWSystem.mess_speed = 1; - } - return GWSystem.mess_speed; -} - -static inline s32 PauseExitInlineFunc03(void) { - if (GWSystem.save_mode == 3) { - GWSystem.save_mode = 1; - } - return GWSystem.save_mode; -} - static void PauseExit(void) { if (pauseQuitF == 0) { BoardRollWinDispSet(1); @@ -200,15 +179,15 @@ static void PauseExit(void) { if (GWPartyGet() == 0) { GWGameStat.field10F_bit0 = GWMGExplainGet(); GWGameStat.field10F_bit1 = GWMGShowComGet(); - GWGameStat.field10F_bit2 = PauseExitInlineFunc01(); - GWGameStat.field10F_bit4 = PauseExitInlineFunc02(); - GWGameStat.field10F_bit6 = PauseExitInlineFunc03(); + GWGameStat.field10F_bit2 = GWMGListGet(); + GWGameStat.field10F_bit4 = GWMessSpeedGet(); + GWGameStat.field10F_bit6 = GWSaveModeGet(); } else { GWGameStat.field110_bit0 = GWMGExplainGet(); GWGameStat.field110_bit1 = GWMGShowComGet(); - GWGameStat.field110_bit2 = PauseExitInlineFunc01(); - GWGameStat.field110_bit4 = PauseExitInlineFunc02(); - GWGameStat.field110_bit6 = PauseExitInlineFunc03(); + GWGameStat.field110_bit2 = GWMGListGet(); + GWGameStat.field110_bit4 = GWMessSpeedGet(); + GWGameStat.field110_bit6 = GWSaveModeGet(); } mainProcess = NULL; } @@ -390,7 +369,7 @@ void CreatePauseScreen(void) { var_f31 = (var_r28 != 0) ? 0.0f : -90.0f; break; case 3: - var_r28 = PauseExitInlineFunc01(); + var_r28 = GWMGListGet(); switch (var_r28) { case 1: var_r28 = 0; @@ -411,7 +390,7 @@ void CreatePauseScreen(void) { var_f31 = (var_r28 != 0) ? 0.0f : -90.0f; break; case 5: - var_r28 = PauseExitInlineFunc02(); + var_r28 = GWMessSpeedGet(); switch (var_r28) { case 2: var_r28 = 0; @@ -431,7 +410,7 @@ void CreatePauseScreen(void) { if (temp_r29->unk00_field4 != 0) { GWSystem.save_mode = 1; } - var_r28 = PauseExitInlineFunc03(); + var_r28 = GWSaveModeGet(); switch (var_r28) { case 1: var_r28 = 0; diff --git a/src/game/board/ui.c b/src/game/board/ui.c index 1087afd6..7b271d71 100755 --- a/src/game/board/ui.c +++ b/src/game/board/ui.c @@ -1339,7 +1339,7 @@ static void ExecItemPick(void) { itemPosTemp[j].x -= 8.0f; itemPosTemp[j].y += 16.0f; } - sp18 = BoardComTutorialItemGet(itemPlayer); + sp18 = BoardComUseItemSlotGet(itemPlayer); ExecItemPickInlineFunc02(itemPlayer, var_r23, sp18); } diff --git a/src/game/board/window.c b/src/game/board/window.c index 7dbd1780..54ad9195 100644 --- a/src/game/board/window.c +++ b/src/game/board/window.c @@ -182,7 +182,6 @@ void BoardWinPause(void) { void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice) { s32 i; - winPosIdx = pos; winChoice = 0; @@ -209,9 +208,6 @@ void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice) { HuPrcDestructorSet2(winProc, &BoardWinDestroy); } winMess = mess; - if (GWSystem.mess_speed == 3) { - GWSystem.mess_speed = 1; - } BoardWinSpeedSet(GWMessSpeedGet()); BoardWinPlayerSet(GWSystem.player_curr); } @@ -244,9 +240,6 @@ void BoardWinCreate(s32 pos, u32 mess, s32 portrait) { HuPrcDestructorSet2(winProc, &BoardWinDestroy); } winMess = mess; - if (GWSystem.mess_speed == 3) { - GWSystem.mess_speed = 1; - } BoardWinSpeedSet(GWMessSpeedGet()); BoardWinPlayerSet(GWSystem.player_curr); autoPickF = 0; @@ -300,13 +293,7 @@ void BoardWinKeyWait(void) { } int BoardWinSpeedGet(void) { - s32 speed; - - if (GWSystem.mess_speed == 3) { - GWSystem.mess_speed = 1; - } - speed = GWSystem.mess_speed; - return winSpeedTbl[speed]; + return winSpeedTbl[GWMessSpeedGet()]; } void BoardWinSpeedSet(s32 value) { @@ -348,12 +335,10 @@ s32 BoardWinPortraitGetStar(void) { } void BoardWinPlayerSet(s32 player) { - s32 temp; s32 i; if (player == -1) { - temp = GWSystem.party; - if (temp != 1) { + if (GWPartyGet() != 1) { for (i = 0, disablePlayer = i; i < 4; i++) { if (GWPlayer[i].com != 0) { disablePlayer |= 1 << GWPlayer[i].port;