summaryrefslogtreecommitdiff
path: root/src/d/map/d_map_path_dmap.cpp
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-08-30 14:22:17 -0700
committerGitHub <noreply@github.com>2022-08-30 15:22:17 -0600
commitf8979749e3ef8e8cacf2ea8f474c7f23fc5cb6b3 (patch)
tree69659df2105266e9b26a4d50b9a2d610b3e437a2 /src/d/map/d_map_path_dmap.cpp
parentbc30d007e11458a198c5725626a10bb06a5da536 (diff)
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress * finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data * rename more data * remove asm / progress * match all of d_pane_class * fixes / some dKankyo doc * bunch of j2d work. d_drawlist / d_attention cleanup * progress / asm * cleanup wip * decompile JStage * setup some more JStudio structs * set up d_demo classes * some d_demo work * cleanup dolphin os stuff * some initial dEvent documentation * some At collision documentation * match JUTConsole::doDraw * dbgs work / split up some of d_a_alink into .inc files * d_a_alink_spinner work
Diffstat (limited to 'src/d/map/d_map_path_dmap.cpp')
-rw-r--r--src/d/map/d_map_path_dmap.cpp21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp
index 5a6f4b25d8..c267e39d18 100644
--- a/src/d/map/d_map_path_dmap.cpp
+++ b/src/d/map/d_map_path_dmap.cpp
@@ -4,25 +4,18 @@
//
#include "d/map/d_map_path_dmap.h"
+#include "d/map/d_map_path.h"
#include "d/com/d_com_inf_game.h"
#include "d/meter/d_meter_HIO.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_mtx.h"
+#include "MSL_C/math.h"
//
// Types:
//
-struct dMpath_n {
- struct dTexObjAggregate_c {
- /* 8003C85C */ void create();
- /* 8003C8F4 */ void remove();
- };
-
- static u8 m_texObjAgg[28];
-};
-
struct dMapInfo_c {
/* 8003F40C */ void calcFloorNo(f32, bool, int);
/* 8003F570 */ void calcNowStayFloorNo(f32, bool);
@@ -614,7 +607,7 @@ asm void renderingDAmap_c::entry(f32 param_0, f32 param_1, f32 param_2, int para
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-asm void renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* param_0) {
+asm bool renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* param_0) {
nofralloc
#include "asm/d/map/d_map_path_dmap/isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class.s"
}
@@ -654,7 +647,7 @@ asm GXColor* renderingDAmap_c::getBackColor() const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-asm void renderingDAmap_c::isRenderingFloor(int param_0) {
+asm bool renderingDAmap_c::isRenderingFloor(int param_0) {
nofralloc
#include "asm/d/map/d_map_path_dmap/isRenderingFloor__16renderingDAmap_cFi.s"
}
@@ -743,7 +736,7 @@ asm void renderingDAmap_c::getNextDrawRoomNo(int param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-asm void renderingDAmap_c::getFirstRoomPointer() {
+asm dDrawPath_c::room_class* renderingDAmap_c::getFirstRoomPointer() {
nofralloc
#include "asm/d/map/d_map_path_dmap/getFirstRoomPointer__16renderingDAmap_cFv.s"
}
@@ -753,7 +746,7 @@ asm void renderingDAmap_c::getFirstRoomPointer() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-asm void renderingDAmap_c::getNextRoomPointer() {
+asm dDrawPath_c::room_class* renderingDAmap_c::getNextRoomPointer() {
nofralloc
#include "asm/d/map/d_map_path_dmap/getNextRoomPointer__16renderingDAmap_cFv.s"
}
@@ -763,7 +756,7 @@ asm void renderingDAmap_c::getNextRoomPointer() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-asm void renderingDAmap_c::isDrawPath() {
+asm bool renderingDAmap_c::isDrawPath() {
nofralloc
#include "asm/d/map/d_map_path_dmap/isDrawPath__16renderingDAmap_cFv.s"
}