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

some debug menu docs

Browse Source
This commit is contained in:
angie 2024-08-28 18:38:16 -04:00
parent c732b722c0
commit 22c1890a2e
13 changed files with 582 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
config/cn/symbol_addrs/symbol_addrs_main_segment.txt
View File

@ -273,25 +273,25 @@ DebugPrint_Open = 0x8004058C; // type:func
DebugPrint_Close = 0x800405D4; // type:func
DebugPrint_Printf = 0x80040604; // type:func
DebugMenu_8003E730 = 0x80040620; // type:func
DebugMenu_8003E8C8 = 0x800407C4; // type:func
DebugMenu_Page_SpeedMenu_Draw = 0x800407C4; // type:func
DebugMenu_8003EB20 = 0x80040ADC; // type:func
DebugMenu_8003ECDC = 0x80040CA8; // type:func
DebugMenu_8003EEA4 = 0x80040EAC; // type:func
DebugMenu_8003F050 = 0x80041064; // type:func
DebugMenu_Page_LogicMenu_Draw = 0x80041064; // type:func
DebugMenu_8003F360 = 0x80041444; // type:func
DebugMenu_8003F474 = 0x8004157C; // type:func
DebugMenu_8003F568 = 0x8004168C; // type:func
DebugMenu_8003F7DC = 0x80041918; // type:func
DebugMenu_8003FB00 = 0x80041CF8; // type:func
DebugMenu_8003FD0C = 0x80041FC0; // type:func
DebugMenu_8003FD88 = 0x8004206C; // type:func
DebugMenu_8003FEE4 = 0x800421E0; // type:func
DebugMenu_8004015C = 0x80042478; // type:func
DebugMenu_80040238 = 0x80042598; // type:func
DebugMenu_80040578 = 0x80042980; // type:func
DebugMenu_80040624 = 0x80042A58; // type:func
DebugMenu_800409A0 = 0x80042E78; // type:func
DebugMenu_800409DC = 0x80042EDC; // type:func
DebugMenu_Page_CharacterMenu_Draw = 0x80041918; // type:func
DebugMenu_Settings_Update = 0x80041CF8; // type:func
DebugMenu_Settings_Draw = 0x80041FC0; // type:func
DebugMenu_Page_CharacterEdit_Callback = 0x8004206C; // type:func
DebugMenu_GetCharacterStrength = 0x800421E0; // type:func
DebugMenu_Page_CharacterEdit_RetrieveStats = 0x80042478; // type:func
DebugMenu_Page_CharacterEdit_ApplyStats = 0x80042598; // type:func
DebugMenu_Page_CharacterEdit_UpdateController = 0x80042980; // type:func
DebugMenu_Page_CharacterEdit_Draw = 0x80042A58; // type:func
DebugMenu_CharacterEdit_Update = 0x80042E78; // type:func
DebugMenu_CharacterEdit_Draw = 0x80042EDC; // type:func
BgTasksManager_ThreadEntry = 0x80042F10; // type:func
BgTasksManager_IsInitialized = 0x80042F74; // type:func
BgTasksManager_Init = 0x80042F84; // type:func
@ -1268,23 +1268,23 @@ D_8008E454 = 0x800991A4; //
D_8008E480 = 0x800991D0; //
D_8008E490 = 0x800991E0; //
D_8008E4A0 = 0x800991F0; //
D_8008E4AC = 0x800991FC; //
sDebugMenu_CharacterEdit_CharacterNames = 0x800991FC; //
D_8008E4DC = 0x8009922C; //
D_8008E4F0 = 0x80099240; //
D_8008E508 = 0x80099258; //
D_8008E538 = 0x80099288; //
D_80099290_cn = 0x80099290; //
D_8008E548 = 0x80099298; // size:0x10
D_8008E558 = 0x800992A8; // size:0x10
sDebugMenu_CharacterEdit_RowsPerColumn = 0x800992A8; // size:0x10
D_8008E568 = 0x800992B8; //
D_8008E574 = 0x800992C4; //
D_8008E57C = 0x800992CC; //
D_8008E584 = 0x800992D4; //
D_8008E590 = 0x800992E0; //
D_8008E598 = 0x800992E8; //
D_8008E5A0 = 0x800992F0; //
D_8008E5B0 = 0x80099300; //
D_8008E5B4 = 0x80099304; //
sDebugMenu_CharacterEdit_ColumnNames = 0x800992F0; //
sDebugMenu_CharacterEdit_DefaultColor = 0x80099300; //
sDebugMenu_CharacterEdit_ColumnWidths = 0x80099304; //
sBgTasksManager_Initialized = 0x80099320; //
copy_texture_init_dl = 0x80099330; //
alpha_texture_init_dl = 0x800993A0; //
@ -2224,7 +2224,7 @@ B_800E58B4 = 0x800FC504; //
B_800E58B8 = 0x800FC508; //
B_800E58BC = 0x800FC50C; // size:0x4
B_800E58C0 = 0x800FC510; // size:0x50
B_800E5910 = 0x800FC560; //
sDebugMenu_CursorCounter = 0x800FC560; //
B_800E5914 = 0x800FC564; //
B_800E5918 = 0x800FC568; //
B_800E591C = 0x800FC56C; // size:0x4
@ -2232,12 +2232,12 @@ B_800E5920 = 0x800FC570; // size:0x4
B_800E5924 = 0x800FC574; //
B_800E5928 = 0x800FC578; // size:0x4
B_800E592C = 0x800FC57C; //
B_800E5930 = 0x800FC580; //
B_800E5934 = 0x800FC584; //
B_800E5938 = 0x800FC588; //
B_800E5968 = 0x800FC5B8; // size:0x2
B_800E596C = 0x800FC5BC; //
B_800E5970 = 0x800FC5C0; // size:0x10
sDebugMenu_CurrentSettingsPage = 0x800FC580; //
sDebugMenu_CharacterEdit_SelectedCharacter = 0x800FC584; //
sDebugMenu_CharacterEdit_CharacterStats = 0x800FC588; //
sDebugMenu_CharacterEdit_DefaultStats = 0x800FC5B8; // size:0x2
sDebugMenu_CharacterEdit_SelectedColumn = 0x800FC5BC; //
sDebugMenu_CharacterEdit_SelectedRow = 0x800FC5C0; // size:0x10
heapTop = 0x800FC5D0; //
_texAll = 0x800FC5E0; //
_texKaSa = 0x800FC5E4; //

