From 92d93701a9b72c571c79bfedd097940f1be59962 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sun, 16 Oct 2022 16:44:03 -0300 Subject: `ovl_En_Nb` OK (#1030) * mips2c general pass * EnNb_Init * EnNb_Destroy * EnNb_Update * draw functions * func_80BBFE8C * func_80BC0D84 non_matching * func_80BBFE60 and minor fixes * a bunch of functions * And another bunch * An attempt to the last function * import data * Match func_80BC0D84 * Use extracted symbols instead of hardcoded ones * Match last function * format * Update the reloc in the spec * regconvert and draw * Small docs pass * actorfixer and format * Minor renames * schedule * cleanups * namefixer * minor cleanups * yeet printing stuff * Schedule and anims cleanup * stateFlags * Name limbs and anims * Name more stuff in the asset * Finish naming simple stuff * format * merge fixes * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: Derek Hensley * EnNb_UpdateSkelAnime Co-authored-by: Derek Hensley * fix typo * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 * MTXMODE_APPLY * review Co-authored-by: Derek Hensley * format * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis * review Co-authored-by: EllipticEllipsis * review Co-authored-by: engineer124 * clamps Co-authored-by: Derek Hensley Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 Co-authored-by: EllipticEllipsis --- src/code/title_setup.c | 2 +- src/code/z_play.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/code') diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 641160ea8..8ba6f9b56 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -27,7 +27,7 @@ void Setup_SetRegs(void) { XREG(88) = 0x56; XREG(89) = 0x258; XREG(90) = 0x1C2; - XREG(91) = 0; + R_STORY_FILL_SCREEN_ALPHA = 0; R_REVERSE_FLOOR_INDEX = 0; R_MINIMAP_DISABLED = false; diff --git a/src/code/z_play.c b/src/code/z_play.c index 47bb97a60..71fbc897f 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -540,13 +540,13 @@ void Play_AssignPlayerActorCsIdsFromScene(GameState* thisx, s32 startActorCsId) } } -// These regs are used by Gameplay_Draw, and several actors, purpose as yet unclear. -void func_8016A268(GameState* thisx, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5) { - MREG(64) = arg1; - MREG(65) = arg2; - MREG(66) = arg3; - MREG(67) = arg4; - MREG(68) = arg5; +// Set values to fill screen +void Play_FillScreen(GameState* thisx, s16 fillScreenOn, u8 red, u8 green, u8 blue, u8 alpha) { + R_PLAY_FILL_SCREEN_ON = fillScreenOn; + R_PLAY_FILL_SCREEN_R = red; + R_PLAY_FILL_SCREEN_G = green; + R_PLAY_FILL_SCREEN_B = blue; + R_PLAY_FILL_SCREEN_ALPHA = alpha; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Play_Init.s") -- cgit v1.2.3