diff --git a/include/d/d_2dnumber.h b/include/d/d_2dnumber.h
index 4aa697661..acbfe5cf8 100644
--- a/include/d/d_2dnumber.h
+++ b/include/d/d_2dnumber.h
@@ -36,6 +36,8 @@ public:
 
 class dDlst_2DOutFont_c {
 public:
+    void setLeftUpPos(f32, f32) {}
+    
     void initial();
     void setPane(JUTFont*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*);
     void setPaneEx(JUTFont*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, fopMsgM_pane_class*, char*);
diff --git a/include/d/d_auction_screen.h b/include/d/d_auction_screen.h
new file mode 100644
index 000000000..638690ae5
--- /dev/null
+++ b/include/d/d_auction_screen.h
@@ -0,0 +1,48 @@
+#ifndef D_AUCTION_SCREEN_H
+#define D_AUCTION_SCREEN_H
+
+#include "dolphin/types.h"
+
+class fopMsgM_pane_class;
+class J2DPane;
+class JKRArchive;
+
+class dAuction_screen_c {
+public:
+    void clearTimer() {}
+    void draw() {}
+    void getArchive(JKRArchive*) {}
+    
+    void screenSet();
+    void initPosSet(fopMsgM_pane_class*, f32, f32);
+    void gaugeMove();
+    void nowRupeeSet();
+    void nextRupeeSet(s16);
+    void changeNumberTexture(J2DPane*, int);
+    void rupeeCountTrans();
+    void rupeeCountUp();
+    void rupeeCountDown();
+    void slotShowAnime();
+    void gaugeShowAnime();
+    void initialize();
+    void _create();
+    void _move();
+    void _draw();
+    void _open();
+    void _close();
+};
+
+class dAs_c {
+public:
+    void _create();
+    void _execute();
+    void _draw();
+    void _delete();
+};
+
+class dAs_HIO_c {
+public:
+    dAs_HIO_c();
+};
+
+#endif /* D_AUCTION_SCREEN_H */
diff --git a/include/d/d_file_error.h b/include/d/d_file_error.h
new file mode 100644
index 000000000..9a973a6bc
--- /dev/null
+++ b/include/d/d_file_error.h
@@ -0,0 +1,53 @@
+#ifndef D_FILE_ERROR_H
+#define D_FILE_ERROR_H
+
+#include "dolphin/types.h"
+
+class MyScreen {
+public:
+    void createPane(const J2DPane::J2DScrnBlockHeader&, JSURandomInputStream*, J2DPane*) {}
+};
+
+class dFe_HIO_c {
+public:
+    dFe_HIO_c();
+};
+
+class dFile_error_c {
+public:
+    void getStatus() {}
+    void getYesNo() {}
+    void setDbgErrMessage(char*, int) {}
+    void setTimeCountDownMode() {}
+    
+    void _create();
+    void initial();
+    void _delete();
+    void setErrMessage(u32, int);
+    void closeMessage();
+    void resizeMsgBoard(int);
+    void setMessage(char*);
+    void getLineCount(char*);
+    void _move();
+    void ProcWait();
+    void ShowMsgBoard();
+    void ynCursorInit();
+    void HideMsgBoard();
+    void msgDispWait();
+    void yesNoSelectWait();
+    void ynCursorMove();
+    void ynCursorAnime();
+    void screenSet();
+    void paneTransInit();
+    void displayInit();
+    void PaneTranceBase(s16, u8, f32, f32, f32, f32, u8, int);
+    void _draw();
+    void draw2();
+};
+
+class dDlst_FileErr_c {
+public:
+    void draw();
+};
+
+#endif /* D_FILE_ERROR_H */
diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h
index 2bce22204..49247d046 100644
--- a/include/d/d_file_select.h
+++ b/include/d/d_file_select.h
@@ -3,9 +3,130 @@
 
 #include "d/d_drawlist.h"
 
+class dFs_HIO_c {
+public:
+    dFs_HIO_c();
+};
+
+class dDlst_FileSel_c {
+public:
+    void draw();
+};
+
 class dFile_select_c : public dDlst_base_c {
 public:
+    void getErrType() {}
+    void getIconMode() {}
+    void getSelectNum() {}
+    void isDataExtra(u8) {}
+    void isDataNew(u8) {}
+    void isSelectEnd() {}
+    void setIconMode(u8) {}
+    void setSaveDataPtr(u8*) {}
+    void setSavePicDataPtr(u8*) {}
+    void setUseType(u8) {}
+    
     dFile_select_c();
+    void _create();
+    void initial();
+    void _delete();
+    void _move();
+    void _open();
+    void _close();
+    void closeEnd();
+    void closeCardErr();
+    void closeBack();
+    void closeErrErase();
+    void closeErrCopy();
+    void dataSelect();
+    void menuColorChange();
+    void SelectTitAnime();
+    void recCursorMove();
+    void recCursorAnime();
+    void recCursorAlphaInit();
+    void recDataPaneMove();
+    void dataSelMoveSet();
+    void makeRecInfo(u8);
+    void dataSelectPaneMove();
+    void MessagePaneMoveSet(f32, f32, f32, f32, u8, int);
+    void menuSelect();
+    void menuCursorAlphaInit();
+    void menuCursorMove();
+    void menuCursorAnime();
+    void ToCopyPaneMove();
+    void ToErasePaneMove();
+    void ToBackPaneMove();
+    void copyDataToSelect();
+    void copyDataSelAnime();
+    void cptCursorMove();
+    void copyToSelBack();
+    void copyToSelPaneMove();
+    void copyPaneMoveOk();
+    void copyPaneMoveOk2();
+    void saveCopyBWColor();
+    void DataSelectPaneCopyMove(s16, s16);
+    void DataSelectPaneCopyBackMove(s16, s16);
+    void DataSelectPaneCopyMove2(s16, s16);
+    void DataSelectPaneCopyColorMove(s16, u8, int);
+    void DataSelectPaneBackFromCopyMove(u8, u8);
+    void YesNoSelect();
+    void yesNoCursorMove();
+    void CmdExecPaneMove0();
+    void CmdExecPaneMove2();
+    void CommandExec();
+    void DataEraseWait();
+    void DataCopyWait();
+    void ErasePaneMoveOk();
+    void ErasePaneMoveOk2();
+    void ErrorMsgPaneMove();
+    void ErrorMsgPaneMove2();
+    void backDatSelPaneMove();
+    void backDatSelWait();
+    void backDatSelWait2();
+    void DataSelectPaneBackMove(s16, s16, s16);
+    void nextModeWait();
+    void screenSet();
+    void paneTransInit();
+    void menuPaneMoveSet();
+    void yesNoPaneMoveSet();
+    void MessagePaneMove(f32, f32, f32, f32, s16, u8, int);
+    void recInfoPaneMove(f32, f32, f32, f32, s16, u8, int);
+    void menuPaneMove(f32, f32, s16, u8, int);
+    void yesNoPaneMove(f32, f32, s16, u8, int);
+    void PaneTranceTitle(s16, u8, f32, f32, u8, int);
+    void PaneAlphaTitleTxt(s16, u8);
+    void PaneTranceRecTlt1(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceRecTlt2(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceRecTlt3(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceRecInfo1(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceRecInfo2(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceRecInfo3(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceRecBase(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceMessageBase(s16, u8, f32, f32, f32, f32, u8, int);
+    void PaneTranceYes(s16, u8, f32, f32, u8, int);
+    void PaneTranceNo(s16, u8, f32, f32, u8, int);
+    void PaneTranceStart(s16, u8, f32, f32, u8, int);
+    void PaneTranceCopy(s16, u8, f32, f32, u8, int);
+    void PaneTranceErase(s16, u8, f32, f32, u8, int);
+    void PaneTranceBack(s16, u8, f32, f32, u8, int);
+    void displayInit();
+    void setSaveData();
+    void changeExtraColor(int);
+    void changeBrokenColor(int);
+    void _draw();
+    void dataSelectEx();
+    void ExSavePaneMove();
+    void YesNoSelectEx();
+    void ExSavePaneMove0();
+    void ExCardCheck();
+    void ExBackDatSelPaneMove();
+    void ExSavePaneMove1();
+    void ExDataSave();
+    void ExDataSaveWait();
+    void ExDataSavePaneMoveOk();
+    void ExDataSavePaneMoveOk2();
+    void ExErrorMsgPaneMove();
+    void ExErrorMsgPaneMove2();
 
 private:
     u32 field_0x00[100];
diff --git a/include/d/d_mesg.h b/include/d/d_mesg.h
new file mode 100644
index 000000000..da6256765
--- /dev/null
+++ b/include/d/d_mesg.h
@@ -0,0 +1,155 @@
+#ifndef D_MESG_H
+#define D_MESG_H
+
+#include "dolphin/types.h"
+
+namespace JMessage { class TControl; };
+class JUTFont;
+class JKRExpHeap;
+
+class sub_mesg_class;
+
+class dMesg_outFont_c {
+public:
+    void getTimer() {}
+    
+    ~dMesg_outFont_c();
+    void _create();
+    void _delete();
+    void _initialize();
+    void _set(s16, s16, s16, u32, u8);
+    void _draw();
+    void _setAlpha(u8);
+};
+
+class dMesg_tControl {
+public:
+    void getCharCode() {}
+    void getCharSpace() {}
+    void getInitFontSize() {}
+    void getLineCount() {}
+    void getLineLength(int) {}
+    void getLineStart() {}
+    void getMainFont() {}
+    void getNowFontSize() {}
+    void getRubyFont() {}
+    void getTextBoxWidth() {}
+    void isHeader() {}
+    void setCharCode(int) {}
+    void setCode16FgOff() {}
+    void setHeaderOff() {}
+    void setHeaderOn() {}
+    void setLineCount(int) {}
+    void setLineLength(int, f32) {}
+    void setLineStart(int) {}
+    void setMainFont(JUTFont*) {}
+    void setNowFontSize(int) {}
+    void setRubyFont(JUTFont*) {}
+    
+    dMesg_tControl();
+    void do_word(u32);
+};
+
+class dMesg_tSequenceProcessor {
+public:
+    void decWaitRest() {}
+    void getNowColor() {}
+    void getStopFlag() {}
+    void resetWaitRest() {}
+    void setMesg(sub_mesg_class*) {}
+    void setNowColor(u32) {}
+    void setShortCutFlag() {}
+    void setWaitRest() {}
+    
+    dMesg_tSequenceProcessor(JMessage::TControl*);
+    ~dMesg_tSequenceProcessor();
+    void initialize(int);
+    void do_begin(const void*, const char*);
+    void do_end();
+    void do_isReady();
+    void do_jump_isReady();
+    void do_jump(const void*, const char*);
+    void do_branch_query(u16);
+    void do_branch_queryResult();
+    void do_branch(const void*, const char*);
+    void do_character(int);
+    void do_tag(u32, const void*, u32);
+    void setCharacter();
+    void ruby_character(char*, int);
+    void do_systemTagCode(u16, const void*, u32);
+};
+
+class dMesg_tMeasureProcessor {
+public:
+    dMesg_tMeasureProcessor(JMessage::TControl*, int);
+    ~dMesg_tMeasureProcessor();
+    void do_character(int);
+    void do_end();
+    void do_tag(u32, const void*, u32);
+    void do_systemTagCode(u16, const void*, u32);
+};
+
+class dMesg_tRenderingProcessor {
+public:
+    dMesg_tRenderingProcessor(JMessage::TControl*);
+    ~dMesg_tRenderingProcessor();
+    void do_begin(const void*, const char*);
+    void do_end();
+    void do_character(int);
+    void do_tag(u32, const void*, u32);
+    void do_systemTagCode(u16, const void*, u32);
+};
+
+class dMesg_screenData_c {
+public:
+    void deleteScreen() {}
+    void getTextPosX(int) {}
+    void getTextPosY(int) {}
+    void resetTimer() {}
+    void setFont(JUTFont*, JUTFont*) {}
+    void setHeap(JKRExpHeap*) {}
+    void setMesg(sub_mesg_class*) {}
+    
+    ~dMesg_screenData_c();
+    void setCommonData();
+    void initString(char*, int);
+    void setString(char*, int);
+    void shiftSet(int, int);
+    void arwAnimeInit();
+    void arwAnime();
+    void dotAnimeInit();
+    void dotAnime();
+    void changeFont(JUTFont*);
+    void setTextPosition(u8);
+    void createScreen();
+    void move();
+    void draw();
+};
+
+class dMesg_screenDataTalk_c {
+public:
+    ~dMesg_screenDataTalk_c();
+    void createScreen();
+    void changeFont(JUTFont*);
+    void openAnime();
+    void closeAnime();
+    void setTextPosition(u8);
+    void draw();
+};
+
+class dMesg_screenDataItem_c {
+public:
+    ~dMesg_screenDataItem_c();
+    void createScreen();
+    void changeFont(JUTFont*);
+    void deleteScreen();
+    void openAnime();
+    void closeAnime();
+    void move();
+    void draw();
+    void ringMove();
+    void lightMove();
+    void cornerMove();
+};
+
+#endif /* D_MESG_H */
diff --git a/include/d/d_message.h b/include/d/d_message.h
new file mode 100644
index 000000000..6105e3a81
--- /dev/null
+++ b/include/d/d_message.h
@@ -0,0 +1,21 @@
+#ifndef D_MESSAGE_H
+#define D_MESSAGE_H
+
+#include "dolphin/types.h"
+
+class sub_msg2_class;
+
+class dDlst_2DMSG2_c {
+public:
+    void setActorP(sub_msg2_class*) {}
+    
+    void draw();
+    void outFontDraw();
+};
+
+class dDlst_2DCopy_c {
+public:
+    void draw();
+};
+
+#endif /* D_MESSAGE_H */
diff --git a/include/d/d_message_paper.h b/include/d/d_message_paper.h
new file mode 100644
index 000000000..2b5d856a2
--- /dev/null
+++ b/include/d/d_message_paper.h
@@ -0,0 +1,26 @@
+#ifndef D_MESSAGE_PAPER_H
+#define D_MESSAGE_PAPER_H
+
+#include "dolphin/types.h"
+
+class sub_msg3_class;
+
+class dmsg3_3d_c {
+public:
+    dmsg3_3d_c();
+    ~dmsg3_3d_c();
+    void setDummyTexture();
+    void set_mtx();
+    void exec();
+    void draw();
+};
+
+class dDlst_2DMSG3_c {
+public:
+    void setActorP(sub_msg3_class*) {}
+    
+    void draw();
+    void outFontDraw();
+};
+
+#endif /* D_MESSAGE_PAPER_H */
diff --git a/include/d/d_minigame_starter.h b/include/d/d_minigame_starter.h
new file mode 100644
index 000000000..071910c3c
--- /dev/null
+++ b/include/d/d_minigame_starter.h
@@ -0,0 +1,33 @@
+#ifndef D_MINIGAME_STARTER_H
+#define D_MINIGAME_STARTER_H
+
+#include "dolphin/types.h"
+
+class JKRArchive;
+class fopMsgM_pane_class;
+
+class dDlst_StarterScrnDraw_c {
+public:
+    void acc(s16, s16, s16) {}
+    
+    void setScreen(const char*, JKRArchive*);
+    void anime1(int);
+    void anime2();
+    void scaleAnime(f32);
+    void setRotate(fopMsgM_pane_class*, f32);
+    void draw();
+};
+
+class dMinigame_Starter_c {
+public:
+    void countStart() {}
+    
+    void _create();
+    void _execute();
+    void _draw();
+    void _delete();
+    void startCheck();
+    void deleteCheck();
+};
+
+#endif /* D_MINIGAME_STARTER_H */
diff --git a/include/d/d_minigame_terminater.h b/include/d/d_minigame_terminater.h
new file mode 100644
index 000000000..6dc38e5d8
--- /dev/null
+++ b/include/d/d_minigame_terminater.h
@@ -0,0 +1,50 @@
+#ifndef D_MINIGAME_TERMINATER_H
+#define D_MINIGAME_TERMINATER_H
+
+#include "dolphin/types.h"
+
+class JKRArchive;
+class J2DPane;
+class fopMsgM_pane_class;
+
+class dDlst_TerminaterScrnDraw_c {
+public:
+    void acc(s16, s16, s16) {}
+    
+    void setScreen(const char*, JKRArchive*);
+    void setScrnFailed();
+    void setScrnSuccess(int, int);
+    void changeNumberTexture(J2DPane*, int);
+    void getNumber(int);
+    void setAlphaFailed();
+    void setAlphaSuccess();
+    void getRotate(fopMsgM_pane_class*);
+    void setRotate(fopMsgM_pane_class*, f32);
+    void setScale(fopMsgM_pane_class*, f32);
+    void animeF1(int);
+    void animeF2(int);
+    void animeF3(int);
+    void animeS1();
+    void animeS2(fopMsgM_pane_class*);
+    void animeS3();
+    void animeFailed1();
+    void animeFailed2();
+    void animeSuccess();
+    void animePerfect();
+    void draw();
+};
+
+class dMinigame_Terminater_c {
+public:
+    void getResultRupee() {}
+    void getResultTime() {}
+    void setResultRupee(int) {}
+    void setResultTime(int) {}
+    
+    void _create();
+    void _execute();
+    void _draw();
+    void _delete();
+};
+
+#endif /* D_MINIGAME_TERMINATER_H */
diff --git a/include/d/d_name.h b/include/d/d_name.h
new file mode 100644
index 000000000..49dff3ade
--- /dev/null
+++ b/include/d/d_name.h
@@ -0,0 +1,68 @@
+#ifndef D_NAME_H
+#define D_NAME_H
+
+#include "dolphin/types.h"
+
+class dNm_HIO_c {
+public:
+    dNm_HIO_c();
+};
+
+class dName_c {
+public:
+    void draw() {}
+    void getInputStrPtr() {}
+    void isInputEnd() {}
+    void setNextNameStr(char*) {}
+    
+    void _create();
+    void initial();
+    void _delete();
+    void _move();
+    void nameCheck();
+    void playNameSet(int);
+    void _open();
+    void _close();
+    void NameInMain();
+    void nameCursorAnime();
+    void EndWait();
+    void MojiSelect();
+    void mojiChange(u8);
+    void selectMojiSet();
+    void getMoji();
+    void setMoji(int);
+    void setNameText();
+    void nameCursorMove();
+    void selectCursorMove();
+    void selectCursorTxtChange();
+    void selectCursorAnime();
+    void menuCursorPosSet();
+    void MenuSelect();
+    void MenuButtonAnime();
+    void menuAbtnSelect();
+    void backSpace();
+    void mojiListChange(u8);
+    void menuCursorMove();
+    void selectCursorPosSet(int);
+    void menuCursorAnime();
+    void _draw();
+    void screenSet();
+    void paneTransInit();
+    void PaneTranceTitle(s16, u8, f32, f32, u8, int);
+    void PaneTranceName(s16, u8, f32, f32, u8, int);
+    void PaneTranceBase0(s16, u8, f32, f32, u8, int);
+    void PaneTranceBase(s16, u8, f32, f32, u8, int);
+    void PaneTranceHira(s16, u8, f32, f32, u8, int);
+    void PaneTranceKata(s16, u8, f32, f32, u8, int);
+    void PaneTranceEisu(s16, u8, f32, f32, u8, int);
+    void PaneTranceArrow(s16, u8, f32, f32, u8, int);
+    void PaneTranceEnd(s16, u8, f32, f32, u8, int);
+    void displayInit();
+    void NameStrSet();
+};
+
+class dDlst_NameIN_c {
+    void draw();
+};
+
+#endif /* D_NAME_H */
diff --git a/include/d/d_operate_wind.h b/include/d/d_operate_wind.h
new file mode 100644
index 000000000..73cf1ee5b
--- /dev/null
+++ b/include/d/d_operate_wind.h
@@ -0,0 +1,76 @@
+#ifndef D_OPERATE_WIND_H
+#define D_OPERATE_WIND_H
+
+#include "dolphin/types.h"
+#include "JSystem/JUtility/TColor.h"
+
+class fopMsgM_pane_class;
+class JKRExpHeap;
+class J2DScreen;
+
+class dOw_HIO_c {
+public:
+    dOw_HIO_c();
+};
+
+class dDlst_Ow_main_c {
+public:
+    void drawLine(int, f32, f32, f32, f32) {}
+    void setLineColor(JUtility::TColor) {}
+    void setLineMax(int) {}
+    void setScreen(J2DScreen*) {}
+    
+    void draw();
+};
+
+class dDlst_Ow_mask_c {
+public:
+    void setScreen(J2DScreen*) {}
+    
+    void draw();
+};
+
+class dOperate_wind_c {
+public:
+    void setTimer(s16) {}
+    
+    void dOw_angleRegular(f32);
+    void dOw_stickControl(int, s16);
+    void screenSet();
+    void alphaSet(f32);
+    void arrowColor1();
+    void arrowColor2();
+    void maskColor();
+    void arrowDirection();
+    void windSet();
+    void ringScale(f32);
+    void directionTrans(f32);
+    void lineInit(f32);
+    void lineDraw();
+    void arrowRotate(fopMsgM_pane_class*, s16);
+    void initialize();
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    void _open();
+    void _close();
+};
+
+class dOw_c {
+public:
+    void _close() {}
+    void _draw() {}
+    void _move() {}
+    void _open() {}
+    void getHeap() {}
+    void getStatus() {}
+    void setHeap(JKRExpHeap*) {}
+    void setStatus(u8) {}
+    void setTimer(s16) {}
+    
+    void _create();
+    void _delete();
+};
+
+#endif /* D_OPERATE_WIND_H */
diff --git a/include/d/d_picture_box.h b/include/d/d_picture_box.h
new file mode 100644
index 000000000..3d8a90205
--- /dev/null
+++ b/include/d/d_picture_box.h
@@ -0,0 +1,71 @@
+#ifndef D_PICTURE_BOX_H
+#define D_PICTURE_BOX_H
+
+#include "dolphin/types.h"
+
+class JKRExpHeap;
+class fopMsgM_pane_class;
+class fopMsgM_pane_alpha_class;
+
+class sub_pb_class;
+
+class dJle_Pb_c {
+    void alphaChange(fopMsgM_pane_alpha_class*, f32) {}
+    void alphaChange(fopMsgM_pane_class*, f32) {}
+    void getMemory(void*, int) {}
+    void getStatus() {}
+    void setTextArea(char*, int) {}
+    
+    void screenSet();
+    void screenSet2();
+    void cameraAlphaInc(f32);
+    void browseAlphaInc(f32);
+    void getAlphaInc(f32);
+    void alphaDec(f32);
+    void zoomScale();
+    void changeScale(int);
+    void up_downIconMove();
+    void left_rightIconMove();
+    void clickShutterMode();
+    void selectMode();
+    void cameraMode();
+    void pictureDraw(u8, int);
+    void pictureEraseWait();
+    void pictureDecide();
+    void pictureErase();
+    void pictureTransX(f32, f32, f32, f32, f32);
+    void changePicture();
+    void shutterChange();
+    void moveCamera();
+    void moveBrowse();
+    void selectBrowse();
+    void getBrowse();
+    void changeBrowseToCamera();
+    void changeCameraToBrowse();
+    void setColorInit(u8);
+    void setColorAnime(u8);
+    void changeData();
+    void label_sort();
+    void getPicLabelData(u8);
+    void shutterLineRotateCenter(f32, int);
+    void shutterLineRotateInitPos(f32, int);
+    void shutterLineMove();
+    void shutterLineDraw(u8);
+    void messageSet(u32);
+    void remainMessageSet(u8);
+    void existMessageSet(u8);
+    void shutterShow();
+    void shutterHide();
+    void _create(JKRExpHeap*);
+    void _copen();
+    void _bopen();
+    void _gopen();
+    void _close();
+    void _cmove();
+    void _bmove();
+    void _gmove();
+    void draw();
+    void _delete(JKRExpHeap*);
+};
+
+#endif /* D_PICTURE_BOX_H */
diff --git a/include/d/d_scope.h b/include/d/d_scope.h
new file mode 100644
index 000000000..a7ed13fab
--- /dev/null
+++ b/include/d/d_scope.h
@@ -0,0 +1,16 @@
+#ifndef D_SCOPE_H
+#define D_SCOPE_H
+
+#include "dolphin/types.h"
+
+class sub_scp_class;
+
+class dDlst_2DSCP_c {
+public:
+    void setActorP(sub_scp_class*) {}
+    
+    void draw();
+    void outFontDraw();
+};
+
+#endif /* D_SCOPE_H */
diff --git a/include/d/d_spline_path.h b/include/d/d_spline_path.h
index e7a8927bb..61c9ac79f 100644
--- a/include/d/d_spline_path.h
+++ b/include/d/d_spline_path.h
@@ -7,6 +7,8 @@ class cXyz;
 
 class d2DBSplinePath {
 public:
+    void Last() {}
+
     void Init(s32, s32);
     void Step();
     void Calc(cXyz*);
diff --git a/include/d/d_water_mark.h b/include/d/d_water_mark.h
index 46948833e..1fdf27b42 100644
--- a/include/d/d_water_mark.h
+++ b/include/d/d_water_mark.h
@@ -5,6 +5,9 @@
 
 class dWaterMark_c {
 public:
+    inline BOOL draw();
+    inline BOOL execute();
+    inline BOOL wm_delete();
     void setMatrix();
     void create();
 };
diff --git a/include/d/d_wind_arrow.h b/include/d/d_wind_arrow.h
index 67f97ab37..f71882896 100644
--- a/include/d/d_wind_arrow.h
+++ b/include/d/d_wind_arrow.h
@@ -5,9 +5,11 @@
 
 class dWindArrow_c {
 public:
-    void createHeap();
+    inline s32 create();
+    inline BOOL execute();
+    BOOL createHeap();
     void adjustHeap();
-    void draw();
+    BOOL draw();
 };
 
 #endif /* D_WIND_ARROW_H */
diff --git a/include/d/d_wpot_water.h b/include/d/d_wpot_water.h
index 68879a116..2813369df 100644
--- a/include/d/d_wpot_water.h
+++ b/include/d/d_wpot_water.h
@@ -6,11 +6,16 @@
 
 class dWpotWater_c {
 public:
-    
+    inline s32 create();
+    inline BOOL draw();
+    inline BOOL execute();
 };
 
 class dWpotWater_EcallBack {
 public:
+    void execute(JPABaseEmitter*) {}
+    void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) {}
+    
     void draw(JPABaseEmitter*);
 };
 
diff --git a/src/d/d_auction_screen.cpp b/src/d/d_auction_screen.cpp
index dae849062..20b3e3de4 100644
--- a/src/d/d_auction_screen.cpp
+++ b/src/d/d_auction_screen.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_auction_screen.cpp
 //
 
-#include "d_auction_screen.h"
-#include "dolphin/types.h"
+#include "d/d_auction_screen.h"
+#include "f_op/f_op_msg.h"
 
 /* 8015F550-8015F560       .text __ct__9dAs_HIO_cFv */
 dAs_HIO_c::dAs_HIO_c() {
@@ -17,7 +17,7 @@ void dAuction_screen_c::screenSet() {
 }
 
 /* 8015F8D8-8015F910       .text initPosSet__17dAuction_screen_cFP18fopMsgM_pane_classff */
-void dAuction_screen_c::initPosSet(fopMsgM_pane_class*, float, float) {
+void dAuction_screen_c::initPosSet(fopMsgM_pane_class*, f32, f32) {
     /* Nonmatching */
 }
 
@@ -32,7 +32,7 @@ void dAuction_screen_c::nowRupeeSet() {
 }
 
 /* 8015FA68-8015FAFC       .text nextRupeeSet__17dAuction_screen_cFs */
-void dAuction_screen_c::nextRupeeSet(short) {
+void dAuction_screen_c::nextRupeeSet(s16) {
     /* Nonmatching */
 }
 
@@ -195,19 +195,3 @@ void dAuction_screen_gaugeDown() {
 void dAs_timerCalc() {
     /* Nonmatching */
 }
-
-/* 80160E64-80160EC0       .text __dt__17dAuction_screen_cFv */
-dAuction_screen_c::~dAuction_screen_c() {
-    /* Nonmatching */
-}
-
-/* 80160EC0-80160EE0       .text draw__17dAuction_screen_cFv */
-void dAuction_screen_c::draw() {
-    /* Nonmatching */
-}
-
-/* 80160EE0-80160F28       .text __dt__9dAs_HIO_cFv */
-dAs_HIO_c::~dAs_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_file_error.cpp b/src/d/d_file_error.cpp
index cd50b1ec1..58701918a 100644
--- a/src/d/d_file_error.cpp
+++ b/src/d/d_file_error.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_file_error.cpp
 //
 
-#include "d_file_error.h"
+#include "d/d_file_error.h"
 #include "dolphin/types.h"
 
 /* 8017DB40-8017DBA8       .text __ct__9dFe_HIO_cFv */
@@ -26,13 +26,8 @@ void dFile_error_c::_delete() {
     /* Nonmatching */
 }
 
-/* 8017DEA4-8017DF04       .text __dt__8MyScreenFv */
-MyScreen::~MyScreen() {
-    /* Nonmatching */
-}
-
 /* 8017DF04-8017E010       .text setErrMessage__13dFile_error_cFUli */
-void dFile_error_c::setErrMessage(unsigned long, int) {
+void dFile_error_c::setErrMessage(u32, int) {
     /* Nonmatching */
 }
 
@@ -117,7 +112,7 @@ void dFile_error_c::displayInit() {
 }
 
 /* 8017F3FC-8017F5A4       .text PaneTranceBase__13dFile_error_cFsUcffffUci */
-void dFile_error_c::PaneTranceBase(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_error_c::PaneTranceBase(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
@@ -135,34 +130,3 @@ void dFile_error_c::draw2() {
 void dDlst_FileErr_c::draw() {
     /* Nonmatching */
 }
-
-/* 8017F67C-8017F6D8       .text __dt__15dDlst_FileErr_cFv */
-dDlst_FileErr_c::~dDlst_FileErr_c() {
-    /* Nonmatching */
-}
-
-/* 8017F6D8-8017F760       .text createPane__8MyScreenFRCQ27J2DPane18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPane */
-void MyScreen::createPane(const J2DPane::J2DScrnBlockHeader&, JSURandomInputStream*, J2DPane*) {
-    /* Nonmatching */
-}
-
-/* 8017F760-8017F768       .text getTypeID__9J2DScreenFv */
-void J2DScreen::getTypeID() {
-    /* Nonmatching */
-}
-
-/* 8017F768-8017F79C       .text calcMtx__9J2DScreenFv */
-void J2DScreen::calcMtx() {
-    /* Nonmatching */
-}
-
-/* 8017F79C-8017F7A0       .text drawSelf__7J2DPaneFff */
-void J2DPane::drawSelf(float, float) {
-    /* Nonmatching */
-}
-
-/* 8017F7A0-8017F7E8       .text __dt__9dFe_HIO_cFv */
-dFe_HIO_c::~dFe_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index aa86a4257..cc896d387 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_file_select.cpp
 //
 
-#include "d_file_select.h"
+#include "d/d_file_select.h"
 #include "dolphin/types.h"
 
 /* 8017F8B0-8017FA20       .text __ct__9dFs_HIO_cFv */
@@ -107,7 +107,7 @@ void dFile_select_c::dataSelMoveSet() {
 }
 
 /* 801824DC-801827A0       .text makeRecInfo__14dFile_select_cFUc */
-void dFile_select_c::makeRecInfo(unsigned char) {
+void dFile_select_c::makeRecInfo(u8) {
     /* Nonmatching */
 }
 
@@ -117,7 +117,7 @@ void dFile_select_c::dataSelectPaneMove() {
 }
 
 /* 80182A2C-80182A90       .text MessagePaneMoveSet__14dFile_select_cFffffUci */
-void dFile_select_c::MessagePaneMoveSet(float, float, float, float, unsigned char, int) {
+void dFile_select_c::MessagePaneMoveSet(f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
@@ -197,32 +197,27 @@ void dFile_select_c::saveCopyBWColor() {
 }
 
 /* 8018471C-80184B84       .text DataSelectPaneCopyMove__14dFile_select_cFss */
-void dFile_select_c::DataSelectPaneCopyMove(short, short) {
+void dFile_select_c::DataSelectPaneCopyMove(s16, s16) {
     /* Nonmatching */
 }
 
 /* 80184B84-801852E4       .text DataSelectPaneCopyBackMove__14dFile_select_cFss */
-void dFile_select_c::DataSelectPaneCopyBackMove(short, short) {
+void dFile_select_c::DataSelectPaneCopyBackMove(s16, s16) {
     /* Nonmatching */
 }
 
 /* 801852E4-80185A28       .text DataSelectPaneCopyMove2__14dFile_select_cFss */
-void dFile_select_c::DataSelectPaneCopyMove2(short, short) {
+void dFile_select_c::DataSelectPaneCopyMove2(s16, s16) {
     /* Nonmatching */
 }
 
 /* 80185A28-801870B0       .text DataSelectPaneCopyColorMove__14dFile_select_cFsUci */
-void dFile_select_c::DataSelectPaneCopyColorMove(short, unsigned char, int) {
-    /* Nonmatching */
-}
-
-/* 801870B0-801870BC       .text __ct__Q28JUtility6TColorFv */
-JUtility::TColor::TColor() {
+void dFile_select_c::DataSelectPaneCopyColorMove(s16, u8, int) {
     /* Nonmatching */
 }
 
 /* 801870BC-801874F4       .text DataSelectPaneBackFromCopyMove__14dFile_select_cFUcUc */
-void dFile_select_c::DataSelectPaneBackFromCopyMove(unsigned char, unsigned char) {
+void dFile_select_c::DataSelectPaneBackFromCopyMove(u8, u8) {
     /* Nonmatching */
 }
 
@@ -297,7 +292,7 @@ void dFile_select_c::backDatSelWait2() {
 }
 
 /* 80188704-80188C70       .text DataSelectPaneBackMove__14dFile_select_cFsss */
-void dFile_select_c::DataSelectPaneBackMove(short, short, short) {
+void dFile_select_c::DataSelectPaneBackMove(s16, s16, s16) {
     /* Nonmatching */
 }
 
@@ -327,102 +322,102 @@ void dFile_select_c::yesNoPaneMoveSet() {
 }
 
 /* 8018A46C-8018A4B0       .text MessagePaneMove__14dFile_select_cFffffsUci */
-void dFile_select_c::MessagePaneMove(float, float, float, float, short, unsigned char, int) {
+void dFile_select_c::MessagePaneMove(f32, f32, f32, f32, s16, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018A4B0-8018A4F4       .text recInfoPaneMove__14dFile_select_cFffffsUci */
-void dFile_select_c::recInfoPaneMove(float, float, float, float, short, unsigned char, int) {
+void dFile_select_c::recInfoPaneMove(f32, f32, f32, f32, s16, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018A4F4-8018A644       .text menuPaneMove__14dFile_select_cFffsUci */
-void dFile_select_c::menuPaneMove(float, float, short, unsigned char, int) {
+void dFile_select_c::menuPaneMove(f32, f32, s16, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018A644-8018A714       .text yesNoPaneMove__14dFile_select_cFffsUci */
-void dFile_select_c::yesNoPaneMove(float, float, short, unsigned char, int) {
+void dFile_select_c::yesNoPaneMove(f32, f32, s16, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018A714-8018A83C       .text PaneTranceTitle__14dFile_select_cFsUcffUci */
-void dFile_select_c::PaneTranceTitle(short, unsigned char, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceTitle(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018A83C-8018A8F4       .text PaneAlphaTitleTxt__14dFile_select_cFsUc */
-void dFile_select_c::PaneAlphaTitleTxt(short, unsigned char) {
+void dFile_select_c::PaneAlphaTitleTxt(s16, u8) {
     /* Nonmatching */
 }
 
 /* 8018A8F4-8018AA88       .text PaneTranceRecTlt1__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceRecTlt1(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceRecTlt1(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018AA88-8018AC1C       .text PaneTranceRecTlt2__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceRecTlt2(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceRecTlt2(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018AC1C-8018ADB0       .text PaneTranceRecTlt3__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceRecTlt3(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceRecTlt3(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018ADB0-8018AEE8       .text PaneTranceRecInfo1__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceRecInfo1(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceRecInfo1(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018AEE8-8018B020       .text PaneTranceRecInfo2__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceRecInfo2(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceRecInfo2(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B020-8018B158       .text PaneTranceRecInfo3__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceRecInfo3(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceRecInfo3(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B158-8018B494       .text PaneTranceRecBase__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceRecBase(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceRecBase(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B494-8018B5D8       .text PaneTranceMessageBase__14dFile_select_cFsUcffffUci */
-void dFile_select_c::PaneTranceMessageBase(short, unsigned char, float, float, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceMessageBase(s16, u8, f32, f32, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B5D8-8018B6E0       .text PaneTranceYes__14dFile_select_cFsUcffUci */
-void dFile_select_c::PaneTranceYes(short, unsigned char, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceYes(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B6E0-8018B7E8       .text PaneTranceNo__14dFile_select_cFsUcffUci */
-void dFile_select_c::PaneTranceNo(short, unsigned char, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceNo(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B7E8-8018B8F0       .text PaneTranceStart__14dFile_select_cFsUcffUci */
-void dFile_select_c::PaneTranceStart(short, unsigned char, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceStart(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B8F0-8018B9F8       .text PaneTranceCopy__14dFile_select_cFsUcffUci */
-void dFile_select_c::PaneTranceCopy(short, unsigned char, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceCopy(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018B9F8-8018BB00       .text PaneTranceErase__14dFile_select_cFsUcffUci */
-void dFile_select_c::PaneTranceErase(short, unsigned char, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceErase(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8018BB00-8018BC08       .text PaneTranceBack__14dFile_select_cFsUcffUci */
-void dFile_select_c::PaneTranceBack(short, unsigned char, float, float, unsigned char, int) {
+void dFile_select_c::PaneTranceBack(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
@@ -520,14 +515,3 @@ void dFile_select_c::ExErrorMsgPaneMove() {
 void dFile_select_c::ExErrorMsgPaneMove2() {
     /* Nonmatching */
 }
-
-/* 8018DD30-8018DD8C       .text __dt__15dDlst_FileSel_cFv */
-dDlst_FileSel_c::~dDlst_FileSel_c() {
-    /* Nonmatching */
-}
-
-/* 8018DD8C-8018DDD4       .text __dt__9dFs_HIO_cFv */
-dFs_HIO_c::~dFs_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp
index 1fe1d10b7..53918f011 100644
--- a/src/d/d_mesg.cpp
+++ b/src/d/d_mesg.cpp
@@ -3,8 +3,9 @@
 // Translation Unit: d_mesg.cpp
 //
 
-#include "d_mesg.h"
-#include "dolphin/types.h"
+#include "d/d_mesg.h"
+#include "JSystem/JMessage/resource.h"
+#include "f_op/f_op_msg.h"
 
 /* 801DFEE4-801E000C       .text _create__15dMesg_outFont_cFv */
 void dMesg_outFont_c::_create() {
@@ -22,7 +23,7 @@ void dMesg_outFont_c::_initialize() {
 }
 
 /* 801E0120-801E0184       .text _set__15dMesg_outFont_cFsssUlUc */
-void dMesg_outFont_c::_set(short, short, short, unsigned long, unsigned char) {
+void dMesg_outFont_c::_set(s16, s16, s16, u32, u8) {
     /* Nonmatching */
 }
 
@@ -32,7 +33,7 @@ void dMesg_outFont_c::_draw() {
 }
 
 /* 801E01D0-801E01E4       .text _setAlpha__15dMesg_outFont_cFUc */
-void dMesg_outFont_c::_setAlpha(unsigned char) {
+void dMesg_outFont_c::_setAlpha(u8) {
     /* Nonmatching */
 }
 
@@ -42,7 +43,7 @@ dMesg_tControl::dMesg_tControl() {
 }
 
 /* 801E0274-801E0288       .text do_word__14dMesg_tControlFUl */
-void dMesg_tControl::do_word(unsigned long) {
+void dMesg_tControl::do_word(u32) {
     /* Nonmatching */
 }
 
@@ -87,7 +88,7 @@ void dMesg_tSequenceProcessor::do_jump(const void*, const char*) {
 }
 
 /* 801E0870-801E0874       .text do_branch_query__24dMesg_tSequenceProcessorFUs */
-void dMesg_tSequenceProcessor::do_branch_query(unsigned short) {
+void dMesg_tSequenceProcessor::do_branch_query(u16) {
     /* Nonmatching */
 }
 
@@ -107,7 +108,7 @@ void dMesg_tSequenceProcessor::do_character(int) {
 }
 
 /* 801E0DE8-801E161C       .text do_tag__24dMesg_tSequenceProcessorFUlPCvUl */
-void dMesg_tSequenceProcessor::do_tag(unsigned long, const void*, unsigned long) {
+void dMesg_tSequenceProcessor::do_tag(u32, const void*, u32) {
     /* Nonmatching */
 }
 
@@ -122,7 +123,7 @@ void dMesg_tSequenceProcessor::ruby_character(char*, int) {
 }
 
 /* 801E1858-801E1B5C       .text do_systemTagCode__24dMesg_tSequenceProcessorFUsPCvUl */
-void dMesg_tSequenceProcessor::do_systemTagCode(unsigned short, const void*, unsigned long) {
+void dMesg_tSequenceProcessor::do_systemTagCode(u16, const void*, u32) {
     /* Nonmatching */
 }
 
@@ -142,12 +143,12 @@ void dMesg_tMeasureProcessor::do_end() {
 }
 
 /* 801E1F9C-801E27BC       .text do_tag__23dMesg_tMeasureProcessorFUlPCvUl */
-void dMesg_tMeasureProcessor::do_tag(unsigned long, const void*, unsigned long) {
+void dMesg_tMeasureProcessor::do_tag(u32, const void*, u32) {
     /* Nonmatching */
 }
 
 /* 801E27BC-801E28A8       .text do_systemTagCode__23dMesg_tMeasureProcessorFUsPCvUl */
-void dMesg_tMeasureProcessor::do_systemTagCode(unsigned short, const void*, unsigned long) {
+void dMesg_tMeasureProcessor::do_systemTagCode(u16, const void*, u32) {
     /* Nonmatching */
 }
 
@@ -172,12 +173,12 @@ void dMesg_tRenderingProcessor::do_character(int) {
 }
 
 /* 801E28F0-801E2970       .text do_tag__25dMesg_tRenderingProcessorFUlPCvUl */
-void dMesg_tRenderingProcessor::do_tag(unsigned long, const void*, unsigned long) {
+void dMesg_tRenderingProcessor::do_tag(u32, const void*, u32) {
     /* Nonmatching */
 }
 
 /* 801E2970-801E29A4       .text do_systemTagCode__25dMesg_tRenderingProcessorFUsPCvUl */
-void dMesg_tRenderingProcessor::do_systemTagCode(unsigned short, const void*, unsigned long) {
+void dMesg_tRenderingProcessor::do_systemTagCode(u16, const void*, u32) {
     /* Nonmatching */
 }
 
@@ -242,7 +243,7 @@ void dMesg_screenDataTalk_c::closeAnime() {
 }
 
 /* 801E3CE0-801E402C       .text setTextPosition__22dMesg_screenDataTalk_cFUc */
-void dMesg_screenDataTalk_c::setTextPosition(unsigned char) {
+void dMesg_screenDataTalk_c::setTextPosition(u8) {
     /* Nonmatching */
 }
 
@@ -321,11 +322,6 @@ dMesg_tSequenceProcessor::~dMesg_tSequenceProcessor() {
     /* Nonmatching */
 }
 
-/* 801E5C18-801E5C8C       .text __dt__Q28JMessage18TResourceContainerFv */
-JMessage::TResourceContainer::~TResourceContainer() {
-    /* Nonmatching */
-}
-
 /* 801E5C8C-801E5E14       .text dMesg_parse__Fv */
 void dMesg_parse() {
     /* Nonmatching */
@@ -352,7 +348,7 @@ void dMesg_fontsizeCenter(sub_mesg_class*, int, int) {
 }
 
 /* 801E5FB0-801E627C       .text dMesg_hyrule_language_check__FUl */
-void dMesg_hyrule_language_check(unsigned long) {
+void dMesg_hyrule_language_check(u32) {
     /* Nonmatching */
 }
 
@@ -372,7 +368,7 @@ void dMesg_screenData_c::changeFont(JUTFont*) {
 }
 
 /* 801E6764-801E6768       .text setTextPosition__18dMesg_screenData_cFUc */
-void dMesg_screenData_c::setTextPosition(unsigned char) {
+void dMesg_screenData_c::setTextPosition(u8) {
     /* Nonmatching */
 }
 
@@ -465,4 +461,3 @@ dMesg_screenDataItem_c::~dMesg_screenDataItem_c() {
 dMesg_screenDataTalk_c::~dMesg_screenDataTalk_c() {
     /* Nonmatching */
 }
-
diff --git a/src/d/d_message.cpp b/src/d/d_message.cpp
index 344f485a5..b9737efbc 100644
--- a/src/d/d_message.cpp
+++ b/src/d/d_message.cpp
@@ -3,31 +3,31 @@
 // Translation Unit: d_message.cpp
 //
 
-#include "d_message.h"
-#include "dolphin/types.h"
+#include "d/d_message.h"
+#include "f_op/f_op_msg.h"
 
 /* 801E73B4-801E74F4       .text dMsg2_value_init__FP14sub_msg2_classUc */
-void dMsg2_value_init(sub_msg2_class*, unsigned char) {
+void dMsg2_value_init(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801E74F4-801E75A8       .text dMsg2_setString__FP14sub_msg2_classUc */
-void dMsg2_setString(sub_msg2_class*, unsigned char) {
+void dMsg2_setString(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801E75A8-801E75CC       .text dMsg2_messagePaneShow__FP14sub_msg2_classUc */
-void dMsg2_messagePaneShow(sub_msg2_class*, unsigned char) {
+void dMsg2_messagePaneShow(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801E75CC-801E75F0       .text dMsg2_messagePaneHide__FP14sub_msg2_classUc */
-void dMsg2_messagePaneHide(sub_msg2_class*, unsigned char) {
+void dMsg2_messagePaneHide(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801E75F0-801E76DC       .text dMsg2_outFontHide__FP14sub_msg2_classUc */
-void dMsg2_outFontHide(sub_msg2_class*, unsigned char) {
+void dMsg2_outFontHide(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
@@ -72,12 +72,12 @@ void dMsg2_fontdataInit(sub_msg2_class*) {
 }
 
 /* 801E7A74-801E7AB8       .text dMsg2_screenDataSet__FP14sub_msg2_classUc */
-void dMsg2_screenDataSet(sub_msg2_class*, unsigned char) {
+void dMsg2_screenDataSet(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801E7AB8-801E8154       .text dMsg2_screenDataInit__FP14sub_msg2_classUc */
-void dMsg2_screenDataInit(sub_msg2_class*, unsigned char) {
+void dMsg2_screenDataInit(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
@@ -97,22 +97,22 @@ void dMsg2_stickInfoCheck(sub_msg2_class*) {
 }
 
 /* 801E833C-801E84E8       .text dMsg2_multiTexDraw__FP14sub_msg2_classssss */
-void dMsg2_multiTexDraw(sub_msg2_class*, short, short, short, short) {
+void dMsg2_multiTexDraw(sub_msg2_class*, s16, s16, s16, s16) {
     /* Nonmatching */
 }
 
 /* 801E84E8-801E8668       .text dMsg2_messageOut__FP14sub_msg2_classUci */
-void dMsg2_messageOut(sub_msg2_class*, unsigned char, int) {
+void dMsg2_messageOut(sub_msg2_class*, u8, int) {
     /* Nonmatching */
 }
 
 /* 801E8668-801E86E8       .text dMsg2_yose_select__FP14sub_msg2_classUc */
-void dMsg2_yose_select(sub_msg2_class*, unsigned char) {
+void dMsg2_yose_select(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801E86E8-801E8798       .text dMsg2_textPosition__FP14sub_msg2_classUc */
-void dMsg2_textPosition(sub_msg2_class*, unsigned char) {
+void dMsg2_textPosition(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
@@ -147,7 +147,7 @@ void dMsg2_aimBrightness() {
 }
 
 /* 801E8C78-801E9054       .text dMsg2_setCharAlpha__FP14sub_msg2_classUc */
-void dMsg2_setCharAlpha(sub_msg2_class*, unsigned char) {
+void dMsg2_setCharAlpha(sub_msg2_class*, u8) {
     /* Nonmatching */
 }
 
@@ -225,14 +225,3 @@ void dMsg2_Delete(sub_msg2_class*) {
 void dMsg2_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 801EAFC0-801EB01C       .text __dt__14dDlst_2DCopy_cFv */
-dDlst_2DCopy_c::~dDlst_2DCopy_c() {
-    /* Nonmatching */
-}
-
-/* 801EB01C-801EB078       .text __dt__14dDlst_2DMSG2_cFv */
-dDlst_2DMSG2_c::~dDlst_2DMSG2_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_message_paper.cpp b/src/d/d_message_paper.cpp
index c9898b378..2d9ed00a3 100644
--- a/src/d/d_message_paper.cpp
+++ b/src/d/d_message_paper.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_message_paper.cpp
 //
 
-#include "d_message_paper.h"
-#include "dolphin/types.h"
+#include "d/d_message_paper.h"
+#include "f_op/f_op_msg.h"
 
 /* 801EB128-801EB420       .text setDummyTexture__10dmsg3_3d_cFv */
 void dmsg3_3d_c::setDummyTexture() {
@@ -12,12 +12,12 @@ void dmsg3_3d_c::setDummyTexture() {
 }
 
 /* 801EB420-801EB444       .text loadModelData__FPUc */
-void loadModelData(unsigned char*) {
+void loadModelData(u8*) {
     /* Nonmatching */
 }
 
 /* 801EB444-801EB464       .text loadAnmTransformData__FPUc */
-void loadAnmTransformData(unsigned char*) {
+void loadAnmTransformData(u8*) {
     /* Nonmatching */
 }
 
@@ -47,27 +47,27 @@ void dmsg3_3d_c::draw() {
 }
 
 /* 801EB8DC-801EBA18       .text dMsg3_value_init__FP14sub_msg3_classUc */
-void dMsg3_value_init(sub_msg3_class*, unsigned char) {
+void dMsg3_value_init(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801EBA18-801EBAB4       .text dMsg3_setString__FP14sub_msg3_classUc */
-void dMsg3_setString(sub_msg3_class*, unsigned char) {
+void dMsg3_setString(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801EBAB4-801EBAD8       .text dMsg3_messagePaneShow__FP14sub_msg3_classUc */
-void dMsg3_messagePaneShow(sub_msg3_class*, unsigned char) {
+void dMsg3_messagePaneShow(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801EBAD8-801EBAFC       .text dMsg3_messagePaneHide__FP14sub_msg3_classUc */
-void dMsg3_messagePaneHide(sub_msg3_class*, unsigned char) {
+void dMsg3_messagePaneHide(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801EBAFC-801EBBD0       .text dMsg3_outFontHide__FUc */
-void dMsg3_outFontHide(unsigned char) {
+void dMsg3_outFontHide(u8) {
     /* Nonmatching */
 }
 
@@ -112,12 +112,12 @@ void dMsg3_fontdataInit(sub_msg3_class*) {
 }
 
 /* 801EBE94-801EBED8       .text dMsg3_screenDataSet__FP14sub_msg3_classUc */
-void dMsg3_screenDataSet(sub_msg3_class*, unsigned char) {
+void dMsg3_screenDataSet(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801EBED8-801EC52C       .text dMsg3_screenDataInit__FP14sub_msg3_classUc */
-void dMsg3_screenDataInit(sub_msg3_class*, unsigned char) {
+void dMsg3_screenDataInit(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
@@ -137,17 +137,17 @@ void dMsg3_stickInfoCheck(sub_msg3_class*) {
 }
 
 /* 801EC714-801EC84C       .text dMsg3_messageOut__FP14sub_msg3_classUci */
-void dMsg3_messageOut(sub_msg3_class*, unsigned char, int) {
+void dMsg3_messageOut(sub_msg3_class*, u8, int) {
     /* Nonmatching */
 }
 
 /* 801EC84C-801EC8CC       .text dMsg3_yose_select__FP14sub_msg3_classUc */
-void dMsg3_yose_select(sub_msg3_class*, unsigned char) {
+void dMsg3_yose_select(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
 /* 801EC8CC-801EC97C       .text dMsg3_textPosition__FP14sub_msg3_classUc */
-void dMsg3_textPosition(sub_msg3_class*, unsigned char) {
+void dMsg3_textPosition(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
@@ -182,7 +182,7 @@ void dMsg3_aimBrightness() {
 }
 
 /* 801ECEEC-801ED2C8       .text dMsg3_setCharAlpha__FP14sub_msg3_classUc */
-void dMsg3_setCharAlpha(sub_msg3_class*, unsigned char) {
+void dMsg3_setCharAlpha(sub_msg3_class*, u8) {
     /* Nonmatching */
 }
 
@@ -255,9 +255,3 @@ void dMsg3_Delete(sub_msg3_class*) {
 void dMsg3_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 801EEEFC-801EEF58       .text __dt__14dDlst_2DMSG3_cFv */
-dDlst_2DMSG3_c::~dDlst_2DMSG3_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_minigame_starter.cpp b/src/d/d_minigame_starter.cpp
index 8195924d7..82b006782 100644
--- a/src/d/d_minigame_starter.cpp
+++ b/src/d/d_minigame_starter.cpp
@@ -3,8 +3,9 @@
 // Translation Unit: d_minigame_starter.cpp
 //
 
-#include "d_minigame_starter.h"
-#include "dolphin/types.h"
+#include "d/d_minigame_starter.h"
+#include "f_op/f_op_msg.h"
+#include "f_op/f_op_msg_mng.h"
 
 /* 80205FE8-80206124       .text _create__19dMinigame_Starter_cFv */
 void dMinigame_Starter_c::_create() {
@@ -52,12 +53,12 @@ void dDlst_StarterScrnDraw_c::anime2() {
 }
 
 /* 80206CB0-80206DA4       .text scaleAnime__23dDlst_StarterScrnDraw_cFf */
-void dDlst_StarterScrnDraw_c::scaleAnime(float) {
+void dDlst_StarterScrnDraw_c::scaleAnime(f32) {
     /* Nonmatching */
 }
 
 /* 80206DA4-80206E44       .text setRotate__23dDlst_StarterScrnDraw_cFP18fopMsgM_pane_classf */
-void dDlst_StarterScrnDraw_c::setRotate(fopMsgM_pane_class*, float) {
+void dDlst_StarterScrnDraw_c::setRotate(fopMsgM_pane_class*, f32) {
     /* Nonmatching */
 }
 
@@ -90,9 +91,3 @@ void dMinigame_Starter_Delete(dMinigame_Starter_c*) {
 void dMinigame_Starter_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 80206F64-80206FC0       .text __dt__23dDlst_StarterScrnDraw_cFv */
-dDlst_StarterScrnDraw_c::~dDlst_StarterScrnDraw_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_minigame_terminater.cpp b/src/d/d_minigame_terminater.cpp
index 61792db83..34c9f9278 100644
--- a/src/d/d_minigame_terminater.cpp
+++ b/src/d/d_minigame_terminater.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_minigame_terminater.cpp
 //
 
-#include "d_minigame_terminater.h"
-#include "dolphin/types.h"
+#include "d/d_minigame_terminater.h"
+#include "f_op/f_op_msg.h"
 
 /* 80206FC0-80207164       .text _create__22dMinigame_Terminater_cFv */
 void dMinigame_Terminater_c::_create() {
@@ -67,12 +67,12 @@ void dDlst_TerminaterScrnDraw_c::getRotate(fopMsgM_pane_class*) {
 }
 
 /* 80208230-802082D0       .text setRotate__26dDlst_TerminaterScrnDraw_cFP18fopMsgM_pane_classf */
-void dDlst_TerminaterScrnDraw_c::setRotate(fopMsgM_pane_class*, float) {
+void dDlst_TerminaterScrnDraw_c::setRotate(fopMsgM_pane_class*, f32) {
     /* Nonmatching */
 }
 
 /* 802082D0-80208324       .text setScale__26dDlst_TerminaterScrnDraw_cFP18fopMsgM_pane_classf */
-void dDlst_TerminaterScrnDraw_c::setScale(fopMsgM_pane_class*, float) {
+void dDlst_TerminaterScrnDraw_c::setScale(fopMsgM_pane_class*, f32) {
     /* Nonmatching */
 }
 
@@ -155,9 +155,3 @@ void dMinigame_Terminater_Delete(dMinigame_Terminater_c*) {
 void dMinigame_Terminater_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 8020A5C4-8020A620       .text __dt__26dDlst_TerminaterScrnDraw_cFv */
-dDlst_TerminaterScrnDraw_c::~dDlst_TerminaterScrnDraw_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index 4cb918640..680b298eb 100644
--- a/src/d/d_name.cpp
+++ b/src/d/d_name.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_name.cpp
 //
 
-#include "d_name.h"
+#include "d/d_name.h"
 #include "dolphin/types.h"
 
 /* 80215E38-80215F64       .text __ct__9dNm_HIO_cFv */
@@ -72,7 +72,7 @@ void dName_c::MojiSelect() {
 }
 
 /* 80216F14-80217284       .text mojiChange__7dName_cFUc */
-void dName_c::mojiChange(unsigned char) {
+void dName_c::mojiChange(u8) {
     /* Nonmatching */
 }
 
@@ -142,7 +142,7 @@ void dName_c::backSpace() {
 }
 
 /* 80218428-802184EC       .text mojiListChange__7dName_cFUc */
-void dName_c::mojiListChange(unsigned char) {
+void dName_c::mojiListChange(u8) {
     /* Nonmatching */
 }
 
@@ -177,47 +177,47 @@ void dName_c::paneTransInit() {
 }
 
 /* 8021960C-802197A0       .text PaneTranceTitle__7dName_cFsUcffUci */
-void dName_c::PaneTranceTitle(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceTitle(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 802197A0-802199F4       .text PaneTranceName__7dName_cFsUcffUci */
-void dName_c::PaneTranceName(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceName(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 802199F4-80219ADC       .text PaneTranceBase0__7dName_cFsUcffUci */
-void dName_c::PaneTranceBase0(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceBase0(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 80219ADC-80219D04       .text PaneTranceBase__7dName_cFsUcffUci */
-void dName_c::PaneTranceBase(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceBase(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 80219D04-80219E14       .text PaneTranceHira__7dName_cFsUcffUci */
-void dName_c::PaneTranceHira(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceHira(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 80219E14-80219F24       .text PaneTranceKata__7dName_cFsUcffUci */
-void dName_c::PaneTranceKata(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceKata(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 80219F24-8021A034       .text PaneTranceEisu__7dName_cFsUcffUci */
-void dName_c::PaneTranceEisu(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceEisu(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8021A034-8021A144       .text PaneTranceArrow__7dName_cFsUcffUci */
-void dName_c::PaneTranceArrow(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceArrow(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
 /* 8021A144-8021A254       .text PaneTranceEnd__7dName_cFsUcffUci */
-void dName_c::PaneTranceEnd(short, unsigned char, float, float, unsigned char, int) {
+void dName_c::PaneTranceEnd(s16, u8, f32, f32, u8, int) {
     /* Nonmatching */
 }
 
@@ -235,9 +235,3 @@ void dName_c::NameStrSet() {
 void dDlst_NameIN_c::draw() {
     /* Nonmatching */
 }
-
-/* 8021A6BC-8021A704       .text __dt__9dNm_HIO_cFv */
-dNm_HIO_c::~dNm_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_operate_wind.cpp b/src/d/d_operate_wind.cpp
index 96c1b4189..90cc27d48 100644
--- a/src/d/d_operate_wind.cpp
+++ b/src/d/d_operate_wind.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_operate_wind.cpp
 //
 
-#include "d_operate_wind.h"
-#include "dolphin/types.h"
+#include "d/d_operate_wind.h"
+#include "f_op/f_op_msg.h"
 
 /* 8021E58C-8021E5F8       .text __ct__9dOw_HIO_cFv */
 dOw_HIO_c::dOw_HIO_c() {
@@ -22,12 +22,12 @@ void dDlst_Ow_mask_c::draw() {
 }
 
 /* 8021E708-8021E7E4       .text dOw_angleRegular__15dOperate_wind_cFf */
-void dOperate_wind_c::dOw_angleRegular(float) {
+void dOperate_wind_c::dOw_angleRegular(f32) {
     /* Nonmatching */
 }
 
 /* 8021E7E4-8021E974       .text dOw_stickControl__15dOperate_wind_cFis */
-void dOperate_wind_c::dOw_stickControl(int, short) {
+void dOperate_wind_c::dOw_stickControl(int, s16) {
     /* Nonmatching */
 }
 
@@ -37,7 +37,7 @@ void dOperate_wind_c::screenSet() {
 }
 
 /* 8021ED4C-8021EE9C       .text alphaSet__15dOperate_wind_cFf */
-void dOperate_wind_c::alphaSet(float) {
+void dOperate_wind_c::alphaSet(f32) {
     /* Nonmatching */
 }
 
@@ -67,17 +67,17 @@ void dOperate_wind_c::windSet() {
 }
 
 /* 802208C4-8022098C       .text ringScale__15dOperate_wind_cFf */
-void dOperate_wind_c::ringScale(float) {
+void dOperate_wind_c::ringScale(f32) {
     /* Nonmatching */
 }
 
 /* 8022098C-80220A60       .text directionTrans__15dOperate_wind_cFf */
-void dOperate_wind_c::directionTrans(float) {
+void dOperate_wind_c::directionTrans(f32) {
     /* Nonmatching */
 }
 
 /* 80220A60-80220CD8       .text lineInit__15dOperate_wind_cFf */
-void dOperate_wind_c::lineInit(float) {
+void dOperate_wind_c::lineInit(f32) {
     /* Nonmatching */
 }
 
@@ -87,7 +87,7 @@ void dOperate_wind_c::lineDraw() {
 }
 
 /* 80220D80-80220E18       .text arrowRotate__15dOperate_wind_cFP18fopMsgM_pane_classs */
-void dOperate_wind_c::arrowRotate(fopMsgM_pane_class*, short) {
+void dOperate_wind_c::arrowRotate(fopMsgM_pane_class*, s16) {
     /* Nonmatching */
 }
 
@@ -160,24 +160,3 @@ void dOw_Delete(dOw_c*) {
 void dOw_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 80221AA0-80221AFC       .text __dt__15dDlst_Ow_mask_cFv */
-dDlst_Ow_mask_c::~dDlst_Ow_mask_c() {
-    /* Nonmatching */
-}
-
-/* 80221AFC-80221B58       .text __dt__15dDlst_Ow_main_cFv */
-dDlst_Ow_main_c::~dDlst_Ow_main_c() {
-    /* Nonmatching */
-}
-
-/* 80221B58-80221BA0       .text __dt__15dOperate_wind_cFv */
-dOperate_wind_c::~dOperate_wind_c() {
-    /* Nonmatching */
-}
-
-/* 80221BA0-80221BFC       .text __dt__9dOw_HIO_cFv */
-dOw_HIO_c::~dOw_HIO_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_picture_box.cpp b/src/d/d_picture_box.cpp
index 6a10d9e6a..18b3bf34e 100644
--- a/src/d/d_picture_box.cpp
+++ b/src/d/d_picture_box.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_picture_box.cpp
 //
 
-#include "d_picture_box.h"
-#include "dolphin/types.h"
+#include "d/d_picture_box.h"
+#include "f_op/f_op_msg.h"
 
 /* 802258C8-80225954       .text dPb_erasePicture__Fv */
 void dPb_erasePicture() {
@@ -285,9 +285,3 @@ void dPb_Delete(sub_pb_class*) {
 void dPb_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 8022C03C-8022C0B4       .text __dt__9dJle_Pb_cFv */
-dJle_Pb_c::~dJle_Pb_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp
index c989e75d5..5adb9fbdc 100644
--- a/src/d/d_scope.cpp
+++ b/src/d/d_scope.cpp
@@ -3,8 +3,8 @@
 // Translation Unit: d_scope.cpp
 //
 
-#include "d_scope.h"
-#include "dolphin/types.h"
+#include "d/d_scope.h"
+#include "f_op/f_op_msg.h"
 
 /* 80237568-802375E8       .text draw__13dDlst_2DSCP_cFv */
 void dDlst_2DSCP_c::draw() {
@@ -210,9 +210,3 @@ void dScp_Delete(sub_scp_class*) {
 void dScp_Create(msg_class*) {
     /* Nonmatching */
 }
-
-/* 8023B49C-8023B4F8       .text __dt__13dDlst_2DSCP_cFv */
-dDlst_2DSCP_c::~dDlst_2DSCP_c() {
-    /* Nonmatching */
-}
-
diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp
index a090e0372..ce13b9f13 100644
--- a/src/d/d_wind_arrow.cpp
+++ b/src/d/d_wind_arrow.cpp
@@ -7,7 +7,7 @@
 #include "f_op/f_op_kankyo.h"
 
 /* 8023E3C4-8023E420       .text createHeap__12dWindArrow_cFv */
-void dWindArrow_c::createHeap() {
+BOOL dWindArrow_c::createHeap() {
     /* Nonmatching */
 }
 
@@ -22,7 +22,7 @@ void dWindArrow_Draw(dWindArrow_c*) {
 }
 
 /* 8023E48C-8023E6F4       .text draw__12dWindArrow_cFv */
-void dWindArrow_c::draw() {
+BOOL dWindArrow_c::draw() {
     /* Nonmatching */
 }