encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from TakaRikka/wip1

Browse Source 
d_a_player / d_meter_map + misc
This commit is contained in:
TakaRikka
2022-01-04 03:46:52 -08:00
committed by GitHub
parent b8573fe911 01b3687092
commit 15808a2011
123 changed files with 3281 additions and 4696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DScreen.cpp
+15
View File
@@ -4,6 +4,7 @@
//
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/JGeometry.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -247,6 +248,19 @@ SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = {
};
/* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text __ct__9J2DScreenFv */
#ifdef NONMATCHING
J2DScreen::J2DScreen()
: J2DPane(NULL, true, 'root', JGeometry::TBox2<f32>(0.0f, 0.0f, 640.0f, 480.0f)) {
field_0x114 = -1;
_4 = -1;
mScissor = false;
mMaterialNum = 0;
mMaterials = NULL;
field_0x108 = NULL;
field_0x10c = NULL;
mNameTable = NULL;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -255,6 +269,7 @@ asm J2DScreen::J2DScreen() {
#include "asm/JSystem/J2DGraph/J2DScreen/__ct__9J2DScreenFv.s"
}
#pragma pop
#endif
/* 802F8540-802F85A8 2F2E80 0068+00 1/0 0/0 0/0 .text __dt__9J2DScreenFv */
#pragma push
libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+1 -1
View File
@@ -283,7 +283,7 @@ SECTION_SDATA2 static f32 lit_889[1 + 1 /* padding */] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DAnmLoaderDataBase::load(void const* param_0, J3DAnmLoaderDataBaseFlag param_1) {
asm void* J3DAnmLoaderDataBase::load(void const* param_0, J3DAnmLoaderDataBaseFlag param_1) {
nofralloc
#include "asm/JSystem/J3DGraphLoader/J3DAnmLoader/load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag.s"
}