Merge branch 'master' into polypass2

This commit is contained in:
notyourav
2021-01-24 21:30:58 -08:00
committed by GitHub
62 changed files with 881 additions and 803 deletions
+1
View File
@@ -7,6 +7,7 @@
#include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
#include "f/f_pc/f_pc_manager.h"
#include "f/f_pc/f_pc_searcher.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
u32 daAlink_c::getE3Zhint(void) {
+1
View File
@@ -5,6 +5,7 @@
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "f/f_pc/f_pc_searcher.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
extern "C" {
+1
View File
@@ -7,6 +7,7 @@
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "f/f_pc/f_pc_searcher.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
extern "C" {
+1
View File
@@ -5,6 +5,7 @@
#include "d/d_item/d_item/d_item.h"
#include "global.h"
#include "m_Do/m_Do_Reset/m_Do_Reset.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
#include "m_Do/m_Do_ext/m_Do_ext.h"
+1
View File
@@ -3,6 +3,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
#include "os/OS.h"
extern "C" {
+1
View File
@@ -4,6 +4,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
extern "C" {
// dKyw_setDrawPacketList__FP9J3DPacketi
+1
View File
@@ -3,6 +3,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
extern "C" {
// __ct__14dMeterButton_cFv
+1
View File
@@ -3,6 +3,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
extern "C" {
+1
View File
@@ -3,6 +3,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
extern "C" {
// _create__9dMeter2_cFv
+1
View File
@@ -3,6 +3,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
extern "C" {
// __ct__13dMeter2Draw_cFP10JKRExpHeap
+2 -2
View File
@@ -900,10 +900,10 @@ void dSv_player_config_c::init(void) {
os_mSoundMode = OSGetSoundMode();
if (os_mSoundMode == SOUND_MODE_MONO) {
this->mSoundMode = SOUND_MODE_MONO;
Z2AudioMgr_NS_setOutputMode(lbl_80451368, SOUND_MODE_MONO);
lbl_80451368->setOutputMode(SOUND_MODE_MONO);
} else {
this->mSoundMode = SOUND_MODE_STEREO;
Z2AudioMgr_NS_setOutputMode(lbl_80451368, SOUND_MODE_STEREO);
lbl_80451368->setOutputMode(SOUND_MODE_STEREO);
}
this->unk2 = 0;