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/d_drawlist.cpp | |
| 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/d_drawlist.cpp')
| -rw-r--r-- | src/d/d_drawlist.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 6efa2a5801..7f76d1fcc6 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -280,7 +280,7 @@ extern "C" u8 mWipeDlst__12dDlst_list_c[72]; extern "C" u8 mWipeColor__12dDlst_list_c[4]; extern "C" f32 mWipeRate__12dDlst_list_c; extern "C" f32 mWipeSpeed__12dDlst_list_c[1 + 1 /* padding */]; -extern "C" extern u8 data_80450EE0[8]; +extern "C" extern u8 data_80450EE0; // // External References: @@ -2850,7 +2850,7 @@ SECTION_DEAD static char const* const pad_8037A1BC = "\0\0\0"; dDlst_2DT2_c dDlst_list_c::mWipeDlst; /* 8045065C-80450660 0000DC 0004+00 1/1 0/0 0/0 .sdata mWipeColor__12dDlst_list_c */ -SECTION_SDATA GXColor dDlst_list_c::mWipeColor = {0, 0, 0, 0}; +GXColor dDlst_list_c::mWipeColor = {0, 0, 0, 0}; /* 80450ED0-80450ED4 0003D0 0004+00 2/2 1/1 0/0 .sbss None */ u8 dDlst_list_c::mWipe; @@ -2993,9 +2993,3 @@ SECTION_DATA extern void* __vt__13dDlst_2DTri_c[3] = { (void*)NULL, (void*)draw__13dDlst_2DTri_cFv, }; - -/* 80450EE0-80450EE8 0003E0 0008+00 0/0 1/1 0/0 .sbss None */ -extern u8 data_80450EE0[8]; -u8 data_80450EE0[8] ALIGN_DECL(8); - -/* 8037A1B0-8037A1B0 006810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ |