mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fopMsgM_messageGet OK + rename g_meter2_info global

Browse Source
This commit is contained in:
Pheenoh
2021-03-27 19:53:05 -04:00
parent 3c4f60bf54
commit 37d5d9f00e
154 changed files with 1184 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_a/d_a_alink.cpp
+1 -1
View File
@@ -9,6 +9,7 @@
#include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h"
#include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
#include "d/d_kankyo/d_kankyo.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "f/f_op/f_op_actor_iter.h"
#include "f/f_op/f_op_actor_mng.h"
#include "f/f_op/f_op_overlap_mng.h"
@@ -2002,7 +2003,6 @@ extern u8 lbl_80451180;
extern u8 lbl_803A7288;
extern u8 lbl_80450D64;
extern u8 lbl_80451360;
extern u8 lbl_80430188;
extern u8 lbl_803A6F88;
u32 daAlink_c::getE3Zhint(void) {
src/d/d_com/d_com_inf_game.cpp
+1 -1
View File
@@ -4,6 +4,7 @@
#include "d/d_bg/d_bg_s/d_bg_s.h"
#include "d/d_item/d_item/d_item.h"
#include "d/d_kankyo/d_kankyo.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "f/f_op/f_op_scene_mng.h"
#include "global.h"
#include "m_Do/m_Do_Reset/m_Do_Reset.h"
@@ -286,7 +287,6 @@ void fopScnM_ReRequest__FsUl(void);
void fopScnM_ChangeReq__FP11scene_classssUs(void);
}
extern u8 lbl_80430188;
extern u8 lbl_80378F38;
extern u8 lbl_803A7288;
extern u8 lbl_80450D64;
src/d/d_file/d_file_sel_info.cpp
+1 -1
View File
@@ -1,5 +1,6 @@
#include "d/d_file/d_file_sel_info/d_file_sel_info.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "global.h"
extern "C" {
@@ -31,7 +32,6 @@ extern u8 lbl_803BB588;
extern u8 lbl_803948B8;
extern u8 lbl_803BB548;
extern u8 lbl_803BB4A8;
extern u8 lbl_80430188;
extern u8 lbl_804539F8;
extern u8 lbl_804539FC;
extern u8 lbl_803BB498;
src/d/d_kankyo.cpp
+2 -1
View File
@@ -4,6 +4,7 @@
#include "JSystem/JMath/JMath.h"
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
#include "m_Do/m_Do_graphic/m_Do_graphic.h"
@@ -351,7 +352,7 @@ extern u8 lbl_80450AE0;
extern u8 lbl_803A3354;
extern u8 lbl_80430CD8;
extern u8 lbl_803DD470;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_803790C0;
extern "C" {
src/d/d_meter/d_meter_button.cpp
+3 -2
View File
@@ -2,6 +2,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
@@ -179,9 +180,9 @@ extern u8 lbl_804547A8;
extern u8 lbl_804547AC;
extern u8 lbl_803A6F88;
extern u8 lbl_803790C0;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_8042EBC8;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_8043028C;
extern "C" {
src/d/d_meter/d_meter_hakusha.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
/* d_meter_hakusha.cpp autogenerated by split.py v0.3 at 2021-01-02 05:39:40.804826 */
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "global.h"
extern "C" {
@@ -46,7 +47,7 @@ extern u8 lbl_80454808;
extern u8 lbl_80454818;
extern u8 lbl_803A6F88;
extern u8 lbl_803BB6D4;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_8042EBC8;
extern "C" {
src/d/d_meter/d_meter_map.cpp
+3 -1
View File
@@ -2,10 +2,12 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "f/f_op/f_op_overlap_mng.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" {
void fopOvlpM_IsDoingReq__Fv(void);
bool dComIfGp_checkMapShow__Fv(void);
@@ -55,7 +57,7 @@ extern u8 lbl_80454840;
extern u8 lbl_80454834;
extern u8 lbl_80450D64;
extern u8 lbl_803A6F88;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_803A7288;
extern "C" {
src/d/d_meter/d_meter_string.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
/* d_meter_string.cpp autogenerated by split.py v0.3 at 2021-01-02 05:50:34.120259 */
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "global.h"
extern "C" {
@@ -53,7 +54,7 @@ extern u8 lbl_80454868;
extern u8 lbl_803A6F88;
extern u8 lbl_803BB6D4;
extern u8 lbl_8042EBC8;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern "C" {
// __ct__14dMeterString_cFi
src/d/d_meter2.cpp
+2 -1
View File
@@ -2,6 +2,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
@@ -204,7 +205,7 @@ extern u8 lbl_804549F0;
extern u8 lbl_8042FAFC;
extern u8 lbl_804549CC;
extern u8 lbl_804549D8;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_8042EBC8;
extern "C" {
src/d/d_meter2/d_meter2_draw.cpp
+2 -1
View File
@@ -2,6 +2,7 @@
#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "global.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
@@ -215,7 +216,7 @@ extern u8 lbl_803BF750;
extern u8 lbl_804548B4;
extern u8 lbl_80454960;
extern u8 lbl_803A6F88;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_803A0004;
extern "C" {
src/d/d_meter2/d_meter2_info.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
/* d_meter2_info.cpp autogenerated by split.py v0.3 at 2021-01-02 00:19:27.098885 */
// #include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "global.h"
#include "msl_c/string.h"
@@ -74,7 +75,7 @@ extern u8 lbl_804549A8;
extern u8 lbl_804549A0;
extern u8 lbl_804510B8;
extern u8 lbl_804549AC;
extern u8 lbl_80430188;
// extern u8 g_meter2_info;
extern u8 lbl_803AC5A0;
extern u8 lbl_803A7288;
src/d/d_save/d_save.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
#include "d/d_save/d_save/d_save.h"
#include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "d/d_save/d_save_init/d_save_init.h"
#include "msl_c/string.h"
#include "os/OS.h"
@@ -46,7 +47,7 @@ extern f32 lbl_80451D58;
extern char lbl_80379234[0x64];
extern f32 lbl_80451D5C;
extern u8 i_item_lst[24];
extern u8 lbl_80430188[16];
struct unkEvent { // figure out what this is later
u16 unk0[0x11A];
u8 unk565;
src/f/f_op/f_op_msg_mng.cpp
+4 -13
View File
@@ -2,6 +2,7 @@
#include "f/f_op/f_op_msg_mng.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_meter2/d_meter2_info/d_meter2_info.h"
#include "d/d_msg_object/d_msg_object.h"
#include "f/f_op/f_op_scene_iter.h"
#include "f/f_op/f_op_scene_mng.h"
@@ -50,7 +51,6 @@ void fopMsgM_messageSet__FUlUl(void);
void fopMsgM_setMessageID__FUi(void);
void fopMsgM_setStageLayer__FPv(void);
void fopMsgM_valueIncrease__FiiUc(void);
// void fopScnM_SearchByID(void);
void fop_Timer_create__FsUcUlUcUcffffPFPv_i(void);
void fpcEx_SearchByID__FUi(void);
void fpcM_Delete__FPv(void);
@@ -76,7 +76,6 @@ extern u8 lbl_80451C7C;
extern u8 lbl_80451C80;
extern u8 lbl_80451C84;
extern u8 lbl_80451C88;
extern u8 lbl_80430188;
#ifdef NON_MATCHING
// 1 instruction off, needs alot of cleanup
@@ -121,8 +120,6 @@ u32 fopMsgM_GetAppend(void* pProc) {
return ((unk*)pProc)->field_0xac;
}
// fopMsgM_Delete__FPv
// fopMsgM_Delete__FPv(void*)
void fopMsgM_Delete(void* pProc) {
fpcM_Delete(pProc);
}
@@ -192,15 +189,11 @@ asm void fopMsgM_messageSetDemo(u32) {
#include "f/f_op/f_op_msg_mng/asm/func_8001FFC4.s"
}
// fopMsgM_messageGet__FPcUl
// fopMsgM_messageGet__FPcUl(s8*, u32)
asm void fopMsgM_messageGet(char*, u32) {
nofralloc
#include "f/f_op/f_op_msg_mng/asm/func_800200C0.s"
char* fopMsgM_messageGet(char* pMsg, u32 param_2) {
g_meter2_info.getString(param_2, pMsg, 0);
return pMsg;
}
// fopMsgM_setMessageID__FUi
// fopMsgM_setMessageID__FUi(unsigned int)
void fopMsgM_setMessageID(unsigned int messageId) {
i_msgID = messageId;
}
@@ -212,8 +205,6 @@ asm void fopMsgM_Create(s16, int (*)(void*), void*) {
#include "f/f_op/f_op_msg_mng/asm/func_80020108.s"
}
// setAlpha__7J2DPaneFUc
// J2DPane::setAlpha(u8)
void J2DPane::setAlpha(u8 i_alpha) {
this->mAlpha = i_alpha;
}