From 4d784275af0debd831e10043dd242f94648a290b Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Wed, 8 Nov 2023 20:05:30 -0500
Subject: [PATCH] misc minor stuff

---
 include/d/actor/d_a_arrow.h          | 5 -----
 include/d/actor/d_a_hookshot.h       | 2 --
 include/d/d_cloth_packet.h           | 3 +++
 src/JSystem/JParticle/JPAEmitter.cpp | 2 +-
 src/JSystem/JUtility/JUTConsole.cpp  | 4 +---
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h
index 0edeedfb8..c0bc91ff9 100644
--- a/include/d/actor/d_a_arrow.h
+++ b/include/d/actor/d_a_arrow.h
@@ -131,9 +131,4 @@ public:
     static const dCcD_SrcSph m_co_sph_src;
 };
 
-// Intellisense doesn't understand PTMF sizes
-#ifndef __INTELLISENSE__
-STATIC_ASSERT(sizeof(daArrow_c) == 0x704);
-#endif
-
 #endif /* D_A_ARROW_H */
diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h
index 0f01e0ad2..99da72971 100644
--- a/include/d/actor/d_a_hookshot.h
+++ b/include/d/actor/d_a_hookshot.h
@@ -62,6 +62,4 @@ public:
     /* 0x54C */ ProcFunc mCurrProcFunc;
 };
 
-// dBgS_RopeLinChk
-
 #endif /* D_A_HOOKSHOT_H */
diff --git a/include/d/d_cloth_packet.h b/include/d/d_cloth_packet.h
index 83aebef59..bc996b09f 100644
--- a/include/d/d_cloth_packet.h
+++ b/include/d/d_cloth_packet.h
@@ -4,6 +4,9 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JUtility/JUTTexture.h"
+#include "SSystem/SComponent/c_xyz.h"
+
+class dKy_tevstr_c;
 
 class dCloth_packet_c : public J3DPacket {
     /* 0x10 */ s32 mFlyGridSize;
diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/src/JSystem/JParticle/JPAEmitter.cpp
index aa890945e..0275be60e 100644
--- a/src/JSystem/JParticle/JPAEmitter.cpp
+++ b/src/JSystem/JParticle/JPAEmitter.cpp
@@ -144,10 +144,10 @@ void JPABaseEmitter::createChildren(JPABaseParticle* ptcl) {
 
 /* 8025D670-8025D6E0       .text createParticle__14JPABaseEmitterFv */
 JPABaseParticle * JPABaseEmitter::createParticle() {
-    /* Nonmatching - PTMF */
     JPABaseParticle * ptcl = getPtclFromVacList();
     if (ptcl != NULL) {
         mActiveParticles.prepend(&ptcl->mLink);
+        (this->*mVolumeFunc)();
         ptcl->initParticle();
         mDraw.initParticle(ptcl);
     }
diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp
index 28d717b46..618716b36 100644
--- a/src/JSystem/JUtility/JUTConsole.cpp
+++ b/src/JSystem/JUtility/JUTConsole.cpp
@@ -105,7 +105,6 @@ void JUTConsole::clear() {
 
 /* 802CA6D4-802CAC1C       .text doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType */
 void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const {
-    /* Nonmatching */
     f32 font_yOffset;
 
     if (mVisible && (mFont != NULL || consoleType == CONSOLE_TYPE_2)) {
@@ -167,7 +166,7 @@ void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const {
                         JUTDirectPrint::getManager()->drawString(mPositionX, ((y * font_yOffset) + mPositionY), linePtr);
                     }
 
-                    curLine = ((curLine + 1) <= mMaxLines) ? 0 : (curLine + 1);
+                    curLine = nextIndex(curLine);
                     y++;
                 } else {
                     break;
@@ -258,7 +257,6 @@ void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args)
 
 /* 802CB03C-802CB19C       .text dumpToTerminal__10JUTConsoleFUi */
 void JUTConsole::dumpToTerminal(unsigned int param_0) {
-    /* Nonmatching */
     if (param_0 == 0) {
         return;
     }