mirror of
https://github.com/zeldaret/tp
synced 2026-06-07 20:11:27 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
@@ -11,7 +11,6 @@
|
||||
#include "d/d_map_path.h"
|
||||
#include "m_Do/m_Do_lib.h"
|
||||
|
||||
/* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */
|
||||
void dMpath_n::dTexObjAggregate_c::create() {
|
||||
static int const data[7] = {
|
||||
79, 80, 77, 78, 76, 81, 82,
|
||||
@@ -25,7 +24,6 @@ void dMpath_n::dTexObjAggregate_c::create() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003C8F4-8003C94C 037234 0058+00 1/1 1/1 0/0 .text remove__Q28dMpath_n18dTexObjAggregate_cFv */
|
||||
void dMpath_n::dTexObjAggregate_c::remove() {
|
||||
for (int i = 0; i < 7; i++) {
|
||||
delete mp_texObj[i];
|
||||
@@ -33,8 +31,6 @@ void dMpath_n::dTexObjAggregate_c::remove() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003C94C-8003CA40 03728C 00F4+00 2/0 9/2 0/0 .text
|
||||
* rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class */
|
||||
void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) {
|
||||
if (isDrawType(p_line->field_0x0)) {
|
||||
int width = getLineWidth(p_line->field_0x1);
|
||||
@@ -54,8 +50,6 @@ void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003CA40-8003CB00 037380 00C0+00 2/0 9/1 0/0 .text
|
||||
* rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class */
|
||||
void dDrawPath_c::rendering(dDrawPath_c::poly_class const* p_poly) {
|
||||
if (isDrawType(p_poly->field_0x0)) {
|
||||
GXSetTevColor(GX_TEVREG0, *getColor(p_poly->field_0x0 & 0x3F));
|
||||
@@ -73,8 +67,6 @@ void dDrawPath_c::rendering(dDrawPath_c::poly_class const* p_poly) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003CB00-8003CBBC 037440 00BC+00 1/1 0/0 0/0 .text
|
||||
* rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class */
|
||||
void dDrawPath_c::rendering(dDrawPath_c::group_class const* p_group) {
|
||||
if (isSwitch(p_group)) {
|
||||
poly_class* poly = p_group->mpPoly;
|
||||
@@ -91,8 +83,6 @@ void dDrawPath_c::rendering(dDrawPath_c::group_class const* p_group) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003CBBC-8003CC24 0374FC 0068+00 1/1 0/0 0/0 .text
|
||||
* rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class */
|
||||
void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) {
|
||||
if (p_floor->mpGroup != NULL) {
|
||||
group_class* group = p_floor->mpGroup;
|
||||
@@ -104,8 +94,6 @@ void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003CC24-8003CCC4 037564 00A0+00 2/0 9/1 0/0 .text
|
||||
* rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class */
|
||||
void dDrawPath_c::rendering(dDrawPath_c::room_class const* p_room) {
|
||||
if (p_room != NULL) {
|
||||
GXSetArray(GX_VA_POS, p_room->mpFloatData, 8);
|
||||
@@ -122,7 +110,6 @@ void dDrawPath_c::rendering(dDrawPath_c::room_class const* p_room) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003CCC4-8003CD38 037604 0074+00 2/0 9/1 0/0 .text drawPath__11dDrawPath_cFv */
|
||||
void dDrawPath_c::drawPath() {
|
||||
room_class* room = getFirstRoomPointer();
|
||||
while (room != NULL) {
|
||||
@@ -131,8 +118,6 @@ void dDrawPath_c::drawPath() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8003CD38-8003CDAC 037678 0074+00 0/0 3/3 0/0 .text
|
||||
* makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs */
|
||||
void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p_data,
|
||||
u8* p_palette, u16 param_5) const {
|
||||
p_image->format = GX_TF_C8;
|
||||
@@ -158,8 +143,6 @@ void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p
|
||||
p_image->imageOffset = p_data - (u8*)p_image;
|
||||
}
|
||||
|
||||
/* 8003CDAC-8003CE78 0376EC 00CC+00 0/0 2/2 0/0 .text renderingMap__15dRenderingMap_cFv
|
||||
*/
|
||||
void dRenderingMap_c::renderingMap() {
|
||||
preRenderingMap();
|
||||
if (isDrawPath()) {
|
||||
@@ -172,8 +155,6 @@ void dRenderingMap_c::renderingMap() {
|
||||
postRenderingMap();
|
||||
}
|
||||
|
||||
/* 8003CE78-8003CF40 0377B8 00C8+00 2/2 3/3 0/0 .text
|
||||
* setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv */
|
||||
void dRenderingFDAmap_c::setTevSettingNonTextureDirectColor() const {
|
||||
GXSetNumTevStages(1);
|
||||
GXSetNumChans(1);
|
||||
@@ -186,8 +167,6 @@ void dRenderingFDAmap_c::setTevSettingNonTextureDirectColor() const {
|
||||
GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
|
||||
}
|
||||
|
||||
/* 8003CF40-8003D0AC 037880 016C+00 1/1 3/3 0/0 .text
|
||||
* setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv */
|
||||
void dRenderingFDAmap_c::setTevSettingIntensityTextureToCI() const {
|
||||
GXSetNumTevStages(2);
|
||||
GXSetNumChans(1);
|
||||
@@ -208,8 +187,6 @@ void dRenderingFDAmap_c::setTevSettingIntensityTextureToCI() const {
|
||||
GXSetTevKColorSel(GX_TEVSTAGE0, GX_TEV_KCSEL_1_4);
|
||||
}
|
||||
|
||||
/* 8003D0AC-8003D188 0379EC 00DC+00 1/1 0/0 0/0 .text drawBack__18dRenderingFDAmap_cCFv
|
||||
*/
|
||||
void dRenderingFDAmap_c::drawBack() const {
|
||||
GXClearVtxDesc();
|
||||
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
|
||||
@@ -223,7 +200,6 @@ void dRenderingFDAmap_c::drawBack() const {
|
||||
GXEnd();
|
||||
}
|
||||
|
||||
/* 8003D188-8003D320 037AC8 0198+00 1/0 8/0 0/0 .text preRenderingMap__18dRenderingFDAmap_cFv */
|
||||
void dRenderingFDAmap_c::preRenderingMap() {
|
||||
GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
|
||||
GXSetScissor(0, 0, mTexWidth, mTexHeight);
|
||||
@@ -251,7 +227,6 @@ void dRenderingFDAmap_c::preRenderingMap() {
|
||||
drawBack();
|
||||
}
|
||||
|
||||
/* 8003D320-8003D3C0 037C60 00A0+00 1/0 7/1 0/0 .text postRenderingMap__18dRenderingFDAmap_cFv */
|
||||
void dRenderingFDAmap_c::postRenderingMap() {
|
||||
GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL);
|
||||
GXSetTexCopySrc(0, 0, mTexWidth, mTexHeight);
|
||||
@@ -263,7 +238,6 @@ void dRenderingFDAmap_c::postRenderingMap() {
|
||||
dComIfGp_getCurrentGrafPort()->setup2D();
|
||||
}
|
||||
|
||||
/* 80424684-804246A0 0513A4 001C+00 2/2 5/5 0/0 .bss m_texObjAgg__8dMpath_n */
|
||||
dMpath_n::dTexObjAggregate_c dMpath_n::m_texObjAgg;
|
||||
|
||||
/* Enabling the following definition will modify the following function to
|
||||
@@ -272,8 +246,6 @@ dMpath_n::dTexObjAggregate_c dMpath_n::m_texObjAgg;
|
||||
*/
|
||||
// #define HYRULE_FIELD_SPEEDHACK
|
||||
|
||||
/* 8003D3C0-8003D68C 037D00 02CC+00 0/0 2/2 0/0 .text
|
||||
* renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class */
|
||||
void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_line) {
|
||||
s32 width = getDecorationLineWidth(p_line->field_0x1);
|
||||
if (width <= 0) {
|
||||
@@ -330,13 +302,10 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
|
||||
}
|
||||
|
||||
/* 8003D68C-8003D6B8 037FCC 002C+00 1/0 6/0 0/0 .text getDecoLineColor__18dRenderingFDAmap_cFii */
|
||||
const GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) {
|
||||
return getLineColor(param_0, param_1);
|
||||
}
|
||||
|
||||
/* 8003D6B8-8003D6E4 037FF8 002C+00 1/0 6/0 0/0 .text
|
||||
* getDecorationLineWidth__18dRenderingFDAmap_cFi */
|
||||
s32 dRenderingFDAmap_c::getDecorationLineWidth(int param_0) {
|
||||
return getLineWidth(param_0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user