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 /include/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 'include/d/kankyo')
| -rw-r--r-- | include/d/kankyo/d_kankyo.h | 1 | ||||
| -rw-r--r-- | include/d/kankyo/d_kankyo_static.h | 18 |
2 files changed, 18 insertions, 1 deletions
diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 8c48817384..91b9fd243f 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -11,7 +11,6 @@ class JPABaseEmitter; class cBgS_PolyInfo; class color_RGB_class; -void dKankyo_DayProc(); void dKy_set_nexttime(f32); void dKy_itudemo_se(); BOOL dKy_darkworld_spot_check(char const* stageName, int roomNo); diff --git a/include/d/kankyo/d_kankyo_static.h b/include/d/kankyo/d_kankyo_static.h new file mode 100644 index 0000000000..66af53ef6e --- /dev/null +++ b/include/d/kankyo/d_kankyo_static.h @@ -0,0 +1,18 @@ +#ifndef D_KANKYO_STATIC_H +#define D_KANKYO_STATIC_H + +#include "d/com/d_com_inf_game.h" + +/** + * This is a made-up file to help matching weak function generation. + * + * `dKankyo_DayProc` is supposed to be weakly generated at the end of TUs where it's called, + * but it'll generate in every TU where the header it's defined in is included. So only include this + * header in TUs where `dKankyo_DayProc` needs to be generated. + */ + +static void dKankyo_DayProc() { + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]); +} + +#endif /* D_KANKYO_STATIC_H */
\ No newline at end of file |