summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_auction.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-04-16 15:02:18 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2025-04-16 15:02:18 -0400
commitce1468c108205fa606da946d0ede7a9f90ee3311 (patch)
tree53dbf245edbefadab38ab224d02ed1e029aede15 /src/d/actor/d_a_auction.cpp
parent1f049c091158cbb31ffeb7c0d8f0f602b159e935 (diff)
player enum and inlines and goto cleanup
Diffstat (limited to 'src/d/actor/d_a_auction.cpp')
-rw-r--r--src/d/actor/d_a_auction.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
index de39d4da..d7fd4988 100644
--- a/src/d/actor/d_a_auction.cpp
+++ b/src/d/actor/d_a_auction.cpp
@@ -750,7 +750,7 @@ void daAuction_c::eventMainInit() {
daPy_py_c* pLink = (daPy_py_c*)dComIfGp_getLinkPlayer();
pLink->changeOriginalDemo();
- mCurLinkAnm = daPy_demo_c::DEMO_UNK1_e;
+ mCurLinkAnm = daPy_demo_c::DEMO_UNK01_e;
dComIfGp_event_setTalkPartner(this);
m82F = 0;
@@ -775,11 +775,11 @@ bool daAuction_c::eventMain() {
if (
pLink->getBaseAnimeFrameRate() == 0.0f &&
- mCurLinkAnm != daPy_demo_c::DEMO_UNK1_e &&
+ mCurLinkAnm != daPy_demo_c::DEMO_UNK01_e &&
mCurLinkAnm != daPy_demo_c::DEMO_UNK1D_e &&
mCurLinkAnm != daPy_demo_c::DEMO_UNK25_e
) {
- setLinkAnm(daPy_demo_c::DEMO_UNK1_e);
+ setLinkAnm(daPy_demo_c::DEMO_UNK01_e);
}
mFlags &= 4;
@@ -1106,8 +1106,8 @@ void daAuction_c::eventMainMsgSet() {
/* 0000279C-0000294C .text eventMainMsgEnd__11daAuction_cFv */
void daAuction_c::eventMainMsgEnd() {
if (eventMesEnd()) {
- if (mCurLinkAnm != daPy_demo_c::DEMO_UNK1_e && mCurLinkAnm != daPy_demo_c::DEMO_UNK1D_e) {
- setLinkAnm(daPy_demo_c::DEMO_UNK1_e);
+ if (mCurLinkAnm != daPy_demo_c::DEMO_UNK01_e && mCurLinkAnm != daPy_demo_c::DEMO_UNK1D_e) {
+ setLinkAnm(daPy_demo_c::DEMO_UNK01_e);
}
if (m834 & 0x20) {
@@ -1341,7 +1341,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
m826 = tmp;
m824 = tmp;
if (m826 != 0) {
- setLinkAnm(daPy_demo_c::DEMO_UNK1_e);
+ setLinkAnm(daPy_demo_c::DEMO_UNK01_e);
}
break;
}
@@ -1563,7 +1563,7 @@ void daAuction_c::setCameraNpc(int idx, s16 param_2) {
/* 000039FC-00003A3C .text setLinkAnm__11daAuction_cFUc */
void daAuction_c::setLinkAnm(u8 linkAnm) {
- if (linkAnm == daPy_demo_c::DEMO_UNK1_e && m826 == 0) {
+ if (linkAnm == daPy_demo_c::DEMO_UNK01_e && m826 == 0) {
linkAnm = daPy_demo_c::DEMO_UNK1D_e;
}