mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-04 21:35:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_insect basically OK, optimizations, match one func in d_menu_ring (#1934)

Browse Source 
* next d_menu_insect pass

* work on d_menu_ring & d_menu_insect

* d_menu_insect basically OK

* remove unused asm
This commit is contained in:
Trueffel
2023-09-18 06:39:57 +02:00
committed by GitHub
parent d1db2e48ea
commit 6726d1cf47
25 changed files with 323 additions and 1794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/menu/d_menu_skill.cpp
+4 -5
View File
@@ -13,7 +13,6 @@
#include "d/meter/d_meter_HIO.h"
#include "d/msg/d_msg_string.h"
#include "dol2asm.h"
#include "global.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
@@ -301,10 +300,10 @@ void dMenu_Skill_c::wait_init() {
void dMenu_Skill_c::wait_move() {
u8 oldIndex = mIndex;
if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
if ((mDoCPd_c::getTrig(0) & 0x200) != 0) {
if (mDoCPd_c::getTrigB(PAD_1) != 0) {
mpDrawCursor->offPlayAnime(0);
mStatus = 3;
} else if (mDoCPd_c::getTrigA(0)) {
} else if (mDoCPd_c::getTrigA(PAD_1)) {
mProcess = PROC_WAIT_MOVE;
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
@@ -377,13 +376,13 @@ void dMenu_Skill_c::read_move_init() {
/* 801F8150-801F8218 1F2A90 00C8+00 1/0 0/0 0/0 .text read_move_move__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_move_move() {
if (mDoCPd_c::getTrigA(0) != 0) {
if (mDoCPd_c::getTrigA(PAD_1) != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
mProcess = PROC_MOVE_MOVE;
} else if ((mDoCPd_c::getTrig(0) & 0x200) != 0) {
} else if (mDoCPd_c::getTrigB(PAD_1) != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();