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 /src/d/kankyo | |
| 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 'src/d/kankyo')
| -rw-r--r-- | src/d/kankyo/d_kankyo.cpp | 1 | ||||
| -rw-r--r-- | src/d/kankyo/d_kankyo_wether.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index d6e115a54d..bef235be8c 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -15,6 +15,7 @@ #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" #include "rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h" +#include "d/kankyo/d_kankyo_static.h" #include "string.h" // diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index f501894d02..1832e266ea 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -217,7 +217,7 @@ extern "C" extern dScnKy_env_light_c g_env_light; extern "C" extern Z2EnvSeMgr g_mEnvSeMgr; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 data_80450EE0[8]; +extern "C" extern u8 data_80450EE0; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind); @@ -1321,6 +1321,8 @@ SECTION_SDATA2 static f32 lit_5192 = 24575.0f; /* 80452160-80452164 000760 0004+00 1/1 0/0 0/0 .sdata2 @5193 */ SECTION_SDATA2 static f32 lit_5193 = 0.00139999995008111f; +u8 data_80450EE0; + /* 80059728-80059E38 054068 0710+00 1/1 0/0 0/0 .text wether_move_vrkumo__Fv */ // gameinfo load issue, cmath instruction order / reg alloc #ifdef NONMATCHING |