falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_myna linked (#2785)

This commit is contained in:
hatal175 2025-11-09 12:14:56 +02:00 committed by GitHub
parent 4b5277295e
commit 885e29c359
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1837,7 +1837,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_mg_fshop"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_mirror"),
ActorRel(NonMatching, "d_a_movie_player", extra_cflags=["-O3,p"]),
ActorRel(Equivalent, "d_a_myna"), # weird missing function issue
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_myna"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_ni"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_aru"),
ActorRel(NonMatching, "d_a_npc_ash", extra_cflags=[DANPCF_C_HACK]), # weak func order

7
src/d/actor/d_a_myna.cpp
View File

@ -1291,7 +1291,10 @@ void daMyna_c::deleteItem(int i_itemIndex) {
mShopItems[i_itemIndex].mItemStatus = 4;
}
// this seems to be missing in the final REL??
// For some reason, this function needs to be force active or the linker strips it out.
#pragma push
#pragma force_active on
/* 80949144-80949190 0035C4 004C+00 0/0 0/0 0/0 .text deleteItem__8daMyna_cFUi */
void daMyna_c::deleteItem(fpc_ProcID i_itemId) {
for (int i = 0; i < mNumShopItems; i++) {
@ -1302,6 +1305,8 @@ void daMyna_c::deleteItem(fpc_ProcID i_itemId) {
}
}
#pragma pop
/* 80949190-80949408 003610 0278+00 1/1 0/0 0/0 .text initiate__8daMyna_cFv */
void daMyna_c::initiate() {
for (int i = 0; i < 10; i++) {