50
config/gw/symbol_addrs/symbol_addrs_main_segment.txt
View File

@ -281,25 +281,25 @@ DebugPrint_Open = 0x8003F12C; // type:func
DebugPrint_Close = 0x8003F168; // type:func
DebugPrint_Printf = 0x8003F188; // type:func
DebugMenu_8003E730 = 0x8003F1C0; // type:func
DebugMenu_8003E8C8 = 0x8003F358; // type:func
DebugMenu_Page_SpeedMenu_Draw = 0x8003F358; // type:func
DebugMenu_8003EB20 = 0x8003F5B0; // type:func
DebugMenu_8003ECDC = 0x8003F76C; // type:func
DebugMenu_8003EEA4 = 0x8003F934; // type:func
DebugMenu_8003F050 = 0x8003FAE0; // type:func
DebugMenu_Page_LogicMenu_Draw = 0x8003FAE0; // type:func
DebugMenu_8003F360 = 0x8003FDF0; // type:func
DebugMenu_8003F474 = 0x8003FF04; // type:func
DebugMenu_8003F568 = 0x8003FFF8; // type:func
DebugMenu_8003F7DC = 0x8004026C; // type:func
DebugMenu_8003FB00 = 0x80040590; // type:func
DebugMenu_8003FD0C = 0x8004079C; // type:func
DebugMenu_8003FD88 = 0x80040818; // type:func
DebugMenu_8003FEE4 = 0x80040974; // type:func
DebugMenu_8004015C = 0x80040BEC; // type:func
DebugMenu_80040238 = 0x80040CC8; // type:func
DebugMenu_80040578 = 0x80041008; // type:func
DebugMenu_80040624 = 0x800410B4; // type:func
DebugMenu_800409A0 = 0x80041430; // type:func
DebugMenu_800409DC = 0x8004146C; // type:func
DebugMenu_Page_CharacterMenu_Draw = 0x8004026C; // type:func
DebugMenu_Settings_Update = 0x80040590; // type:func
DebugMenu_Settings_Draw = 0x8004079C; // type:func
DebugMenu_Page_CharacterEdit_Callback = 0x80040818; // type:func
DebugMenu_GetCharacterStrength = 0x80040974; // type:func
DebugMenu_Page_CharacterEdit_RetrieveStats = 0x80040BEC; // type:func
DebugMenu_Page_CharacterEdit_ApplyStats = 0x80040CC8; // type:func
DebugMenu_Page_CharacterEdit_UpdateController = 0x80041008; // type:func
DebugMenu_Page_CharacterEdit_Draw = 0x800410B4; // type:func
DebugMenu_CharacterEdit_Update = 0x80041430; // type:func
DebugMenu_CharacterEdit_Draw = 0x8004146C; // type:func
BgTasksManager_ThreadEntry = 0x80041490; // type:func
BgTasksManager_IsInitialized = 0x800414E8; // type:func
BgTasksManager_Init = 0x800414F4; // type:func
@ -1273,23 +1273,23 @@ D_8008E454 = 0x8008F2B4; //
D_8008E480 = 0x8008F2E0; //
D_8008E490 = 0x8008F2F0; //
D_8008E4A0 = 0x8008F300; //
D_8008E4AC = 0x8008F30C; //
sDebugMenu_CharacterEdit_CharacterNames = 0x8008F30C; //
D_8008E4DC = 0x8008F33C; //
D_8008E4F0 = 0x8008F350; //
D_8008E508 = 0x8008F368; //
D_8008E538 = 0x8008F398; // type:u8
D_8008E540 = 0x8008F3A0; // type:u8
D_8008E548 = 0x8008F3A8; // size:0x10
D_8008E558 = 0x8008F3B8; // size:0x10
sDebugMenu_CharacterEdit_RowsPerColumn = 0x8008F3B8; // size:0x10
D_8008E568 = 0x8008F3C8; // type:s8
D_8008E574 = 0x8008F3D4; // type:s8
D_8008E57C = 0x8008F3DC; // type:s8
D_8008E584 = 0x8008F3E4; // type:s8
D_8008E590 = 0x8008F3F0; // type:u8
D_8008E598 = 0x8008F3F8; // type:u8
D_8008E5A0 = 0x8008F400; //
D_8008E5B0 = 0x8008F410; //
D_8008E5B4 = 0x8008F414; //
sDebugMenu_CharacterEdit_ColumnNames = 0x8008F400; //
sDebugMenu_CharacterEdit_DefaultColor = 0x8008F410; //
sDebugMenu_CharacterEdit_ColumnWidths = 0x8008F414; //
sBgTasksManager_Initialized = 0x8008F430; //
copy_texture_init_dl = 0x8008F440; //
alpha_texture_init_dl = 0x8008F4B0; //
@ -2403,7 +2403,7 @@ B_800E58C0 = 0x800E6720; // type:s16
B_800E6722_gw = 0x800E6722; // type:s16
B_800E6724_gw = 0x800E6724; // type:s16
B_800E6726_gw = 0x800E6726; // type:s16
B_800E5910 = 0x800E6770; //
sDebugMenu_CursorCounter = 0x800E6770; //
B_800E5914 = 0x800E6774; //
B_800E5918 = 0x800E6778; //
B_800E591C = 0x800E677C; //
@ -2411,12 +2411,12 @@ B_800E5920 = 0x800E6780; //
B_800E5924 = 0x800E6784; //
B_800E5928 = 0x800E6788; //
B_800E592C = 0x800E678C; //
B_800E5930 = 0x800E6790; //
B_800E5934 = 0x800E6794; //
B_800E5938 = 0x800E6798; //
B_800E5968 = 0x800E67C8; // size:0x2
B_800E596C = 0x800E67CC; //
B_800E5970 = 0x800E67D0; // size:0x10
sDebugMenu_CurrentSettingsPage = 0x800E6790; //
sDebugMenu_CharacterEdit_SelectedCharacter = 0x800E6794; //
sDebugMenu_CharacterEdit_CharacterStats = 0x800E6798; //
sDebugMenu_CharacterEdit_DefaultStats = 0x800E67C8; // size:0x2
sDebugMenu_CharacterEdit_SelectedColumn = 0x800E67CC; //
sDebugMenu_CharacterEdit_SelectedRow = 0x800E67D0; // size:0x10
heapTop = 0x800E67E0; //
_texAll = 0x800E67F0; //
_texKaSa = 0x800E67F4; //

