From ac8ee593c2f09d000de4a8bf5f694d586e554f8c Mon Sep 17 00:00:00 2001 From: Luciano Ciccariello Date: Mon, 7 Mar 2022 21:10:22 +0000 Subject: [PATCH] Decompile func_801083BC --- config/symbols.txt | 30 ++++++++++++++++++++++++++++++ include/dra.h | 24 +++++++++++++++++++++++- src/dra/42398.c | 8 +++++++- 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/config/symbols.txt b/config/symbols.txt index abcb1d906..bd6370d35 100644 --- a/config/symbols.txt +++ b/config/symbols.txt @@ -946,6 +946,36 @@ c_strShield = 0x800A8408; c_strMedicine = 0x800A840C; c_strDarkMethamorphosis = 0x800A8410; c_arrExpNext = 0x800AC784; +c_lbaBinTitle0 = 0x800AC9D8; +c_lbaBinProlo0 = 0x800AC9E8; +c_lbaSdAlkVh = 0x800ACA18; +c_lbaSdAlkVb = 0x800ACA28; +c_lbaSdRihVh = 0x800ACA38; +c_lbaSdRihVb = 0x800ACA48; +c_lbaSdMarVh = 0x800ACA58; +c_lbaSdMarVb = 0x800ACA68; +c_lbaSdJ010_1_Vh = 0x800ACA78; +c_lbaSdJ010_1_Vb = 0x800ACA88; +c_lbaSdJ010_2_Vh = 0x800ACA98; +c_lbaSdJ010_2_Vb = 0x800ACAA8; +c_lbaSdJ010_3_Vh = 0x800ACAE8; +c_lbaSdJ010_3_Vb = 0x800ACAF8; +c_lbaBinWeapon0 = 0x800ACB08; +c_lbaBinWeapon1 = 0x800ACB18; +c_lbaBinMonster = 0x800ACB28; +c_lbaBinRichter = 0x800ACC04; +c_lbaBinAlucard = 0x800ACC14; +D_800ACC64 = 0x800ACC64; +D_800ACC74 = 0x800ACC74; +D_800ACCF8 = 0x800ACCF8; +D_800ACCFC = 0x800ACCFC; +D_800ACD00 = 0x800ACD00; +D_800ACD10 = 0x800ACD10; +D_800ACD2C = 0x800ACD2C; +D_800ACD7C = 0x800ACD7C; +D_800ACD80 = 0x800ACD80; +D_800ACD88 = 0x800ACD88; +D_800ACD90 = 0x800ACD90; rect = 0x800ACD98; c_backbufferClear = 0x800ACDA0; aPbav = 0x800B107C; diff --git a/include/dra.h b/include/dra.h index 849a4ac48..de7d23df2 100644 --- a/include/dra.h +++ b/include/dra.h @@ -359,8 +359,28 @@ extern s32 D_8003CACC; #define PROGRAM_NO3 0x41 #define PROGRAM_INVERTEDCASTLE_FLAG 0x20 +#define LBA_BIN_F_GAME 0x61CE +#define LBA_BIN_F_GAME2 0x6252 +#define LBA_STAGE_MAD_ART 0x7D6F +#define LBA_STAGE_MAD_VH 0x7DEF +#define LBA_STAGE_MAD_BIN 0x7E28 +#define LBA_STAGE_NO0_ART 0x7E5D +#define LBA_STAGE_NO0_VH 0x7EDD +#define LBA_STAGE_NO0_BIN 0x7F16 +#define LBA_STAGE_NO3_ART 0x8297 +#define LBA_STAGE_NO3_VH 0x8317 +#define LBA_STAGE_NO3_BIN 0x834F +#define LBA_STAGE_ST0_ART 0x9044 +#define LBA_STAGE_ST0_VH 0x90C4 +#define LBA_STAGE_ST0_BIN 0x90F9 +#define LBA_STAGE_NP3_ART 0x917F +#define LBA_STAGE_NP3_VH 0x91FF +#define LBA_STAGE_NP3_BIN 0x9235 + +extern s32 D_8006BAFC; extern s32 D_8006BB00; extern s32 D_8006C374; +extern s32 D_8006C398; extern s32 g_backbufferX; extern s32 g_backbufferY; extern Entity* D_8006C3B8; @@ -479,6 +499,7 @@ extern const char *c_strSystem; extern const char *c_strFamiliars; extern const char *c_strFamiliar; extern const char *c_strSpecial2; +extern s32 D_800ACC64; extern RECT c_backbufferClear; extern s16 D_800BD07C[]; extern u8 D_80137460; @@ -528,7 +549,8 @@ extern s32 D_80139828; extern s32 D_80139834[]; extern s16 D_80139868; extern s16 D_80139A70; -extern u8 D_8013AEEC; +extern s32 D_8013AE9C; +extern u8 D_8013AEEC; extern s32 D_8013B158; extern s32 D_8013B3D0; extern s16 D_8013B3E8[]; diff --git a/src/dra/42398.c b/src/dra/42398.c index 51d88698b..7b7183069 100644 --- a/src/dra/42398.c +++ b/src/dra/42398.c @@ -1779,7 +1779,13 @@ INCLUDE_ASM("asm/dra/nonmatchings/42398", func_801080DC); INCLUDE_ASM("asm/dra/nonmatchings/42398", func_8010838C); -INCLUDE_ASM("asm/dra/nonmatchings/42398", func_801083BC); +void func_801083BC(void) +{ + D_8006C398 = 1; + D_8006BAFC = 25; + D_8013AE9C = 10; + D_800ACC64 = 0; +} INCLUDE_ASM("asm/dra/nonmatchings/42398", func_801083F0);