mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 04:48:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

first d_menu_ring (item wheel) pass (#1928)

Browse Source 
* first pass on d_menu_ring

* d_menu_item_explain mostly OK

* match ptmf's and sinit

* format d_menu_item_explain

* first item wheel pass to pr

* fix seStart calls

* d_menu_item_explain OK
This commit is contained in:
Trueffel
2023-09-16 19:16:57 +02:00
committed by GitHub
parent 2651100a04
commit 948188b17d
54 changed files with 2087 additions and 4610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/com/d_com_inf_game.cpp
+2 -2
View File
@@ -2175,8 +2175,8 @@ s8 dComIfGs_getWarpRoomNo() {
return dComIfGs_getLastWarpMarkRoomNo();
}
BOOL dComIfGs_getWarpMarkFlag() {
return dComIfGs_getLastWarpAcceptStage() >= 0;
bool dComIfGs_getWarpMarkFlag() {
return dComIfGs_getLastWarpAcceptStage() >= 0 ? 1 : 0;
}
void dComIfGs_setWarpMarkFlag(u8) {}
src/d/menu/d_menu_item_explain.cpp
+734 -709
View File
File diff suppressed because it is too large Load Diff
src/d/menu/d_menu_ring.cpp
+1111 -240
View File
File diff suppressed because it is too large Load Diff
src/d/menu/d_menu_window.cpp
+6 -6
View File
@@ -279,8 +279,8 @@ BOOL dMw_UP_TRIGGER() {
return (bool)mDoCPd_c::getTrigUp(PAD_1);
}
bool dMw_DOWN_TRIGGER() {
return mDoCPd_c::getTrigDown(PAD_1);
BOOL dMw_DOWN_TRIGGER() {
return (bool)mDoCPd_c::getTrigDown(PAD_1);
}
BOOL dMw_LEFT_TRIGGER() {
@@ -299,16 +299,16 @@ BOOL dMw_RIGHT_TRIGGER() {
}
}
bool dMw_A_TRIGGER() {
return mDoCPd_c::getTrigA(PAD_1);
BOOL dMw_A_TRIGGER() {
return (bool)mDoCPd_c::getTrigA(PAD_1);
}
BOOL dMw_B_TRIGGER() {
return (bool)mDoCPd_c::getTrigB(PAD_1);
}
bool dMw_Z_TRIGGER() {
return mDoCPd_c::getTrigZ(PAD_1);
BOOL dMw_Z_TRIGGER() {
return (bool)mDoCPd_c::getTrigZ(PAD_1);
}
BOOL dMw_START_TRIGGER() {
src/d/msg/d_msg_string_base.cpp
+1 -1
View File
@@ -187,7 +187,7 @@ void dMsgStringBase_c::drawFontLocal(J2DTextBox* param_0, u8 param_1, f32 param_
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgStringBase_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
asm f32 dMsgStringBase_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
JUTFont* param_3, COutFont_c* param_4, u8 param_5) {
nofralloc
#include "asm/d/msg/d_msg_string_base/getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s"