50
config/us/symbol_addrs/symbol_addrs_main_segment.txt
View File

@ -275,25 +275,25 @@ DebugPrint_Open = 0x8003E69C; //
DebugPrint_Close = 0x8003E6D8; //
DebugPrint_Printf = 0x8003E6F8; //
DebugMenu_8003E730 = 0x8003E730; //
DebugMenu_8003E8C8 = 0x8003E8C8; //
DebugMenu_Page_SpeedMenu_Draw = 0x8003E8C8; //
DebugMenu_8003EB20 = 0x8003EB20; //
DebugMenu_8003ECDC = 0x8003ECDC; //
DebugMenu_8003EEA4 = 0x8003EEA4; //
DebugMenu_8003F050 = 0x8003F050; //
DebugMenu_Page_LogicMenu_Draw = 0x8003F050; //
DebugMenu_8003F360 = 0x8003F360; //
DebugMenu_8003F474 = 0x8003F474; //
DebugMenu_8003F568 = 0x8003F568; //
DebugMenu_8003F7DC = 0x8003F7DC; //
DebugMenu_8003FB00 = 0x8003FB00; //
DebugMenu_8003FD0C = 0x8003FD0C; //
DebugMenu_8003FD88 = 0x8003FD88; //
DebugMenu_8003FEE4 = 0x8003FEE4; //
DebugMenu_8004015C = 0x8004015C; //
DebugMenu_80040238 = 0x80040238; //
DebugMenu_80040578 = 0x80040578; //
DebugMenu_80040624 = 0x80040624; //
DebugMenu_800409A0 = 0x800409A0; //
DebugMenu_800409DC = 0x800409DC; //
DebugMenu_Page_CharacterMenu_Draw = 0x8003F7DC; //
DebugMenu_Settings_Update = 0x8003FB00; //
DebugMenu_Settings_Draw = 0x8003FD0C; //
DebugMenu_Page_CharacterEdit_Callback = 0x8003FD88; //
DebugMenu_GetCharacterStrength = 0x8003FEE4; //
DebugMenu_Page_CharacterEdit_RetrieveStats = 0x8004015C; //
DebugMenu_Page_CharacterEdit_ApplyStats = 0x80040238; //
DebugMenu_Page_CharacterEdit_UpdateController = 0x80040578; //
DebugMenu_Page_CharacterEdit_Draw = 0x80040624; //
DebugMenu_CharacterEdit_Update = 0x800409A0; //
DebugMenu_CharacterEdit_Draw = 0x800409DC; //
BgTasksManager_ThreadEntry = 0x80040A00; //
BgTasksManager_IsInitialized = 0x80040A58; //
BgTasksManager_Init = 0x80040A64; //
@ -1270,23 +1270,23 @@ D_8008E454 = 0x8008E454; //
D_8008E480 = 0x8008E480; //
D_8008E490 = 0x8008E490; //
D_8008E4A0 = 0x8008E4A0; //
D_8008E4AC = 0x8008E4AC; //
sDebugMenu_CharacterEdit_CharacterNames = 0x8008E4AC; //
D_8008E4DC = 0x8008E4DC; //
D_8008E4F0 = 0x8008E4F0; //
D_8008E508 = 0x8008E508; //
D_8008E538 = 0x8008E538; //
D_8008E540 = 0x8008E540; //
D_8008E548 = 0x8008E548; // size:0x10
D_8008E558 = 0x8008E558; // size:0x10
sDebugMenu_CharacterEdit_RowsPerColumn = 0x8008E558; // size:0x10
D_8008E568 = 0x8008E568; //
D_8008E574 = 0x8008E574; //
D_8008E57C = 0x8008E57C; //
D_8008E584 = 0x8008E584; //
D_8008E590 = 0x8008E590; //
D_8008E598 = 0x8008E598; //
D_8008E5A0 = 0x8008E5A0; //
D_8008E5B0 = 0x8008E5B0; //
D_8008E5B4 = 0x8008E5B4; //
sDebugMenu_CharacterEdit_ColumnNames = 0x8008E5A0; //
sDebugMenu_CharacterEdit_DefaultColor = 0x8008E5B0; //
sDebugMenu_CharacterEdit_ColumnWidths = 0x8008E5B4; //
sBgTasksManager_Initialized = 0x8008E5D0; //
copy_texture_init_dl = 0x8008E5E0; //
alpha_texture_init_dl = 0x8008E650; //
@ -2402,7 +2402,7 @@ B_800E58B4 = 0x800E58B4; //
B_800E58B8 = 0x800E58B8; //
B_800E58BC = 0x800E58BC; // size:0x4
B_800E58C0 = 0x800E58C0; // size:0x50
B_800E5910 = 0x800E5910; //
sDebugMenu_CursorCounter = 0x800E5910; //
B_800E5914 = 0x800E5914; //
B_800E5918 = 0x800E5918; //
B_800E591C = 0x800E591C; //
@ -2410,12 +2410,12 @@ B_800E5920 = 0x800E5920; //
B_800E5924 = 0x800E5924; //
B_800E5928 = 0x800E5928; //
B_800E592C = 0x800E592C; //
B_800E5930 = 0x800E5930; //
B_800E5934 = 0x800E5934; //
B_800E5938 = 0x800E5938; //
B_800E5968 = 0x800E5968; // size:0x2
B_800E596C = 0x800E596C; //
B_800E5970 = 0x800E5970; // size:0x10
sDebugMenu_CurrentSettingsPage = 0x800E5930; //
sDebugMenu_CharacterEdit_SelectedCharacter = 0x800E5934; //
sDebugMenu_CharacterEdit_CharacterStats = 0x800E5938; //
sDebugMenu_CharacterEdit_DefaultStats = 0x800E5968; // size:0x2
sDebugMenu_CharacterEdit_SelectedColumn = 0x800E596C; //
sDebugMenu_CharacterEdit_SelectedRow = 0x800E5970; // size:0x10
heapTop = 0x800E5980; // size:0x4
_texAll = 0x800E5990; //
_texKaSa = 0x800E5994; //

