diff options
| author | Julgodis <> | 2021-04-07 09:16:47 +0200 |
|---|---|---|
| committer | Julgodis <> | 2021-04-07 09:16:47 +0200 |
| commit | dca1d2a1c032f239c65aa1b7767132c12e89f628 (patch) | |
| tree | 103f2574cfa7c6b9f19df522447d0b58861b60ba /src/d/map | |
| parent | ed1ee30dd20ab15ba73b987f1e59b0dfc16d09b2 (diff) | |
detect more floats/doubles, including from relocations
Diffstat (limited to 'src/d/map')
| -rw-r--r-- | src/d/map/d_map.cpp | 24 | ||||
| -rw-r--r-- | src/d/map/d_map_path.cpp | 2 | ||||
| -rw-r--r-- | src/d/map/d_map_path_dmap.cpp | 26 |
3 files changed, 26 insertions, 26 deletions
diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp index f5a17c0421..b4539d889c 100644 --- a/src/d/map/d_map.cpp +++ b/src/d/map/d_map.cpp @@ -31,6 +31,8 @@ struct renderingPlusDoorAndCursor_c { /* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const; }; +struct Vec {}; + struct dDrawPath_c { struct room_class {}; @@ -49,8 +51,6 @@ struct dDrawPath_c { /* 8003CCC4 */ void drawPath(); }; -struct Vec {}; - struct renderingDAmap_c { /* 8002B150 */ ~renderingDAmap_c(); /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16); @@ -342,10 +342,10 @@ extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" extern u32 mNextRoomNo__10dMapInfo_c; extern "C" extern u8 data_80450E58[4]; extern "C" extern u8 data_80450E60[4]; -extern "C" extern u8 mMinX__8dMpath_c[4]; -extern "C" extern u8 mMaxX__8dMpath_c[4]; -extern "C" extern u8 mMinZ__8dMpath_c[4]; -extern "C" extern u8 mMaxZ__8dMpath_c[4]; +extern "C" extern f32 mMinX__8dMpath_c; +extern "C" extern f32 mMaxX__8dMpath_c; +extern "C" extern f32 mMinZ__8dMpath_c; +extern "C" extern f32 mMaxZ__8dMpath_c; // // Declarations: @@ -360,7 +360,7 @@ SECTION_RODATA static u8 const l_iconSize[68] = { 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, }; -SECTION_DEAD void* const cg_80378E48 = (void*)(&l_iconSize); +COMPILER_STRIP_GATE(80378E48, &l_iconSize); /* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc */ @@ -628,7 +628,7 @@ SECTION_RODATA static u8 const l_dungeon_offColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80378E8C = (void*)(&l_dungeon_offColor); +COMPILER_STRIP_GATE(80378E8C, &l_dungeon_offColor); #pragma pop /* 80378EB0-80378ED4 005510 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3938 */ @@ -639,7 +639,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80378EB0 = (void*)(&l_dungeon_onColor); +COMPILER_STRIP_GATE(80378EB0, &l_dungeon_onColor); #pragma pop /* 80378ED4-80378EF8 005534 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3939 */ @@ -650,7 +650,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80378ED4 = (void*)(&l_dungeon_stayColor); +COMPILER_STRIP_GATE(80378ED4, &l_dungeon_stayColor); #pragma pop /* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text getColor__6dMap_cFi */ @@ -709,7 +709,7 @@ asm void renderingAmap_c::getLineColor(int param_0, int param_1) { SECTION_RODATA static u8 const colorTable[16] = { 0xBC, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80378EF8 = (void*)(&colorTable); +COMPILER_STRIP_GATE(80378EF8, &colorTable); /* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */ #pragma push @@ -797,7 +797,7 @@ SECTION_RODATA static u8 const l_stayType[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80378F08 = (void*)(&l_stayType); +COMPILER_STRIP_GATE(80378F08, &l_stayType); /* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text getStayType__15renderingAmap_cCFv */ diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index db63d5e8de..7ccb5fcbbc 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -176,7 +176,7 @@ SECTION_RODATA static u8 const data[28] = { 0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x52, }; -SECTION_DEAD void* const cg_80379C30 = (void*)(&data); +COMPILER_STRIP_GATE(80379C30, &data); /* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */ #pragma push diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 1eafe3d79f..7fe4b51f79 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -573,20 +573,20 @@ extern u8 mLayerList__8dMpath_c[4]; u8 mLayerList__8dMpath_c[4]; /* 80450E68-80450E6C 000368 0004+00 3/3 1/1 0/0 .sbss mMinX__8dMpath_c */ -extern u8 mMinX__8dMpath_c[4]; -u8 mMinX__8dMpath_c[4]; +extern f32 mMinX__8dMpath_c; +f32 mMinX__8dMpath_c; /* 80450E6C-80450E70 00036C 0004+00 3/3 1/1 0/0 .sbss mMaxX__8dMpath_c */ -extern u8 mMaxX__8dMpath_c[4]; -u8 mMaxX__8dMpath_c[4]; +extern f32 mMaxX__8dMpath_c; +f32 mMaxX__8dMpath_c; /* 80450E70-80450E74 000370 0004+00 3/3 2/2 0/0 .sbss mMinZ__8dMpath_c */ -extern u8 mMinZ__8dMpath_c[4]; -u8 mMinZ__8dMpath_c[4]; +extern f32 mMinZ__8dMpath_c; +f32 mMinZ__8dMpath_c; /* 80450E74-80450E78 000374 0004+00 3/3 1/1 0/0 .sbss mMaxZ__8dMpath_c */ -extern u8 mMaxZ__8dMpath_c[4]; -u8 mMaxZ__8dMpath_c[4]; +extern f32 mMaxZ__8dMpath_c; +f32 mMaxZ__8dMpath_c; /* 80450E78-80450E7C 000378 0004+00 1/1 2/2 0/0 .sbss mAllCenterX__8dMpath_c */ extern f32 mAllCenterX__8dMpath_c; @@ -1011,7 +1011,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = { 0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80379C58 = (void*)(&l_100x100BoxVertexList); +COMPILER_STRIP_GATE(80379C58, &l_100x100BoxVertexList); /* 80451E70-80451E74 000470 0004+00 1/1 0/0 0/0 .sdata2 @4484 */ SECTION_SDATA2 static f32 lit_4484 = 6.0f; @@ -1115,7 +1115,7 @@ SECTION_RODATA static void* const l_treasureDispList_4524[12] = { (void*)NULL, (void*)0x00000001, (void*)&l_treasureStartColor, (void*)0x05000000, (void*)0x00000003, (void*)&l_destinationStartColor, }; -SECTION_DEAD void* const cg_80379C88 = (void*)(&l_treasureDispList_4524); +COMPILER_STRIP_GATE(80379C88, &l_treasureDispList_4524); /* 80451E74-80451E78 000474 0004+00 1/0 0/0 0/0 .sdata2 l_entranceStartColor */ SECTION_SDATA2 static u32 l_entranceStartColor = 0x94000000; @@ -1207,7 +1207,7 @@ SECTION_RODATA static void* const l_treasureDispList_4606[33] = { (void*)0x04000000, (void*)0x00000004, (void*)&l_smallKeyStartColor, (void*)0x03000000, (void*)0x00000004, (void*)&l_bossStartColor, }; -SECTION_DEAD void* const cg_80379CB8 = (void*)(&l_treasureDispList_4606); +COMPILER_STRIP_GATE(80379CB8, &l_treasureDispList_4606); /* 80451EAC-80451EB4 0004AC 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4605 */ SECTION_SDATA2 static u8 l_iconTex0_4605[8] = { @@ -1239,7 +1239,7 @@ SECTION_RODATA static u8 const l_iconPosData[32] = { 0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80379D3C = (void*)(&l_iconPosData); +COMPILER_STRIP_GATE(80379D3C, &l_iconPosData); /* 80041208-800412C0 03BB48 00B8+00 2/2 0/0 0/0 .text * drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff */ @@ -1260,7 +1260,7 @@ SECTION_RODATA static u8 const l_offset[36] = { 0xC3, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00, }; -SECTION_DEAD void* const cg_80379D5C = (void*)(&l_offset); +COMPILER_STRIP_GATE(80379D5C, &l_offset); /* 80450638-80450640 0000B8 0004+04 1/1 0/0 0/0 .sdata l_cursorColor$4709 */ SECTION_SDATA static u8 l_cursorColor[4 + 4 /* padding */] = { |
