diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-01-29 07:39:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 17:39:51 +0200 |
| commit | 36a29bc4fe6464d57d693ab24aedd97e4bb59310 (patch) | |
| tree | 7f3b3979a7a4e385e0ef87dc5f6059e4ac5872da /rel | |
| parent | 7f0ba98c9f694234bd88cf1263840c5e8aaea390 (diff) | |
various fixes / matches (#2052)
* some fixes in d/s, d_item, d_shop
* fix for dKankyo_DayProc weak generation
* d_cc_uty fix
* some d_name / d_com_inf_game / f_op_actor_mng matches
* fix some player inline virtuals
* remove asm
Diffstat (limited to 'rel')
| -rw-r--r-- | rel/d/a/kytag/d_a_kytag11/Makefile | 1 | ||||
| -rw-r--r-- | rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rel/d/a/kytag/d_a_kytag11/Makefile b/rel/d/a/kytag/d_a_kytag11/Makefile index 1606e6c89c..6aa6a70830 100644 --- a/rel/d/a/kytag/d_a_kytag11/Makefile +++ b/rel/d/a/kytag/d_a_kytag11/Makefile @@ -19,6 +19,7 @@ M76_LIBS := \ M76_CFLAGS := \ -sdata 0 \ -sdata2 0 \ + -sym on \ M76_LDFLAGS := \ -nodefaults \ diff --git a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp index 4f2bc578c6..a8d6d2cdc9 100644 --- a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp +++ b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp @@ -7,6 +7,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/kankyo/d_kankyo_static.h" /* 80529518-80529520 000078 0008+00 1/0 0/0 0/0 .text daKytag11_Draw__FP13kytag11_class */ @@ -118,12 +119,12 @@ static int daKytag11_Create(fopAc_ac_c* i_this) { /* 80529854-8052988C 0003B4 0038+00 1/1 0/0 0/0 .text dKankyo_DayProc__Fv */ // this is a weak func that should be compiler generated, unsure how to make it do that for now -#pragma push +/* #pragma push #pragma force_active on extern "C" void dKankyo_DayProc__Fv() { dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]); } -#pragma pop +#pragma pop */ /* ############################################################################################## */ /* 805298B4-805298D4 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag11_Method */ |