5
include/aiset.h
View File

@ -46,12 +46,13 @@ typedef struct struct_ai_param {
} struct_ai_param; // size = 0x38
#define STRUCT_AI_CHAR_DATA_LEN 16
#define STRUCT_AI_CHAR_DATA_LEN2 8
typedef struct struct_ai_char_data {
/* 0x00 */ UNK_TYPE1 unk_00;
/* 0x01 */ UNK_TYPE1 unk_01;
/* 0x01 */ UNK_TYPE1 speed;
/* 0x02 */ UNK_TYPE2 unk_02;
/* 0x04 */ s8 unk_04[8];
/* 0x04 */ s8 performance[STRUCT_AI_CHAR_DATA_LEN2];
/* 0x0C */ s8 unk_0C[STRUCT_AI_CHAR_DATA_LEN];
/* 0x1C */ s16 unk_1C[STRUCT_AI_CHAR_DATA_LEN];
/* 0x3C */ s8 unk_3C[STRUCT_AI_CHAR_DATA_LEN];

19
include/debug_menu.h
View File

@ -3,21 +3,10 @@
#include "libultra.h"
typedef struct struct_800E5938 {
/* 0x0 */ s8 unk_0;
/* 0x1 */ s8 unk_1;
/* 0x2 */ u16 unk_2;
} struct_800E5938; // size = 0x4
void DebugMenu_Settings_Update(void);
void DebugMenu_Settings_Draw(Gfx** gxfP);
typedef struct struct_800E5968 {
/* 0x0 */ s8 unk_0;
/* 0x1 */ s8 unk_1;
} struct_800E5968; // size = 0x2
void DebugMenu_8003FB00(void);
void DebugMenu_8003FD0C(Gfx** gxfP);
void DebugMenu_800409A0(void);
void DebugMenu_800409DC(Gfx **gfxP);
void DebugMenu_CharacterEdit_Update(void);
void DebugMenu_CharacterEdit_Draw(Gfx **gfxP);
#endif

6
include/dm_game_main.h
View File

@ -148,7 +148,7 @@ typedef struct struct_watchGame {
/* 0x9D0 */ struct_watchGame_unk_9D0 unk_9D0[2];
/* 0xA28 */ MessageWnd unk_A28;
/* 0xAA8 */ s32 unk_AA8;
/* 0xAAC */ unsigned char unk_AAC[42]; // passwordPrompt?
/* 0xAAC */ unsigned char password[42];
/* 0xAD8 */ RecordWritingMessage recMessage;
} struct_watchGame; // size = 0xB60
@ -208,8 +208,8 @@ typedef enum EnumGameStateDataUnk00C {
/* 0x1D */ GAMESTATEDATA_UNK_00C_1D,
/* 0x1E */ GAMESTATEDATA_UNK_00C_1E,
/* 0x1F */ GAMESTATEDATA_UNK_00C_1F,
/* 0x20 */ GAMESTATEDATA_UNK_00C_20,
/* 0x21 */ GAMESTATEDATA_UNK_00C_21,
/* 0x20 */ GAMESTATEDATA_UNK_00C_DEBUG_CHARACTER_EDIT,
/* 0x21 */ GAMESTATEDATA_UNK_00C_DEBUG_SETTINGS,
} EnumGameStateDataUnk00C;
typedef enum EnumGameStateDataUnk014 {

6
include/macros_defines.h
View File

@ -68,5 +68,11 @@
#define HELP (*(vu32*)0 = 0x1234)
// #define DEBUG_EN 1
#if DEBUG_EN
#define T(jp, en) en
#else
#define T(jp, en) jp
#endif
#endif

4
src/main_segment/aiset.c
View File

@ -3069,8 +3069,8 @@ void aiSetCharacter(struct_game_state_data *gameStateDataRef) {
}
}
aiSelCom = temp_s2->unk_04[var_s5];
aiSelSpeed = temp_s2->unk_01;
aiSelCom = temp_s2->performance[var_s5];
aiSelSpeed = temp_s2->speed;
if (evs_gamemode == ENUM_EVS_GAMEMODE_1) {
if (last_flash > 1) {

725
src/main_segment/debug_menu.c
View File

File diff suppressed because it is too large Load Diff

44
src/main_segment/dm_game_main.c
View File

@ -3078,15 +3078,17 @@ s32 dm_game_main_cnt_1P(struct_game_state_data *gameStateData, GameMapCell *mapC
var_t2 = evs_mem_data[evs_select_name_no[0]].unk_01;
}
if (watchGameP->unk_AAC[0] == 0) {
func_8007E760(watchGameP->unk_AAC, var_s1, var_s2, gameStateData->unk_02C,
if (watchGameP->password[0] == 0) {
func_8007E760(watchGameP->password, var_s1, var_s2, gameStateData->unk_02C,
gameStateData->unk_000 / 10, evs_game_time / 6, var_t2);
watchGameP->unk_AAC[ARRAY_COUNT(watchGameP->unk_AAC) - 2] = 0x7E;
watchGameP->unk_AAC[ARRAY_COUNT(watchGameP->unk_AAC) - 1] = 0x7A;
// Write MSG_END
watchGameP->password[ARRAY_COUNT(watchGameP->password) - 2] = '~';
watchGameP->password[ARRAY_COUNT(watchGameP->password) - 1] = 'z';
}
msgWnd_clear(&watchGameP->unk_A28);
msgWnd_addStr(&watchGameP->unk_A28, _mesPassword);
msgWnd_addStr(&watchGameP->unk_A28, watchGameP->unk_AAC);
msgWnd_addStr(&watchGameP->unk_A28, watchGameP->password);
msgWnd_skip(&watchGameP->unk_A28);
watchGameP->unk_AA8 = -watchGameP->unk_AA8;
} else {
@ -6473,7 +6475,7 @@ void dm_game_init(bool arg0) {
watchGameP->unk_9CC = -1;
watchGameP->unk_A28.alpha = 0;
watchGameP->unk_AA8 = -0x10;
bzero(watchGameP->unk_AAC, sizeof(watchGameP->unk_AAC));
bzero(watchGameP->password, sizeof(watchGameP->password));
switch (evs_gamesel) {
case ENUM_EVS_GAMESEL_0:
@ -7667,8 +7669,8 @@ const s32 color2index_6470[] = { 1, 0, 2 };
void dm_game_graphic2(void) {
struct_watchGame *temp_s7 = watchGame;
s32 temp_s2_2 = (game_state_data[0].unk_00C == GAMESTATEDATA_UNK_00C_20) ||
(game_state_data[0].unk_00C == GAMESTATEDATA_UNK_00C_21);
bool debugMenuEnabled = (game_state_data[0].unk_00C == GAMESTATEDATA_UNK_00C_DEBUG_CHARACTER_EDIT) ||
(game_state_data[0].unk_00C == GAMESTATEDATA_UNK_00C_DEBUG_SETTINGS);
Mtx *mtx;
Vtx *vtx;
s32 i;
@ -7685,8 +7687,8 @@ void dm_game_graphic2(void) {
F3RCPinitRtn();
gfxSetScissor(&gGfxHead, GFXSETSCISSOR_INTERLACE_NO, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
F3ClearFZRtn(temp_s2_2);
if (temp_s2_2 == 0) {
F3ClearFZRtn(debugMenuEnabled);
if (!debugMenuEnabled) {
if (temp_s7->unk_394 < 0x14) {
dm_game_draw_snap_bg(&gGfxHead, &mtx, &vtx, 1);
} else if (temp_s7->unk_9AC == 0) {
@ -7702,7 +7704,7 @@ void dm_game_graphic2(void) {
s32 temp_s0 = temp_s7->unk_394 < 0x14;
s32 temp_s1 = temp_s7->unk_880 == 0;
if (temp_s2_2 == 0) {
if (!debugMenuEnabled) {
if (temp_s7->unk_880 != 0) {
temp_s7->unk_394 = 0x14;
}
@ -7731,7 +7733,7 @@ void dm_game_graphic2(void) {
case ENUM_EVS_GAMESEL_3:
case ENUM_EVS_GAMESEL_5:
case ENUM_EVS_GAMESEL_6:
if ((temp_s2_2 == 0) && (temp_s7->unk_880 == 0)) {
if (!debugMenuEnabled && (temp_s7->unk_880 == 0)) {
for (i = 0; i < evs_playcnt; i++) {
dm_virus_anime(&game_state_data[i], game_map_data[i]);
dm_game_graphic_p(&game_state_data[i], i, game_map_data[i]);
@ -7746,7 +7748,7 @@ void dm_game_graphic2(void) {
switch (evs_gamesel) {
case ENUM_EVS_GAMESEL_0:
case ENUM_EVS_GAMESEL_4:
if ((temp_s2_2 == 0) && (temp_s7->unk_880 == 0)) {
if (!debugMenuEnabled && (temp_s7->unk_880 == 0)) {
disp_logo_setup(&gGfxHead);
if (temp_s7->unk_9AC > 0) {
@ -7821,7 +7823,7 @@ void dm_game_graphic2(void) {
case ENUM_EVS_GAMESEL_1:
case ENUM_EVS_GAMESEL_3:
case ENUM_EVS_GAMESEL_5:
if ((temp_s2_2 == 0) && (temp_s7->unk_880 == 0)) {
if (!debugMenuEnabled && (temp_s7->unk_880 == 0)) {
disp_logo_setup(&gGfxHead);
gSPDisplayList(gGfxHead++, alpha_texture_init_dl);
@ -7900,7 +7902,7 @@ void dm_game_graphic2(void) {
case ENUM_EVS_GAMESEL_2:
case ENUM_EVS_GAMESEL_6:
if ((temp_s2_2 == 0) && (temp_s7->unk_880 == 0)) {
if (!debugMenuEnabled && (temp_s7->unk_880 == 0)) {
for (i = 0; i < 4; i++) {
animeState_initDL(&game_state_data[i].unk_094, &gGfxHead);
animeState_draw(&game_state_data[i].unk_094, &gGfxHead, _posP4CharBase[i][0] + 0x14,
@ -7986,14 +7988,14 @@ void dm_game_graphic2(void) {
if (temp_s7->unk_880 == 0) {
switch (game_state_data[0].unk_00C) {
case GAMESTATEDATA_UNK_00C_21:
DebugMenu_8003FD0C(&gGfxHead);
DebugMenu_8003FB00();
case GAMESTATEDATA_UNK_00C_DEBUG_SETTINGS:
DebugMenu_Settings_Draw(&gGfxHead);
DebugMenu_Settings_Update();
break;
case GAMESTATEDATA_UNK_00C_20:
DebugMenu_800409A0();
DebugMenu_800409DC(&gGfxHead);
case GAMESTATEDATA_UNK_00C_DEBUG_CHARACTER_EDIT:
DebugMenu_CharacterEdit_Update();
DebugMenu_CharacterEdit_Draw(&gGfxHead);
break;
default:

68
src/main_segment/main1x.c
View File

@ -224,24 +224,24 @@ void adjust_story_ai(void) {
case CHARANIMEMODE_N:
if (evs_story_no == 1) {
*temp_a1 = ai_char_data[1];
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
}
break;
case CHARANIMEMODE_K:
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
temp_a1->unk_3C[0] = 0;
temp_a1->unk_3C[2] = 0;
break;
case CHARANIMEMODE_L:
case CHARANIMEMODE_O:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[0] = 0;
break;
case CHARANIMEMODE_C:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
break;
default:
@ -255,45 +255,45 @@ void adjust_story_ai(void) {
case CHARANIMEMODE_N:
if (evs_story_no == 1) {
*temp_a1 = ai_char_data[1];
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
} else {
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
temp_a1->unk_3C[1] = 0;
}
break;
case CHARANIMEMODE_G:
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
temp_a1->unk_3C[0] = 0;
temp_a1->unk_3C[1] = 0;
break;
case CHARANIMEMODE_K:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[0] = 0;
temp_a1->unk_3C[2] = 0;
break;
case CHARANIMEMODE_L:
case CHARANIMEMODE_O:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[0] = 0;
break;
case CHARANIMEMODE_A:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
break;
case CHARANIMEMODE_D:
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
break;
case CHARANIMEMODE_F:
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
break;
case CHARANIMEMODE_C:
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
break;
case CHARANIMEMODE_E:
@ -311,36 +311,36 @@ void adjust_story_ai(void) {
case CHARANIMEMODE_N:
if (evs_story_no == 1) {
*temp_a1 = ai_char_data[1];
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
} else {
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[1] = 0;
}
break;
case CHARANIMEMODE_I:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[1] = 0;
break;
case CHARANIMEMODE_B:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[2] = 0;
break;
case CHARANIMEMODE_F:
temp_a1->unk_01 = 3;
temp_a1->speed = 3;
temp_a1->unk_3C[1] = 0;
break;
case CHARANIMEMODE_G:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[0] = 0;
temp_a1->unk_3C[1] = 0;
break;
case CHARANIMEMODE_K:
temp_a1->unk_01 = 3;
temp_a1->speed = 3;
temp_a1->unk_00 = 0;
temp_a1->unk_0C[2] = 2;
temp_a1->unk_1C[2] = 0xF;
@ -351,16 +351,16 @@ void adjust_story_ai(void) {
case CHARANIMEMODE_J:
case CHARANIMEMODE_L:
case CHARANIMEMODE_O:
temp_a1->unk_01 = 3;
temp_a1->speed = 3;
temp_a1->unk_3C[0] = 0;
break;
case CHARANIMEMODE_C:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
break;
case CHARANIMEMODE_A:
temp_a1->unk_01 = 5;
temp_a1->speed = 5;
break;
default:
@ -376,49 +376,49 @@ void adjust_story_ai(void) {
*temp_a1 = ai_char_data[1];
temp_a1->unk_3C[1] = 0;
}
temp_a1->unk_01 = 1;
temp_a1->speed = 1;
break;
case CHARANIMEMODE_I:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
temp_a1->unk_3C[1] = 0;
break;
case CHARANIMEMODE_B:
temp_a1->unk_01 = 2;
temp_a1->speed = 2;
break;
case CHARANIMEMODE_A:
temp_a1->unk_01 = 5;
temp_a1->speed = 5;
break;
case CHARANIMEMODE_D:
temp_a1->unk_01 = 4;
temp_a1->speed = 4;
break;
case CHARANIMEMODE_H:
temp_a1->unk_01 = 3;
temp_a1->speed = 3;
break;
case CHARANIMEMODE_J:
temp_a1->unk_01 = 3;
temp_a1->speed = 3;
break;
case CHARANIMEMODE_E:
temp_a1->unk_01 = 3;
temp_a1->speed = 3;
break;
case CHARANIMEMODE_F:
temp_a1->unk_01 = 3;
temp_a1->speed = 3;
break;
case CHARANIMEMODE_K:
temp_a1->unk_01 = 5;
temp_a1->speed = 5;
temp_a1->unk_3C[1] = 0;
break;
case CHARANIMEMODE_L:
case CHARANIMEMODE_O:
temp_a1->unk_01 = 5;
temp_a1->speed = 5;
temp_a1->unk_3C[0] = 6;
break;

8
src/main_segment/screen_print/debug_print.c
View File

@ -342,8 +342,8 @@ s32 DebugPrint_CallbackPutChars(Printer *printer, const char *chars, size_t leng
switch (state->modifierCharacter) {
case '@':
switch (character) {
case 'c':
case 'm':
case 'c': // DBGPRT_COLOR_RAW
case 'm': // DBGPRT_CALLBACK
state->modifierCharacter = character;
break;
@ -353,14 +353,14 @@ s32 DebugPrint_CallbackPutChars(Printer *printer, const char *chars, size_t leng
}
break;
case 'c':
case 'c': // DBGPRT_COLOR_RAW
if (state->gfxP != NULL) {
DebugPrint_SetColor(state->gfxP, character - '0');
}
state->modifierCharacter = 0xFF;
break;
case 'm':
case 'm': // DBGPRT_CALLBACK
if (state->callback != NULL) {
state->callback(state->gfxP, state->posX + (state->curCol * DBGPRT_FONT_CHAR_WIDTH),
state->posY + (state->curRow * DBGPRT_FONT_CHAR_HEIGHT), character);

2
tools/.gitignore vendored
View File

@ -3,3 +3,5 @@ gcc_egcs/
gcc_egcs_og/
slinky/
libs/