From 612f26c132280da43ecfa5fa8c8cc32966f06eb6 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Tue, 25 Jan 2022 12:24:14 -0800
Subject: d_kankyo_wether / d_eye_hl (#178)

* d_eye_hl / d_kankyo_wether wip

* more d_kankyo_wether + format

* remove asm

* some d_kankyo wip

* fix dccs vtable

* some m_Do_graphic / d_meter2_draw work
---
 src/m_Do/m_Do_ext.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/m_Do/m_Do_ext.cpp')

diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 18c0856a13..dc2924dfa1 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -721,7 +721,7 @@ asm void mDoExt_brkAnm::entry(J3DMaterialTable* param_0, f32 param_1) {
 
 /* ############################################################################################## */
 /* 803A3020-803A30C0 000140 0085+1B 1/1 0/0 0/0 .data            l_invisibleMat$7041 */
-SECTION_DATA static u8 l_invisibleMat[133 + 27 /* padding */] = {
+SECTION_DATA static u8 l_invisibleMat[133 + 27 /* padding */] ALIGN_DECL(32) = {
     0x10,
     0x00,
     0x00,
@@ -2075,7 +2075,8 @@ asm mDoExt_invJntPacket::mDoExt_invJntPacket() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DPacket::~J3DPacket() {
+// asm J3DPacket::~J3DPacket() {
+extern "C" asm void __dt__9J3DPacketFv() {
     nofralloc
 #include "asm/m_Do/m_Do_ext/__dt__9J3DPacketFv.s"
 }
@@ -3172,7 +3173,7 @@ static asm void mDoExt_initFont0() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoExt_getMesgFont() {
+asm JUTFont* mDoExt_getMesgFont() {
     nofralloc
 #include "asm/m_Do/m_Do_ext/mDoExt_getMesgFont__Fv.s"
 }
@@ -3277,7 +3278,7 @@ asm void mDoExt_removeSubFont() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void mDoExt_J3DModel__create(J3DModelData* param_0, u32 param_1, u32 param_2) {
+asm J3DModel* mDoExt_J3DModel__create(J3DModelData* param_0, u32 param_1, u32 param_2) {
     nofralloc
 #include "asm/m_Do/m_Do_ext/mDoExt_J3DModel__create__FP12J3DModelDataUlUl.s"
 }
-- 
cgit v1.2.3